X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Falpha%2Fcell.lisp;h=24bfb51f1b283f3c244bf5bb87ac5b991d09c69c;hb=f73c1f391342c797b8daebe4e8c27e5923341b6d;hp=10734f8cd14686dbf7a2e3434d069d4cadf8e9f6;hpb=6fb6e66f531dfb6140ec3e0cc8f84f6ecd1927ca;p=sbcl.git

diff --git a/src/compiler/alpha/cell.lisp b/src/compiler/alpha/cell.lisp
index 10734f8..24bfb51 100644
--- a/src/compiler/alpha/cell.lisp
+++ b/src/compiler/alpha/cell.lisp
@@ -25,15 +25,15 @@
 (define-vop (set-slot)
   (:args (object :scs (descriptor-reg))
 	 (value :scs (descriptor-reg any-reg null zero)))
-  (:info name offset lowtag #+gengc remember)
+  (:info name offset lowtag #!+gengc remember)
   (:ignore name)
   (:results)
   (:generator 1
-    #+gengc
+    #!+gengc
     (if remember
 	(storew-and-remember-slot value object offset lowtag)
 	(storew value object offset lowtag))
-    #-gengc
+    #!-gengc
     (storew value object offset lowtag)))
 
 ;;;; symbol hacking VOPs
@@ -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))))
@@ -86,8 +86,6 @@
   (:variant symbol-value-slot other-pointer-lowtag)
   (:policy :fast)
   (:translate symbol-value))
-
-
 
 ;;;; fdefinition (FDEFN) objects
 
@@ -104,7 +102,7 @@
   (:generator 10
     (move object obj-temp)
     (loadw value obj-temp fdefn-fun-slot other-pointer-lowtag)
-    (let ((err-lab (generate-error-code vop undefined-symbol-error obj-temp)))
+    (let ((err-lab (generate-error-code vop undefined-fun-error obj-temp)))
       (inst cmpeq value null-tn temp)
       (inst bne temp err-lab))))
 
@@ -119,7 +117,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,10 +151,10 @@
   (: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
+    (#!+gengc storew-and-remember-slot #!-gengc storew
 	     val symbol symbol-value-slot other-pointer-lowtag)))
 
 
@@ -165,10 +163,10 @@
   (:generator 0
     (loadw symbol bsp-tn (- binding-symbol-slot binding-size))
     (loadw value bsp-tn (- binding-value-slot binding-size))
-    (#+gengc storew-and-remember-slot #-gengc storew
+    (#!+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)
@@ -188,12 +186,12 @@
       (loadw symbol bsp-tn (- binding-symbol-slot binding-size))
       (loadw value bsp-tn (- binding-value-slot binding-size))
       (inst beq symbol skip)
-      (#+gengc storew-and-remember-slot #-gengc storew
+      (#!+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))
 
       (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 +238,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)
@@ -270,7 +268,7 @@
 
 ;;;; mutator accessing
 
-#+gengc
+#!+gengc
 (progn
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
@@ -369,8 +367,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)