0.pre7.80:

[sbcl.git] / src / assembly / x86 / arith.lisp

diff --git a/src/assembly/x86/arith.lisp b/src/assembly/x86/arith.lisp
index 68cdc1b..92c270a 100644 (file)
--- a/src/assembly/x86/arith.lisp
+++ b/src/assembly/x86/arith.lisp
@@ -43,7 +43,7 @@
                (inst push ebp-tn)
                (inst lea
                      ebp-tn
-                     (make-ea :dword :base esp-tn :disp word-bytes))
+                     (make-ea :dword :base esp-tn :disp n-word-bytes))
                (inst sub esp-tn (fixnumize 2))
                (inst push eax)  ; callers return addr
                (inst mov ecx (fixnumize 2)) ; arg count
@@ -65,8 +65,8 @@
 
     (move ecx res)
 
-    (with-fixed-allocation (res bignum-type (1+ bignum-digits-offset))
-      (storew ecx res bignum-digits-offset other-pointer-type))
+    (with-fixed-allocation (res bignum-widetag (1+ bignum-digits-offset))
+      (storew ecx res bignum-digits-offset other-pointer-lowtag))
 
     OKAY)
 
@@ -85,8 +85,8 @@
 
     (move ecx res)
 
-    (with-fixed-allocation (res bignum-type (1+ bignum-digits-offset))
-      (storew ecx res bignum-digits-offset other-pointer-type))
+    (with-fixed-allocation (res bignum-widetag (1+ bignum-digits-offset))
+      (storew ecx res bignum-digits-offset other-pointer-lowtag))
     OKAY)
 
   (define-generic-arith-routine (* 30)
@@ -106,15 +106,15 @@
     (inst cmp x ecx)
     (inst jmp :e SINGLE-WORD-BIGNUM)
 
-    (with-fixed-allocation (res bignum-type (+ bignum-digits-offset 2))
-      (storew eax res bignum-digits-offset other-pointer-type)
-      (storew ecx res (1+ bignum-digits-offset) other-pointer-type))
+    (with-fixed-allocation (res bignum-widetag (+ bignum-digits-offset 2))
+      (storew eax res bignum-digits-offset other-pointer-lowtag)
+      (storew ecx res (1+ bignum-digits-offset) other-pointer-lowtag))
     (inst jmp DONE)
 
     SINGLE-WORD-BIGNUM
 
-    (with-fixed-allocation (res bignum-type (1+ bignum-digits-offset))
-      (storew eax res bignum-digits-offset other-pointer-type))
+    (with-fixed-allocation (res bignum-widetag (1+ bignum-digits-offset))
+      (storew eax res bignum-digits-offset other-pointer-lowtag))
     (inst jmp DONE)
 
     OKAY
@@ -139,7 +139,7 @@
 
   (inst pop eax)
   (inst push ebp-tn)
-  (inst lea ebp-tn (make-ea :dword :base esp-tn :disp word-bytes))
+  (inst lea ebp-tn (make-ea :dword :base esp-tn :disp n-word-bytes))
   (inst sub esp-tn (fixnumize 2))
   (inst push eax)
   (inst mov ecx (fixnumize 1))   ; arg count
@@ -153,8 +153,8 @@
   (inst shr res 2)                   ; sign bit is data - remove type bits
   (move ecx res)
 
-  (with-fixed-allocation (res bignum-type (1+ bignum-digits-offset))
-    (storew ecx res bignum-digits-offset other-pointer-type))
+  (with-fixed-allocation (res bignum-widetag (1+ bignum-digits-offset))
+    (storew ecx res bignum-digits-offset other-pointer-lowtag))
 
   OKAY)
 \f
@@ -187,7 +187,9 @@
                TAIL-CALL-TO-STATIC-FN
                (inst pop eax)
                (inst push ebp-tn)
-               (inst lea ebp-tn (make-ea :dword :base esp-tn :disp word-bytes))
+               (inst lea ebp-tn (make-ea :dword
+                                         :base esp-tn
+                                         :disp n-word-bytes))
                (inst sub esp-tn (fixnumize 2)) ; FIXME: Push 2 words on stack,
                                                ; weirdly?
                (inst push eax)
@@ -248,7 +250,7 @@
   DO-STATIC-FN
   (inst pop eax)
   (inst push ebp-tn)
-  (inst lea ebp-tn (make-ea :dword :base esp-tn :disp word-bytes))
+  (inst lea ebp-tn (make-ea :dword :base esp-tn :disp n-word-bytes))
   (inst sub esp-tn (fixnumize 2))
   (inst push eax)
   (inst mov ecx (fixnumize 2))
@@ -289,7 +291,7 @@
   DO-STATIC-FN
   (inst pop eax)
   (inst push ebp-tn)
-  (inst lea ebp-tn (make-ea :dword :base esp-tn :disp word-bytes))
+  (inst lea ebp-tn (make-ea :dword :base esp-tn :disp n-word-bytes))
   (inst sub esp-tn (fixnumize 2))
   (inst push eax)
   (inst mov ecx (fixnumize 2))
