Merge pull request #133 from cmsc430/respect-r15

r15, void, CEnv

Author: dvanhorn

langs/extort/compile-ops.rkt

@@ -41,8 +41,7 @@
     ['write-byte
      (seq (assert-byte)
           (Mov rdi rax)
-          (Call 'write_byte)
-          (Mov rax (value->bits (void))))]))
+          (Call 'write_byte))]))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

langs/fraud/compile-ops.rkt

@@ -50,8 +50,7 @@
           pad-stack
           (Mov rdi rax)
           (Call 'write_byte)
-          unpad-stack
-          (Mov rax (value->bits (void))))]))
+          unpad-stack)]))
 
 ;; Op2 -> Asm
 (define (compile-op2 p)

langs/fraud/compile.rkt

@@ -6,8 +6,9 @@
 (define rax 'rax) ; return
 (define rsp 'rsp) ; stack
 (define rdi 'rdi) ; arg
+(define r15 'r15) ; stack pad (non-volatile)
 
-;; type CEnv = (Listof ID)
+;; type CEnv = (Listof [Maybe Id])
 
 ;; Expr -> Asm
 (define (compile e)
@@ -17,7 +18,9 @@
         (Extern 'raise_error)
         (Global 'entry)
         (Label 'entry)
+        (Push r15)    ; save callee-saved register
         (compile-e e '())
+        (Pop r15)     ; restore callee-save register
         (Ret)
         (Label 'raise_error_align)
         pad-stack

langs/hoax/compile-ops.rkt

@@ -52,8 +52,7 @@
           pad-stack
           (Mov rdi rax)
           (Call 'write_byte)
-          unpad-stack
-          (Mov rax (value->bits (void))))]
+          unpad-stack)]
     ['box
      (seq (Mov (Offset rbx 0) rax)
           (Mov rax rbx)
@@ -144,11 +143,11 @@
      (seq (Pop r8)
           (Cmp rax r8)
 	  (if-equal))]
-    ['make-vector
+    ['make-vector ;; size value
      (let ((loop (gensym))
            (done (gensym))
            (empty (gensym)))
-       (seq (Pop r8)
+       (seq (Pop r8) ;; r8 = size
             (assert-natural r8)
             (Cmp r8 0) ; special case empty vector
             (Je empty)
@@ -174,7 +173,7 @@
             (Mov rax type-vect)
             (Label done)))]
 
-    ['vector-ref
+    ['vector-ref ; vector index
      (seq (Pop r8)
           (assert-vector r8)
           (assert-integer rax)

langs/hoax/compile.rkt

@@ -7,8 +7,9 @@
 (define rbx 'rbx) ; heap
 (define rsp 'rsp) ; stack
 (define rdi 'rdi) ; arg
+(define r15 'r15) ; stack pad (non-volatile)
 
-;; type CEnv = [Listof Variable]
+;; type CEnv = (Listof [Maybe Id])
 
 ;; Expr -> Asm
 (define (compile e)
@@ -19,9 +20,11 @@
         (Global 'entry)
         (Label 'entry)
 	(Push rbx)    ; save callee-saved register
+        (Push r15)        
         (Mov rbx rdi) ; recv heap pointer
         (compile-e e '())
-	(Pop rbx)     ; restore callee-save register
+        (Pop r15)     ; restore callee-save register
+        (Pop rbx)
 	(Ret)
         (Label 'raise_error_align)
         pad-stack

langs/hustle/compile-ops.rkt

@@ -49,13 +49,12 @@
           pad-stack
           (Mov rdi rax)
           (Call 'write_byte)
-          unpad-stack
-          (Mov rax val-void))]
+          unpad-stack)]
     ['box
-     (seq (Mov (Offset rbx 0) rax)
-          (Mov rax rbx)
-          (Or rax type-box)
-          (Add rbx 8))]
+     (seq (Mov (Offset rbx 0) rax) ; memory write
+          (Mov rax rbx)            ; put box in rax
+          (Or rax type-box)        ; tag as a box
+          (Add rbx 8))]            ; move rbx 8 bytes over
     ['unbox
      (seq (assert-box rax)
           (Xor rax type-box)

langs/hustle/compile.rkt

@@ -7,8 +7,9 @@
 (define rbx 'rbx) ; heap
 (define rsp 'rsp) ; stack
 (define rdi 'rdi) ; arg
+(define r15 'r15) ; stack pad (non-volatile)
 
-;; type CEnv = [Listof Variable]
+;; type CEnv = (Listof [Maybe Id])
 
 ;; Expr -> Asm
 (define (compile e)
@@ -19,9 +20,11 @@
         (Global 'entry)
         (Label 'entry)
 	(Push rbx)    ; save callee-saved register
+        (Push r15)
         (Mov rbx rdi) ; recv heap pointer
-        (compile-e e '())
-	(Pop rbx)     ; restore callee-save register
+        (compile-e e '())        
+	(Pop r15)     ; restore callee-save register
+        (Pop rbx)
         (Ret)
         (Label 'raise_error_align)
         pad-stack

langs/iniquity/compile-ops.rkt

@@ -52,8 +52,7 @@
           pad-stack
           (Mov rdi rax)
           (Call 'write_byte)
-          unpad-stack
-          (Mov rax (value->bits (void))))]
+          unpad-stack)]
     ['box
      (seq (Mov (Offset rbx 0) rax)
           (Mov rax rbx)

langs/iniquity/compile.rkt

@@ -7,20 +7,23 @@
 (define rbx 'rbx) ; heap
 (define rsp 'rsp) ; stack
 (define rdi 'rdi) ; arg
+(define r15 'r15) ; stack pad (non-volatile)
 
-;; type CEnv = [Listof Variable]
+;; type CEnv = (Listof [Maybe Id])
 
 ;; Prog -> Asm
 (define (compile p)
   (match p
-    [(Prog ds e)  
+    [(Prog ds e)
      (prog (externs)
            (Global 'entry)
            (Label 'entry)
-           (Push rbx)    ; save callee-saved register	   
+           (Push rbx)    ; save callee-saved register
+           (Push r15)
            (Mov rbx rdi) ; recv heap pointer
            (compile-e e '())
-           (Pop rbx)     ; restore callee-save register
+           (Pop r15)     ; restore callee-save register
+           (Pop rbx)
            (Ret)
            (compile-defines ds)
            (Label 'raise_error_align)

langs/jig/compile-ops.rkt

@@ -52,8 +52,7 @@
           pad-stack
           (Mov rdi rax)
           (Call 'write_byte)
-          unpad-stack
-          (Mov rax (value->bits (void))))]
+          unpad-stack)]
     ['box
      (seq (Mov (Offset rbx 0) rax)
           (Mov rax rbx)