fix uses of fxzero? on a 32-bit immediate in 32-bit mode

gongchengra · Apr 22, 2019 · 01808c6 · 01808c6
1 parent 9cdc873
commit 01808c6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/LOG b/LOG
@@ -1353,3 +1353,6 @@
   irritants in the original call when who or message is found not to
   be of the right type.
     exceptions.ss
+- fix incorrect uses of fxzero? x86.ss backend, since a 32-bit
+  immediate is not necessarily a fixnum
+    x86.ss
diff --git a/s/x86.ss b/s/x86.ss
@@ -1555,13 +1555,13 @@
       (record-case dest-ea
         [(index) (size index-reg base-reg)
          (cond
-           [(and (fxzero? size) (not (eq? base-reg %ebp))) #f]
+           [(and (eqv? 0 size) (not (eq? base-reg %ebp))) #f]
            [(ax-byte-size? size) (build byte size)]
            [else (build long size)])]
         [(literal@) stuff (cons 'abs stuff)]
         [(disp) (size reg)
          (cond
-           [(and (fxzero? size) (not (eq? reg %ebp))) #f] ; indirect
+           [(and (eqv? 0 size) (not (eq? reg %ebp))) #f] ; indirect
            [(ax-byte-size? size) (build byte size)]
            [else (build long size)])]
         [(reg) r #f]
@@ -1611,13 +1611,13 @@
           (record-case dest-ea
             [(index) (size index-reg base-reg)
              (cond
-               [(and (fxzero? size) (not (eq? base-reg %ebp))) #b00]
+               [(and (eqv? 0 size) (not (eq? base-reg %ebp))) #b00]
                [(ax-byte-size? size) #b01]
                [else #b10])]
             [(literal@) stuff #b00]   
             [(disp) (size reg)
              (cond
-               [(and (fxzero? size) (not (eq? reg %ebp))) #b00] ; indirect
+               [(and (eqv? 0 size) (not (eq? reg %ebp))) #b00] ; indirect
                [(ax-byte-size? size) #b01]
                [else #b10])]
             [(reg) r #b11]