From 2fb60ef2d527b40c7f2e1b6408b2c357dd3b6932 Mon Sep 17 00:00:00 2001
From: Rose Hogenson <rhogenson@posteo.net>
Date: Fri, 29 Jul 2022 17:29:13 -0700
Subject: Fix test failures.

---
 csc/codegen-test.csc | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'csc/codegen-test.csc')

diff --git a/csc/codegen-test.csc b/csc/codegen-test.csc
index ef1c88b..29d1da5 100644
--- a/csc/codegen-test.csc
+++ b/csc/codegen-test.csc
@@ -36,11 +36,11 @@
     (test codegen-apply
       (define p (test-var))
       (assert-equal
-        '((label init)
-          (peek (local 1) (local 0) (const 5))
+        '((peek (local 1) (local 0) (const 5))
           (mov (local 2) (local 1))
           (mov (local 1) (const 10))
-          (jmp (local 2)))
+          (jmp (local 2))
+          (label 0))
         (ir2->ir3
           (make-fix '()
             (make-primitive 'peek (list *globals* (make-constant 5)) (list p)
@@ -50,12 +50,12 @@
     (test codegen-call-global
       (define p (test-var))
       (assert-equal
-        '((label init)
-          (peek (local 1) (local 0) (global cons (csc based)))
+        '((peek (local 1) (local 0) (global cons (csc based)))
           (mov (local 3) (local 1))
           (mov (local 1) (const 5))
           (mov (local 2) (const ()))
-          (jmp (local 3)))
+          (jmp (local 3))
+          (label 0))
         (ir2->ir3
           (make-fix '()
             (make-primitive 'peek (list *globals* (make-library-ref 'cons '(csc based))) (list p)
@@ -66,12 +66,12 @@
       (define f (test-label))
       (define ret (test-var))
       (assert-equal
-        '((label 0)
+        '((mov (local 1) (label 1))
+          (jmp (label 1))
+          (label 1)
           (mov (local 2) (local 1))
           (jmp (local 2))
-          (label init)
-          (mov (local 1) (label 0))
-          (jmp (label 0)))
+          (label 0))
         (ir2->ir3
           (make-fix
             (list (make-closure f (list ret)
@@ -88,20 +88,20 @@
       (define g2 (test-var))
       (define g3 (test-var))
       (assert-equal
-        '((label 0)
+        '((mov (local 1) (const 0))
+          (mov (local 2) (const 1))
+          (jmp (label 1))
+          (label 1)
           (mov (local 127) (local 1))
           (mov (local 1) (local 2))
           (mov (local 2) (local 127))
           (mov (local 3) (const 0))
-          (jmp (label 1))
-          (label 1)
+          (jmp (label 2))
+          (label 2)
           (mov (local 2) (local 1))
           (mov (local 1) (local 3))
-          (jmp (label 0))
-          (label init)
-          (mov (local 1) (const 0))
-          (mov (local 2) (const 1))
-          (jmp (label 0)))
+          (jmp (label 1))
+          (label 0))
         (ir2->ir3
           (make-fix
             (list (make-closure f (list f1 f2)
@@ -114,16 +114,16 @@
     (test codegen-branch
       (define p (test-var))
       (assert-equal
-        '((label init)
-          (peek (local 1) (local 0) (const 1))
-          (jmpif (const #t) (label 0))
+        '((peek (local 1) (local 0) (const 1))
+          (jmpif (const #t) (label 1))
           (mov (local 2) (local 1))
           (mov (local 1) (const 10))
           (jmp (local 2))
-          (label 0)
+          (label 1)
           (mov (local 2) (local 1))
           (mov (local 1) (const 5))
-          (jmp (local 2)))
+          (jmp (local 2))
+          (label 0))
         (ir2->ir3
           (make-fix '()
             (make-primitive 'peek (list *globals* (make-constant 1)) (list p)
-- 
cgit v1.3.1