0.7.1.2:

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

diff --git a/src/compiler/alpha/cell.lisp b/src/compiler/alpha/cell.lisp
index 10734f8..cdee958 100644 (file)
--- a/src/compiler/alpha/cell.lisp
+++ b/src/compiler/alpha/cell.lisp
@@ -60,11 +60,11 @@
     (move object obj-temp)
     (loadw value obj-temp symbol-value-slot other-pointer-lowtag)
     (let ((err-lab (generate-error-code vop unbound-symbol-error obj-temp)))
-      (inst xor value unbound-marker-type temp)
+      (inst xor value unbound-marker-widetag temp)
       (inst beq temp err-lab))))
 
-;;; Like CHECKED-CELL-REF, only we are a predicate to see if the cell
-;;; is bound.
+;;; like CHECKED-CELL-REF, only we are a predicate to see if the cell
+;;; is bound
 (define-vop (boundp-frob)
   (:args (object :scs (descriptor-reg)))
   (:conditional)
@@ -77,7 +77,7 @@
   (:translate boundp)
   (:generator 9
     (loadw value object symbol-value-slot other-pointer-lowtag)
-    (inst xor value unbound-marker-type temp)
+    (inst xor value unbound-marker-widetag temp)
     (if not-p
        (inst beq temp target)
        (inst bne temp target))))
@@ -119,7 +119,7 @@
   (:generator 38
     (let ((normal-fn (gen-label)))
       (load-type type function (- fun-pointer-lowtag))
-      (inst xor type simple-fun-header-type type)
+      (inst xor type simple-fun-header-widetag type)
       (inst addq function
            (- (ash simple-fun-code-offset word-shift) fun-pointer-lowtag)
            lip)
@@ -153,7 +153,7 @@
   (:temporary (:scs (descriptor-reg)) temp)
   (:generator 5
     (loadw temp symbol symbol-value-slot other-pointer-lowtag)
-    (inst addq bsp-tn (* 2 word-bytes) bsp-tn)
+    (inst addq bsp-tn (* 2 n-word-bytes) bsp-tn)
     (storew temp bsp-tn (- binding-value-slot binding-size))
     (storew symbol bsp-tn (- binding-symbol-slot binding-size))
     (#+gengc storew-and-remember-slot #-gengc storew
@@ -168,7 +168,7 @@
     (#+gengc storew-and-remember-slot #-gengc storew
             value symbol symbol-value-slot other-pointer-lowtag)
     (storew zero-tn bsp-tn (- binding-symbol-slot binding-size))
-    (inst subq bsp-tn (* 2 word-bytes) bsp-tn)))
+    (inst subq bsp-tn (* 2 n-word-bytes) bsp-tn)))
 
 
 (define-vop (unbind-to-here)
@@ -193,7 +193,7 @@
       (storew zero-tn bsp-tn (- binding-symbol-slot binding-size))
 
       (emit-label skip)
-      (inst subq bsp-tn (* 2 word-bytes) bsp-tn)
+      (inst subq bsp-tn (* 2 n-word-bytes) bsp-tn)
       (inst cmpeq where bsp-tn temp)
       (inst beq temp loop)
 
@@ -240,7 +240,7 @@
   (:result-types positive-fixnum)
   (:generator 4
     (loadw res struct 0 instance-pointer-lowtag)
-    (inst srl res type-bits res)))
+    (inst srl res n-widetag-bits res)))
 
 (define-vop (instance-ref slot-ref)
   (:variant instance-slots-offset instance-pointer-lowtag)
@@ -369,8 +369,6 @@
   (define-mutator-accessors binding-stack-end :sap nil)
   (define-mutator-accessors number-stack-base :sap nil)
   (define-mutator-accessors number-stack-end :sap nil)
-  (define-mutator-accessors eval-stack :des t)
-  (define-mutator-accessors eval-stack-top :ub32 t)
   (define-mutator-accessors nursery-start :sap nil)
   (define-mutator-accessors nursery-end :sap nil)
   (define-mutator-accessors storebuf-start :sap nil)