Merge pull request #166 from cmsc430/fix-164-165

Close 164 and 165

Author: dvanhorn

langs/a86/ast.rkt

@@ -37,7 +37,7 @@
       (error n "expects register or offset; given ~v" a2))
     (values a a1 a2)))
 
-(define check:arith  
+(define check:arith
   (λ (a a1 a2 n)
     (unless (register? a1)
       (error n "expects register; given ~v" a1))
@@ -88,7 +88,7 @@
     (unless (or (and (exact-integer? a2) (<= 0 a2 63))
                 (eq? 'cl a2))
       (error n "expects exact integer in [0,63]; given ~v" a2))
-    (values a a1 a2)))      
+    (values a a1 a2)))
 
 (define check:offset
   (λ (a r i n)
@@ -150,7 +150,7 @@
   (syntax-case stx ()
     [(instruct Name (x ...) guard)
      (with-syntax ([Name? (datum->syntax stx (string->symbol (string-append (symbol->string (syntax->datum #'Name)) "?")))])
-     #'(begin (provide Name Name?)              
+     #'(begin (provide Name Name?)
               (define-match-expander Name
                 (lambda (stx)
                   (syntax-case stx ()
@@ -170,13 +170,13 @@
                                               (struct->vector i2))))
                  (define hash-proc  (λ (i hash) (hash (struct->vector i))))
                  (define hash2-proc (λ (i hash) (hash (struct->vector i))))]
-                
+
                 #:property prop:custom-print-quotable 'never
                 #:methods gen:custom-write
                 [(define write-proc
 		   (instr-print 'Name)
                    #;(make-constructor-style-printer
-                    (lambda (obj) 'Name)        
+                    (lambda (obj) 'Name)
                     (lambda (obj)
                       (rest (rest (vector->list (struct->vector obj)))))))])
               (define Name? %Name?)))]))
@@ -212,6 +212,8 @@
 (instruct Sub    (dst src) check:arith)
 (instruct Cmp    (a1 a2)   check:src-dest)
 (instruct Jmp    (x)       check:target)
+(instruct Jz     (x)       check:target)
+(instruct Jnz    (x)       check:target)
 (instruct Je     (x)       check:target)
 (instruct Jne    (x)       check:target)
 (instruct Jl     (x)       check:target)
@@ -222,6 +224,8 @@
 (instruct Jno    (x)       check:target)
 (instruct Jc     (x)       check:target)
 (instruct Jnc    (x)       check:target)
+(instruct Cmovz  (dst src) check:cmov)
+(instruct Cmovnz (dst src) check:cmov)
 (instruct Cmove  (dst src) check:cmov)
 (instruct Cmovne (dst src) check:cmov)
 (instruct Cmovl  (dst src) check:cmov)
@@ -237,10 +241,12 @@
 (instruct Xor    (dst src) check:src-dest)
 (instruct Sal    (dst i)   check:shift)
 (instruct Sar    (dst i)   check:shift)
+(instruct Shl    (dst i)   check:shift)
+(instruct Shr    (dst i)   check:shift)
 (instruct Push   (a1)      check:push)
+(instruct Pop    (a1)      check:register)
 (instruct Pushf  ()        check:none)
 (instruct Popf   ()        check:none)
-(instruct Pop    (a1)      check:register)
 (instruct Lea    (dst x)   check:lea)
 (instruct Not    (x)       check:register)
 (instruct Div    (den)     check:register)
@@ -340,7 +346,7 @@
     [(cons (Label s) asm)
      (cons s (label-decls asm))]
     [(cons (Extern s) asm)
-     (cons s (label-decls asm))]    
+     (cons s (label-decls asm))]
     [(cons _ asm)
      (label-decls asm)]))
 
@@ -370,7 +376,7 @@
     [(cons (Call (? label? s)) asm)
      (cons s (label-uses asm))]
     [(cons (Lea _ (? label? s)) asm)
-     (cons s (label-uses asm))]    
+     (cons s (label-uses asm))]
     [(cons _ asm)
      (label-uses asm)]))
 

langs/a86/printer.rkt

@@ -73,7 +73,7 @@
       [(Plus e1 e2)
        (string-append "(" (exp->string e1) " + " (exp->string e2) ")")]
       [_ (label-symbol->string e)]))
-  
+
   (define tab (make-string 8 #\space))
 
   ;; Instruction -> String
@@ -84,8 +84,8 @@
               (format "~a~a; ~.s" s (make-string (- 40 (string-length s)) #\space) (instruction-annotation i))
               (format "~a ; ~.s" s (instruction-annotation i)))
           s)))
-  
-  
+
+
   ;; Instruction -> String
   (define (simple-instr->string i)
     (match i
@@ -107,7 +107,7 @@
       [(Sub a1 a2)
        (string-append tab "sub "
                       (arg->string a1) ", "
-                      (arg->string a2))]    
+                      (arg->string a2))]
       [(Cmp a1 a2)
        (string-append tab "cmp "
                       (arg->string a1) ", "
@@ -120,21 +120,35 @@
        (string-append tab "sar "
                       (arg->string a1) ", "
                       (arg->string a2))]
+      [(Shl a1 a2)
+       (string-append tab "shl "
+                      (arg->string a1) ", "
+                      (arg->string a2))]
+      [(Shr a1 a2)
+       (string-append tab "shr "
+                      (arg->string a1) ", "
+                      (arg->string a2))]
       [(And a1 a2)
        (string-append tab "and "
                       (arg->string a1) ", "
                       (arg->string a2))]
       [(Or a1 a2)
        (string-append tab "or "
                       (arg->string a1) ", "
-                      (arg->string a2))]    
+                      (arg->string a2))]
       [(Xor a1 a2)
        (string-append tab "xor "
                       (arg->string a1) ", "
                       (arg->string a2))]
       [(Jmp l)
        (string-append tab "jmp "
                       (jump-target->string l))]
+      [(Jz l)
+       (string-append tab "jz "
+                      (jump-target->string l))]
+      [(Jnz l)
+       (string-append tab "jnz "
+                      (jump-target->string l))]
       [(Je l)
        (string-append tab "je "
                       (jump-target->string l))]
@@ -165,6 +179,14 @@
       [(Jnc l)
        (string-append tab "jnc "
                       (jump-target->string l))]
+      [(Cmovz dst src)
+       (string-append tab "cmovz "
+                      (reg->string dst) ", "
+                      (arg->string src))]
+      [(Cmovnz dst src)
+       (string-append tab "cmovnz "
+                      (reg->string dst) ", "
+                      (arg->string src))]
       [(Cmove dst src)
        (string-append tab "cmove "
                       (reg->string dst) ", "
@@ -211,13 +233,13 @@
       [(Push a)
        (string-append tab "push "
                       (arg->string a))]
+      [(Pop r)
+       (string-append tab "pop "
+                      (reg->string r))]
       [(Pushf)
        (string-append tab "pushf")]
       [(Popf)
        (string-append tab "popf")]
-      [(Pop r)
-       (string-append tab "pop "
-                      (reg->string r))]
       [(Lea d (? offset? x))
        (string-append tab "lea "
                       (arg->string d) ", "