X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/e85df3ff84611b7c790f9ffb46dfca77e2a717c0..944bf9362ff51217b1617f85126d26e821b8aa91:/src/codegen-test.lisp

diff --git a/src/codegen-test.lisp b/src/codegen-test.lisp
index 81fa3e0..6821059 100644
--- a/src/codegen-test.lisp
+++ b/src/codegen-test.lisp
@@ -50,7 +50,7 @@
     (emit-insts codegen (list (make-set-inst "u" "v")
 			      (make-set-inst "v" r))))
   (emit-inst codegen (make-while-inst "v" (codegen-pop-block codegen)))
-  (emit-inst codegen (make-if-inst "a" (make-set-inst "*a" "aa") nil))
+  (emit-inst codegen (make-if-inst "a" (make-set-inst "*a" "aa")))
   (deliver-expr codegen :return "u")
   (codegen-pop-function codegen "gcd"
 			(c-type (fun int
@@ -64,11 +64,9 @@
 			     ("a"))
 	do (ensure-var codegen name c-type-int init))
   (ensure-var codegen "g" c-type-int
-	      (make-call-inst "gcd" (list "u" "v" "&a")))
-  (emit-inst codegen (make-expr-inst
-		      (make-call-inst "printf"
-				      (list "\"%d*%d == %d (mod %d)\\n\""
-					    "a" "u" "g" "v"))))
+	      (make-call-inst "gcd" "u" "v" "&a"))
+  (deliver-call codegen :void "printf"
+		"\"%d*%d == %d (mod %d)\\n\"" "a" "u" "g" "v")
   (deliver-expr codegen :return 0)
   (codegen-pop-function codegen "main"
 			(c-type (fun int