Sketch of jig notes.

Author: dvanhorn

www/Makefile

@@ -17,7 +17,7 @@ $(course):
 		$(course).scrbl
 	mkdir -p $(course)/code/
 	cd notes ; \
-		tar -c `git ls-files -X .gitignore intro abscond blackmail con dupe extort fraud hustle` | \
+		tar -c `git ls-files -X .gitignore intro abscond blackmail con dupe extort fraud hustle iniquity` | \
 		(cd ../main/code ; tar -x) ; cd ../..
 
 clean:

www/notes.scrbl

@@ -15,6 +15,7 @@
 @include-section{notes/grift.scrbl}
 @include-section{notes/hustle.scrbl}
 @include-section{notes/iniquity.scrbl}
+@include-section{notes/jig.scrbl}
 @;{
 @include-section{notes/5.scrbl}
 @include-section{notes/6.scrbl}

www/notes/jig/asm/printer.rkt

@@ -31,9 +31,11 @@
     [`(neg ,a1)
      (string-append "\tneg " (arg->string a1) "\n")]
     [`(call ,l)
-     (string-append "\tcall " (arg->string l) "\n")]
+     (string-append "\tcall " (label->string l) "\n")]
     [`(push ,r)
-     (string-append "\tpush " (reg->string r) "\n")]    
+     (string-append "\tpush " (reg->string r) "\n")]
+    [`(pop ,r)
+     (string-append "\tpop " (reg->string r) "\n")]        
     [l (string-append (label->string l) ":\n")]))
 
 (define (opcode2? x)
@@ -53,7 +55,7 @@
 ;; Any -> Boolean
 (define (reg? x)
   (and (symbol? x)
-       (memq x '(rax rbx rcx rsp rdi rip))))
+       (memq x '(rax rbx rcx rdx rsp rdi rip rbp rsi r8 r9 r10 r11 r12 r13 r14 r15))))
 
 ;; Reg -> String
 (define (reg->string r)
@@ -74,6 +76,7 @@
     (display 
      (string-append "\tglobal " (label->string g) "\n"
                     "\tdefault rel\n"
-                    "\textern " (label->string 'error) "\n"                    
+                    "\textern " (label->string 'error) "\n"
+                    "\textern " (label->string 'plus_two) "\n"                                        
                     "\tsection .text\n"
                     (asm->string a)))))

www/notes/jig/compile.rkt

@@ -18,11 +18,9 @@
 (define imm-type-bool    (arithmetic-shift #b01 result-shift))
 (define imm-type-char    (arithmetic-shift #b10 result-shift))
 (define imm-type-empty   (arithmetic-shift #b11 result-shift))
-
-
-
 (define imm-val-false    imm-type-bool)
-(define imm-val-true     (bitwise-ior (arithmetic-shift 1 (add1 imm-shift)) imm-type-bool))
+(define imm-val-true
+  (bitwise-ior (arithmetic-shift 1 (add1 imm-shift)) imm-type-bool))
 
 ;; Allocate in 64-bit (8-byte) increments, so pointers
 ;; end in #b000 and we tag with #b001 for boxes, etc.
@@ -51,12 +49,10 @@
   `(entry
     ,@(compile-tail-e e '())
     ret
-
     err
     (push rbp)
-    (call error)
-    ret))
-
+    (call error)))
+  
 ;; Expr CEnv -> Asm
 ;; Compile an expression in tail position
 (define (compile-tail-e e c)