diff options
Diffstat (limited to 'apps')
| -rwxr-xr-x | apps/mu | bin | 329706 -> 330839 bytes | |||
| -rw-r--r-- | apps/mu.subx | 71 |
2 files changed, 69 insertions, 2 deletions
diff --git a/apps/mu b/apps/mu index f024b58b..ca892ee7 100755 --- a/apps/mu +++ b/apps/mu Binary files differdiff --git a/apps/mu.subx b/apps/mu.subx index 46709fba..793c6018 100644 --- a/apps/mu.subx +++ b/apps/mu.subx @@ -4925,6 +4925,55 @@ test-get-with-wrong-offset-type: 5d/pop-to-ebp c3/return +test-get-with-wrong-output-type: + # . prologue + 55/push-ebp + 89/<- %ebp 4/r32/esp + # setup + (clear-stream _test-input-stream) + (clear-stream $_test-input-buffered-file->buffer) + (clear-stream _test-output-stream) + (clear-stream $_test-output-buffered-file->buffer) + (clear-stream _test-error-stream) + (clear-stream $_test-error-buffered-file->buffer) + # var ed/edx: exit-descriptor = tailor-exit-descriptor(16) + 68/push 0/imm32 + 68/push 0/imm32 + 89/<- %edx 4/r32/esp + (tailor-exit-descriptor %edx 0x10) + # + (write _test-input-stream "fn foo {\n") + (write _test-input-stream " var a: t\n") + (write _test-input-stream " var c: (addr int)\n") + (write _test-input-stream " c <- get a, x\n") + (write _test-input-stream "}\n") + (write _test-input-stream "type t {\n") + (write _test-input-stream " x: int\n") + (write _test-input-stream "}\n") + # convert + (convert-mu _test-input-buffered-file _test-output-buffered-file _test-error-buffered-file %edx) + # registers except esp clobbered at this point + # restore ed + 89/<- %edx 4/r32/esp + (flush _test-output-buffered-file) + (flush _test-error-buffered-file) +#? # dump _test-error-stream {{{ +#? (write 2 "^") +#? (write-stream 2 _test-error-stream) +#? (write 2 "$\n") +#? (rewind-stream _test-error-stream) +#? # }}} + # check output + (check-stream-equal _test-output-stream "" "F - test-get-with-wrong-output-type: output should be empty") + (check-next-stream-line-equal _test-error-stream "fn foo: stmt get: output 'c' is not in a register" "F - test-get-with-wrong-output-type: error message") + # check that stop(1) was called + (check-ints-equal *(edx+4) 2 "F - test-get-with-wrong-output-type: exit status") + # don't restore from ebp + 81 0/subop/add %esp 8/imm32 + # . epilogue + 5d/pop-to-ebp + c3/return + test-get-with-too-few-inouts: # . prologue 55/push-ebp @@ -5089,7 +5138,8 @@ test-get-with-too-many-outputs: (write _test-input-stream "fn foo {\n") (write _test-input-stream " var a: t\n") (write _test-input-stream " var b: int\n") - (write _test-input-stream " a, b <- get a, x\n") + (write _test-input-stream " var c/eax: (addr int) <- copy 0\n") + (write _test-input-stream " c, b <- get a, x\n") (write _test-input-stream "}\n") (write _test-input-stream "type t {\n") (write _test-input-stream " x: int\n") @@ -10293,7 +10343,10 @@ check-mu-get-stmt: # stmt: (addr stmt), fn: (addr function), err: (addr buffere 0f 84/jump-if-= $check-mu-get-stmt:error-too-few-outputs/disp32 (lookup *eax *(eax+4)) # Stmt-var-value Stmt-var-value => eax 89/<- %edi 0/r32/eax - # TODO: check output type + # - check output type + (lookup *(edi+0x18) *(edi+0x1c)) # Var-register Var-register => eax + 3d/compare-eax-and 0/imm32 + 0f 84/jump-if-= $check-mu-get-stmt:error-output-not-in-register/disp32 # - check for too many outputs (lookup *(esi+0x14) *(esi+0x18)) # Stmt1-outputs Stmt1-outputs => eax (lookup *(eax+8) *(eax+0xc)) # Stmt-var-next Stmt-var-next => eax @@ -10387,6 +10440,20 @@ $check-mu-get-stmt:error-bad-field: (stop *(ebp+0x14) 1) # never gets here +$check-mu-get-stmt:error-output-not-in-register: + # error("fn " fn ": stmt get: type " type " has no member called '" curr->name "'\n") + (write-buffered *(ebp+0x10) "fn ") + 8b/-> *(ebp+0xc) 0/r32/eax + (lookup *eax *(eax+4)) # Function-name Function-name => eax + (write-buffered *(ebp+0x10) %eax) + (write-buffered *(ebp+0x10) ": stmt get: output '") + (lookup *edi *(edi+4)) # Var-name Var-name => eax + (write-buffered *(ebp+0x10) %eax) + (write-buffered *(ebp+0x10) "' is not in a register\n") + (flush *(ebp+0x10)) + (stop *(ebp+0x14) 1) + # never gets here + check-mu-call: # stmt: (addr stmt), callee: (addr function), fn: (addr function), err: (addr buffered-file), ed: (addr exit-descriptor) # . prologue 55/push-ebp |