Fix up error message for mov when imm is too big (suggesting going through a register doesn't make sense; the imm was bigger than 64-bits).

Author: dvanhorn

langs/a86/ast.rkt

@@ -45,20 +45,33 @@
       (error n "expects register; given ~v" a1))
     a1))
 
-(define (check:src-dest width)
+(define check:src-dest
   (λ (a1 a2 n)
     (unless (or (register? a1) (offset? a1))
       (error n "expects register or offset; given ~v" a1))
     (unless (or (register? a2) (offset? a2) (exact-integer? a2) (Const? a2))
       (error n "expects register, offset, exact integer, or defined constant; given ~v" a2))
     (when (and (offset? a1) (offset? a2))
       (error n "cannot use two memory locations; given ~v, ~v" a1 a2))
-    (when (and (exact-integer? a2) (> (integer-length a2) width))
-      (error n "literal must not exceed ~v-bits; given ~v (~v bits); go through a register instead" width a2 (integer-length a2)))
+    (when (and (exact-integer? a2) (> (integer-length a2) 32))
+      (error n "literal must not exceed 32-bits; given ~v (~v bits); go through a register instead" a2 (integer-length a2)))
     (when (and (offset? a1) (exact-integer? a2))
       (error n "cannot use a memory locations and literal; given ~v, ~v; go through a register instead" a1 a2))
     (values a1 a2)))
 
+(define check:mov
+  (λ (a1 a2 n)
+    (unless (or (register? a1) (offset? a1))
+      (error n "expects register or offset; given ~v" a1))
+    (unless (or (register? a2) (offset? a2) (exact-integer? a2) (Const? a2))
+      (error n "expects register, offset, exact integer, or defined constant; given ~v" a2))
+    (when (and (offset? a1) (offset? a2))
+      (error n "cannot use two memory locations; given ~v, ~v" a1 a2))
+    (when (and (exact-integer? a2) (> (integer-length a2) 64))
+      (error n "literal must not exceed 64-bits; given ~v (~v bits)" a2 (integer-length a2)))
+    (when (and (offset? a1) (exact-integer? a2))
+      (error n "cannot use a memory locations and literal; given ~v, ~v; go through a register instead" a1 a2))
+    (values a1 a2)))
 
 (define check:shift
   (λ (a1 a2 n)
@@ -133,20 +146,20 @@
 (instruct Label  (x)       check:label-symbol)
 (instruct Call   (x)       check:target)
 (instruct Ret    ()        check:none)
-(instruct Mov    (dst src) (check:src-dest 64))
+(instruct Mov    (dst src) check:mov)
 (instruct Add    (dst src) check:arith)
 (instruct Sub    (dst src) check:arith)
-(instruct Cmp    (a1 a2)   (check:src-dest 32))
+(instruct Cmp    (a1 a2)   check:src-dest)
 (instruct Jmp    (x)       check:target)
 (instruct Je     (x)       check:target)
 (instruct Jne    (x)       check:target)
 (instruct Jl     (x)       check:target)
 (instruct Jle    (x)       check:target)
 (instruct Jg     (x)       check:target)
 (instruct Jge    (x)       check:target)
-(instruct And    (dst src) (check:src-dest 32))
-(instruct Or     (dst src) (check:src-dest 32))
-(instruct Xor    (dst src) (check:src-dest 32))
+(instruct And    (dst src) check:src-dest)
+(instruct Or     (dst src) check:src-dest)
+(instruct Xor    (dst src) check:src-dest)
 (instruct Sal    (dst i)   check:shift)
 (instruct Sar    (dst i)   check:shift)
 (instruct Push   (a1)      check:push)