0.pre7.60:

[sbcl.git] / src / compiler / alpha / system.lisp

diff --git a/src/compiler/alpha/system.lisp b/src/compiler/alpha/system.lisp
index 936b52a..fad8567 100644 (file)
--- a/src/compiler/alpha/system.lisp
+++ b/src/compiler/alpha/system.lisp
@@ -10,9 +10,8 @@
 ;;;; files for more information.
 
 (in-package "SB!VM")
-
 \f
-;;;; Type frobbing VOPs
+;;;; type frobbing VOPs
 
 (define-vop (get-lowtag)
   (:translate get-lowtag)
@@ -33,9 +32,9 @@
   (:generator 6
     ;; Pick off objects with headers.
     (inst and object lowtag-mask result)
-    (inst cmpeq result other-pointer-type ndescr)
+    (inst cmpeq result other-pointer-lowtag ndescr)
     (inst bne ndescr other-ptr)
-    (inst cmpeq result function-pointer-type ndescr)
+    (inst cmpeq result fun-pointer-lowtag ndescr)
     (inst bne ndescr function-ptr)
 
     ;; Pick off structure and list pointers.
@@ -46,15 +45,15 @@
     (inst beq result done)
 
     ;; Must be an other immediate.
-    (inst and object type-mask result)
+    (inst and object widetag-mask result)
     (inst br zero-tn done)
 
     FUNCTION-PTR
-    (load-type result object (- function-pointer-type))
+    (load-type result object (- fun-pointer-lowtag))
     (inst br zero-tn done)
 
     OTHER-PTR
-    (load-type result object (- other-pointer-type))
+    (load-type result object (- other-pointer-lowtag))
       
     DONE))
 
@@ -65,7 +64,7 @@
   (:results (result :scs (unsigned-reg)))
   (:result-types positive-fixnum)
   (:generator 6
-    (load-type result function (- function-pointer-type))))
+    (load-type result function (- fun-pointer-lowtag))))
 
 (define-vop (set-function-subtype)
   (:translate (setf function-subtype))
@@ -77,10 +76,10 @@
   (:results (result :scs (unsigned-reg)))
   (:result-types positive-fixnum)
   (:generator 6
-    (inst ldl temp (- function-pointer-type) function)
+    (inst ldl temp (- fun-pointer-lowtag) function)
     (inst and temp #xff temp)
     (inst bis type temp temp)
-    (inst stl temp (- function-pointer-type) function)
+    (inst stl temp (- fun-pointer-lowtag) function)
     (move type result)))
 
 
@@ -91,8 +90,8 @@
   (:results (res :scs (unsigned-reg)))
   (:result-types positive-fixnum)
   (:generator 6
-    (loadw res x 0 other-pointer-type)
-    (inst srl res type-bits res)))
+    (loadw res x 0 other-pointer-lowtag)
+    (inst srl res n-widetag-bits res)))
 
 (define-vop (get-closure-length)
   (:translate get-closure-length)
@@ -101,8 +100,8 @@
   (:results (res :scs (unsigned-reg)))
   (:result-types positive-fixnum)
   (:generator 6
-    (loadw res x 0 function-pointer-type)
-    (inst srl res type-bits res)))
+    (loadw res x 0 fun-pointer-lowtag)
+    (inst srl res n-widetag-bits res)))
 
 (define-vop (set-header-data)
   (:translate set-header-data)
@@ -113,21 +112,21 @@
   (:results (res :scs (descriptor-reg)))
   (:temporary (:scs (non-descriptor-reg)) t1 t2)
   (:generator 6
-    (loadw t1 x 0 other-pointer-type)
-    (inst and t1 type-mask t1)
+    (loadw t1 x 0 other-pointer-lowtag)
+    (inst and t1 widetag-mask t1)
     (sc-case data
       (any-reg
-       (inst sll data (- type-bits 2) t2)
+       (inst sll data (- n-widetag-bits 2) t2)
        (inst bis t1 t2 t1))
       (immediate
-       (let ((c (ash (tn-value data) type-bits)))
+       (let ((c (ash (tn-value data) n-widetag-bits)))
         (cond ((<= 0 c (1- (ash 1 8)))
                (inst bis t1 c t1))
               (t
                (inst li c t2)
                (inst bis t1 t2 t1)))))
       (zero))
-    (storew t1 x 0 other-pointer-type)
+    (storew t1 x 0 other-pointer-lowtag)
     (move x res)))
 
 (define-vop (make-fixnum)
@@ -149,15 +148,15 @@
   (:generator 2
     (sc-case type
       ((immediate)
-       (inst sll val type-bits temp)
+       (inst sll val n-widetag-bits temp)
        (inst bis temp (tn-value type) res))
       (t
        (inst sra type 2 temp)
-       (inst sll val (- type-bits 2) res)
+       (inst sll val (- n-widetag-bits 2) res)
        (inst bis res temp res)))))
 
 \f
-;;;; Allocation
+;;;; allocation
 
 (define-vop (dynamic-space-free-pointer)
   (:results (int :scs (sap-reg)))
@@ -184,7 +183,7 @@
     (move csp-tn int)))
 
 \f
-;;;; Code object frobbing.
+;;;; code object frobbing
 
 (define-vop (code-instructions)
   (:translate code-instructions)
@@ -194,10 +193,10 @@
   (:results (sap :scs (sap-reg)))
   (:result-types system-area-pointer)
   (:generator 10
-    (loadw ndescr code 0 other-pointer-type)
-    (inst srl ndescr type-bits ndescr)
+    (loadw ndescr code 0 other-pointer-lowtag)
+    (inst srl ndescr n-widetag-bits ndescr)
     (inst sll ndescr word-shift ndescr)
-    (inst subq ndescr other-pointer-type ndescr)
+    (inst subq ndescr other-pointer-lowtag ndescr)
     (inst addq code ndescr sap)))
 
 (define-vop (compute-function)
@@ -207,16 +206,14 @@
   (:results (func :scs (descriptor-reg)))
   (:temporary (:scs (non-descriptor-reg)) ndescr)
   (:generator 10
-    (loadw ndescr code 0 other-pointer-type)
-    (inst srl ndescr type-bits ndescr)
+    (loadw ndescr code 0 other-pointer-lowtag)
+    (inst srl ndescr n-widetag-bits ndescr)
     (inst sll ndescr word-shift ndescr)
     (inst addq ndescr offset ndescr)
-    (inst subq ndescr (- other-pointer-type function-pointer-type) ndescr)
+    (inst subq ndescr (- other-pointer-lowtag fun-pointer-lowtag) ndescr)
     (inst addq code ndescr func)))
-
 \f
-;;;; Other random VOPs.
-
+;;;; other random VOPs.
 
 (defknown sb!unix::do-pending-interrupt () (values))
 (define-vop (sb!unix::do-pending-interrupt)
@@ -229,9 +226,8 @@
 (define-vop (halt)
   (:generator 1
     (inst gentrap halt-trap)))
-
 \f
-;;;; Dynamic vop count collection support
+;;;; dynamic vop count collection support
 
 (define-vop (count-me)
   (:args (count-vector :scs (descriptor-reg)))
@@ -239,7 +235,8 @@
   (:temporary (:scs (non-descriptor-reg)) count)
   (:generator 1
     (let ((offset
-          (- (* (+ index vector-data-offset) word-bytes) other-pointer-type)))
+          (- (* (+ index vector-data-offset) n-word-bytes)
+             other-pointer-lowtag)))
       (inst ldl count offset count-vector)
       (inst addq count 1 count)
       (inst stl count offset count-vector))))