summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbd <bdunahu@operationnull.com>2025-04-16 15:57:01 -0400
committerbd <bdunahu@operationnull.com>2025-04-16 15:57:01 -0400
commit4195307803b49966831c3646e059088c3087f489 (patch)
treea44f0145bdcab6a423d99e4a923369cfffcadd79
parent890119fceed9c57c86b43ace15ee016eb403c36a (diff)
Rework tests to fit new JML/JAL parsing scheme
-rw-r--r--t/parse.lisp16
1 files changed, 8 insertions, 8 deletions
diff --git a/t/parse.lisp b/t/parse.lisp
index 2612f45..9e07dd5 100644
--- a/t/parse.lisp
+++ b/t/parse.lisp
@@ -43,11 +43,11 @@
'(emit::p
(emit::d)
(emit::x
- (emit::j "JMP" (emit::rr 3) 3)
- (emit::j "JRL" (emit::rr 0) (emit::l "FOO" 8))
+ (emit::j "JMP" (emit::l "FOO" 7) (emit::rr 0))
+ (emit::j "JRL" (emit::rr 0) (emit::l "FOO" 8))
(emit::j "RET" (emit::rr 0) 0)
(emit::j "PUSH" (emit::rr 5) 0)))
- (esrap:parse 'parse:str->ast (format nil ".DATA~%.TEXT~%~tJMP 3($3)
+ (esrap:parse 'parse:str->ast (format nil ".DATA~%.TEXT~%~tJMP FOO
~tJRL FOO~%~tRET~%~tPUSH $5~%")))))
(test esrap-instr-type-i-negative
@@ -73,10 +73,10 @@
'(emit::p
(emit::d)
(emit::x
- (emit::j "JMP" (emit::rr 3) 3)
+ (emit::j "JMP" (emit::l "FOO" 14) (emit::rr 0))
(emit::j "JRL" (emit::rr 0) (emit::l "FOO" 15))
(emit::j "PUSH" (emit::rr 5) 0)))
- (esrap:parse 'parse:str->ast (format nil ".DATA~%~%.TEXT~t~%JMP 3($3)~t
+ (esrap:parse 'parse:str->ast (format nil ".DATA~%~%.TEXT~t~%JMP FOO~t
JRL FOO~t~%PUSH $5~%")))))
(test esrap-instr-type-comments
@@ -84,11 +84,11 @@ JRL FOO~t~%PUSH $5~%")))))
'(emit::p
(emit::d)
(emit::x
- (emit::j "JMP" (emit::rr 3) 3)
- (emit::j "JRL" (emit::rr 0) (emit::l "FOO" 18))
+ (emit::j "JMP" (emit::l "FOO" 17) (emit::rr 0))
+ (emit::j "JRL" (emit::rr 0) (emit::l "FOO" 18))
(emit::j "PUSH" (emit::rr 5) 0)))
(esrap:parse 'parse:str->ast (format nil ".DATA~%.TEXT;; dot dot dot
-~tJMP 3($3) ;; this does things
+~tJMP FOO ;; this does things
~tJRL FOO~%~tPUSH $5~%")))))
(test esrap-data-singleton