@@ -333,13 +335,13 @@
   (inst xor k k)
   LOOP1
   (inst mov y (make-ea :dword :base state :index k :scale 4
-                      :disp (- (* (+ 3 sb!vm:vector-data-offset)
-                                  sb!vm:word-bytes)
-                               sb!vm:other-pointer-type)))
+                      :disp (- (* (+ 3 vector-data-offset)
+                                  n-word-bytes)
+                               other-pointer-lowtag)))
   (inst mov tmp (make-ea :dword :base state :index k :scale 4
-                        :disp (- (* (+ 1 3 sb!vm:vector-data-offset)
-                                    sb!vm:word-bytes)
-                                 sb!vm:other-pointer-type)))
+                        :disp (- (* (+ 1 3 vector-data-offset)
+                                    n-word-bytes)
+                                 other-pointer-lowtag)))
   (inst and y #x80000000)
   (inst and tmp #x7fffffff)
   (inst or y tmp)
@@ -348,26 +350,26 @@
   (inst xor y #x9908b0df)
   SKIP1
   (inst xor y (make-ea :dword :base state :index k :scale 4
-                      :disp (- (* (+ 397 3 sb!vm:vector-data-offset)
-                                  sb!vm:word-bytes)
-                               sb!vm:other-pointer-type)))
+                      :disp (- (* (+ 397 3 vector-data-offset)
+                                  n-word-bytes)
+                               other-pointer-lowtag)))
   (inst mov (make-ea :dword :base state :index k :scale 4
-                    :disp (- (* (+ 3 sb!vm:vector-data-offset)
-                                sb!vm:word-bytes)
-                             sb!vm:other-pointer-type))
+                    :disp (- (* (+ 3 vector-data-offset)
+                                n-word-bytes)
+                             other-pointer-lowtag))
        y)
   (inst inc k)
   (inst cmp k (- 624 397))
   (inst jmp :b loop1)
   LOOP2
   (inst mov y (make-ea :dword :base state :index k :scale 4
-                      :disp (- (* (+ 3 sb!vm:vector-data-offset)
-                                  sb!vm:word-bytes)
-                               sb!vm:other-pointer-type)))
+                      :disp (- (* (+ 3 vector-data-offset)
+                                  n-word-bytes)
+                               other-pointer-lowtag)))
   (inst mov tmp (make-ea :dword :base state :index k :scale 4
-                        :disp (- (* (+ 1 3 sb!vm:vector-data-offset)
-                                    sb!vm:word-bytes)
-                                 sb!vm:other-pointer-type)))
+                        :disp (- (* (+ 1 3 vector-data-offset)
+                                    n-word-bytes)
+                                 other-pointer-lowtag)))
   (inst and y #x80000000)
   (inst and tmp #x7fffffff)
   (inst or y tmp)
@@ -376,26 +378,26 @@
   (inst xor y #x9908b0df)
   SKIP2
   (inst xor y (make-ea :dword :base state :index k :scale 4
-                      :disp (- (* (+ (- 397 624) 3 sb!vm:vector-data-offset)
-                                  sb!vm:word-bytes)
-                               sb!vm:other-pointer-type)))
+                      :disp (- (* (+ (- 397 624) 3 vector-data-offset)
+                                  n-word-bytes)
+                               other-pointer-lowtag)))
   (inst mov (make-ea :dword :base state :index k :scale 4
-                    :disp (- (* (+ 3 sb!vm:vector-data-offset)
-                                sb!vm:word-bytes)
-                             sb!vm:other-pointer-type))
+                    :disp (- (* (+ 3 vector-data-offset)
+                                n-word-bytes)
+                             other-pointer-lowtag))
        y)
   (inst inc k)
   (inst cmp k (- 624 1))
   (inst jmp :b loop2)
 
   (inst mov y (make-ea :dword :base state
-                      :disp (- (* (+ (- 624 1) 3 sb!vm:vector-data-offset)
-                                  sb!vm:word-bytes)
-                               sb!vm:other-pointer-type)))
+                      :disp (- (* (+ (- 624 1) 3 vector-data-offset)
+                                  n-word-bytes)
+                               other-pointer-lowtag)))
   (inst mov tmp (make-ea :dword :base state
-                        :disp (- (* (+ 0 3 sb!vm:vector-data-offset)
-                                    sb!vm:word-bytes)
-                                 sb!vm:other-pointer-type)))
+                        :disp (- (* (+ 0 3 vector-data-offset)
+                                    n-word-bytes)
+                                 other-pointer-lowtag)))
   (inst and y #x80000000)
   (inst and tmp #x7fffffff)
   (inst or y tmp)
@@ -404,13 +406,13 @@
   (inst xor y #x9908b0df)
   SKIP3
   (inst xor y (make-ea :dword :base state
-                      :disp (- (* (+ (- 397 1) 3 sb!vm:vector-data-offset)
-                                  sb!vm:word-bytes)
-                               sb!vm:other-pointer-type)))
+                      :disp (- (* (+ (- 397 1) 3 vector-data-offset)
+                                  n-word-bytes)
+                               other-pointer-lowtag)))
   (inst mov (make-ea :dword :base state
-                    :disp (- (* (+ (- 624 1) 3 sb!vm:vector-data-offset)
-                                sb!vm:word-bytes)
-                             sb!vm:other-pointer-type))
+                    :disp (- (* (+ (- 624 1) 3 vector-data-offset)
+                                n-word-bytes)
+                             other-pointer-lowtag))
        y)
 
   ;; Restore the temporary registers and return.