Browse code
Fixed test suite.
Andrew Alderwick authored on 28/03/2021 11:07:16
Showing 1 changed files
| ... | ... |
@@ -14,7 +14,7 @@ |
| 14 | 14 |
|0100 ;Console { pad 8 char 1 byte 1 short 2 }
|
| 15 | 15 |
|01F0 .RESET .FRAME .ERROR ( vectors ) |
| 16 | 16 |
|
| 17 |
-%PASS? { ,result JMP2 BRK2?r LITr EOR2? DUP? }
|
|
| 17 |
+%PASS? { ,result JMP2 BRK2r LITr EOR2 DUP }
|
|
| 18 | 18 |
%PASS { #01 PASS? }
|
| 19 | 19 |
%FAIL { #00 PASS? }
|
| 20 | 20 |
|
| ... | ... |
@@ -36,7 +36,7 @@ |
| 36 | 36 |
@ERROR BRK |
| 37 | 37 |
|
| 38 | 38 |
@FRAME |
| 39 |
- ,recover ~test.status JNZ2 |
|
| 39 |
+ ~test.status ,recover JNZ2 |
|
| 40 | 40 |
#01 =test.status |
| 41 | 41 |
~test.code |
| 42 | 42 |
DUP2 ,find-label JSR2 |
| ... | ... |
@@ -45,18 +45,18 @@ |
| 45 | 45 |
JMP2 |
| 46 | 46 |
|
| 47 | 47 |
@find-label ( ptr₂ -- following-label-ptr₂ ) |
| 48 |
- DUP2 PEK2 LIT BRK2?r NEQ ^$next-minus-1 SWP JMP? |
|
| 49 |
- DUP2 #0001 ADD2 PEK2 LIT LITr NEQ ^$next-minus-1 SWP JMP? |
|
| 50 |
- DUP2 #0002 ADD2 PEK2 LIT EOR2? NEQ ^$next-minus-1 SWP JMP? |
|
| 51 |
- DUP2 #0003 ADD2 PEK2 LIT DUP? NEQ ^$next-minus-1 SWP JMP? |
|
| 52 |
- #0004 ADD2 $next-minus-1 JMP2r |
|
| 48 |
+ DUP2 PEK2 LIT BRK2r NEQ ^$next JNZ |
|
| 49 |
+ DUP2 #0001 ADD2 PEK2 LIT LITr NEQ ^$next JNZ |
|
| 50 |
+ DUP2 #0002 ADD2 PEK2 LIT EOR2 NEQ ^$next JNZ |
|
| 51 |
+ DUP2 #0003 ADD2 PEK2 LIT DUP NEQ ^$next JNZ |
|
| 52 |
+ #0004 ADD2 JMP2r |
|
| 53 | 53 |
|
| 54 |
- ( next ) |
|
| 54 |
+ $next |
|
| 55 | 55 |
#0001 ADD2 ^find-label JMP |
| 56 | 56 |
|
| 57 | 57 |
@find-code ( label-ptr₂ -- following-code-ptr₂ ) |
| 58 | 58 |
DUP2 PEK2 |
| 59 |
- ,$not-end ROT JNZ2 |
|
| 59 |
+ ,$not-end JNZ2 |
|
| 60 | 60 |
|
| 61 | 61 |
$end |
| 62 | 62 |
#0001 ADD2 |
| ... | ... |
@@ -67,7 +67,7 @@ |
| 67 | 67 |
|
| 68 | 68 |
@recover |
| 69 | 69 |
( would it have been a PASS or FAIL? ) |
| 70 |
- ,$clear ~test.label #000a SUB2 PEK2 LIT LIT EQU JNZ2 |
|
| 70 |
+ ~test.label #000a SUB2 PEK2 LIT LIT EQU ,$clear JNZ2 |
|
| 71 | 71 |
#02 ^result JMP |
| 72 | 72 |
|
| 73 | 73 |
$clear |
| ... | ... |
@@ -101,13 +101,13 @@ |
| 101 | 101 |
|
| 102 | 102 |
@print-string ( string₂ -- ) |
| 103 | 103 |
DUP2 PEK2 DUP |
| 104 |
- ,$not-end ROT JNZ2 |
|
| 104 |
+ ,$not-end JNZ2 |
|
| 105 | 105 |
|
| 106 | 106 |
$end |
| 107 | 107 |
POP POP2 JMP2r |
| 108 | 108 |
|
| 109 | 109 |
$not-end |
| 110 |
- DUP LIT BRK2?r EQU ,$end ROT JNZ2 |
|
| 110 |
+ DUP LIT BRK2r EQU ,$end JNZ2 |
|
| 111 | 111 |
=Console.char |
| 112 | 112 |
#0001 ADD2 ^print-string JMP |
| 113 | 113 |
|
| ... | ... |
@@ -118,13 +118,13 @@ |
| 118 | 118 |
DUP2 #0064 DIV2 DUP2 ^$digit JSR #0064 MUL2 SUB2 |
| 119 | 119 |
DUP2 #000a DIV2 DUP2 ^$digit JSR #000a MUL2 SUB2 |
| 120 | 120 |
^$digit JSR |
| 121 |
- ~number.started JMP2r? |
|
| 121 |
+ ~number.started #00 EQU JMP JMP2r |
|
| 122 | 122 |
#30 =Console.char |
| 123 | 123 |
JMP2r |
| 124 | 124 |
|
| 125 | 125 |
$digit |
| 126 | 126 |
SWP POP |
| 127 |
- #02 OVR ~number.started ORA JMP? |
|
| 127 |
+ DUP ~number.started ORA #02 JNZ |
|
| 128 | 128 |
POP JMP2r |
| 129 | 129 |
#30 ADD =Console.char |
| 130 | 130 |
#01 =number.started |
| ... | ... |
@@ -140,7 +140,7 @@ |
| 140 | 140 |
JMP2r |
| 141 | 141 |
|
| 142 | 142 |
$digit |
| 143 |
- #0f AND DUP #0a LTH #03 SWP JMP? |
|
| 143 |
+ #0f AND DUP #0a LTH #03 JNZ |
|
| 144 | 144 |
#27 ADD |
| 145 | 145 |
#30 ADD =Console.char |
| 146 | 146 |
POP |