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 41eea97..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
@@ -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
@@ -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-lowtag)))
+                      :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-lowtag)))
+                        :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-lowtag)))
+                      :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-lowtag))
+                    :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-lowtag)))
+                      :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-lowtag)))
+                        :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-lowtag)))
+                      :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-lowtag))
+                    :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-lowtag)))
+                      :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-lowtag)))
+                        :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-lowtag)))
+                      :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-lowtag))
+                    :disp (- (* (+ (- 624 1) 3 vector-data-offset)
+                                n-word-bytes)
+                             other-pointer-lowtag))
        y)
 
   ;; Restore the temporary registers and return.