Fix bug in match.

cmsc430 · Oct 25, 2024 · 8a4fb9c · 8a4fb9c
1 parent 856c8e0
commit 8a4fb9c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/knock/compile.rkt b/knock/compile.rkt
@@ -233,7 +233,9 @@
      (list (seq (Push rax)) (cons x cm))]
     [(Lit l)
      (let ((ok (gensym)))
-       (list (seq (Cmp rax (value->bits l))
+       (list (seq (Mov r8 rax)
+                  (compile-value l)
+                  (Cmp rax r8)
                   (Je ok)
                   (Add rsp (* 8 (length cm)))
                   (Jmp next)

diff --git a/knock/test/test-runner.rkt b/knock/test/test-runner.rkt
@@ -233,7 +233,9 @@
       (check-equal? (run '(match (box 1) [(box 2) 0] [_ 1]))
                     1)
       (check-equal? (run '(match (box 1) [(box x) x] [_ 2]))
-                    1)))
+                    1)
+      (check-equal? (run '(match 1 [8589934592 1] [_ 2])) 2)
+      (check-equal? (run '(match 8589934592 [8589934592 1] [_ 2])) 1)))
 
 (define (test/io run)
   (begin ;; Evildoer

diff --git a/loot/compile.rkt b/loot/compile.rkt
@@ -347,7 +347,9 @@
      (list (seq (Push rax)) (cons x cm))]
     [(Lit l)
      (let ((ok (gensym)))
-       (list (seq (Cmp rax (value->bits l))
+       (list (seq (Mov r8 rax)
+                  (compile-value l)
+                  (Cmp rax r8)
                   (Je ok)
                   (Add rsp (* 8 (length cm)))
                   (Jmp next)

diff --git a/loot/test/test-runner.rkt b/loot/test/test-runner.rkt
@@ -233,7 +233,9 @@
       (check-equal? (run '(match (box 1) [(box 2) 0] [_ 1]))
                     1)
       (check-equal? (run '(match (box 1) [(box x) x] [_ 2]))
-                    1)))
+                    1)
+      (check-equal? (run '(match 1 [8589934592 1] [_ 2])) 2)
+      (check-equal? (run '(match 8589934592 [8589934592 1] [_ 2])) 1)))
 
 (define (test/io run)
   (begin ;; Evildoer