New Loot!

Author: jmct

langs/a86/ast.rkt

@@ -56,8 +56,8 @@
 
 (define check:offset
   (λ (r i n)
-    (unless (register? r)
-      (error n "expects register as first argument; given ~v" r))
+    (unless (or (register? r) (label? r))
+      (error n "expects register or label as first argument; given ~v" r))
     (unless (exact-integer? i)
       (error n "expects exact integer as second argument; given ~v" i))
     (values r i)))
@@ -72,8 +72,8 @@
   (λ (dst x n)
     (unless (or (register? dst) (offset? dst))
       (error n "expects register or offset; given ~v" dst))
-    (unless (label? x)
-      (error n "expects label; given ~v" x))
+    (unless (or (label? x) (offset? x))
+      (error n "expects label or offset; given ~v" x))
     (values dst x)))
 
 (define check:none

langs/a86/printer.rkt

@@ -16,7 +16,9 @@
     [(? reg?) (reg->string a)]
     [(? integer?) (number->string a)]
     [(Offset (? reg? r) i)
-     (string-append "[" (reg->string r) " + " (number->string i) "]")]))
+     (string-append "[" (reg->string r) " + " (number->string i) "]")]
+    [(Offset (? label? l) i)
+     (string-append "[" (symbol->string l) " + " (number->string i) "]")]))
 
 ;; Any -> Boolean
 (define (reg? x)
@@ -123,6 +125,10 @@
       [(Pop r)
        (string-append tab "pop "
                       (reg->string r))]
+      [(Lea d (? offset? x))
+       (string-append tab "lea "
+                      (arg->string d) ", "
+                      (arg->string x))]
       [(Lea d x)
        (string-append tab "lea "
                       (arg->string d) ", [rel "

langs/loot-new/ast.rkt

@@ -150,6 +150,7 @@
 ;; Prog -> Prog
 (define (desugar e+)
   (match e+
+    [(Prog '() e)    (Prog '() (desugar e))]
     [(Prog ds e)     (let ((defs (map desugar ds)))
                           (Prog '() (LetRec defs e)))]
     [(Defn f xs e)   (list f (Lam f xs e))]