X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Fcell.lisp;h=22a27342fe8b5c2df81fbd9b5dfd623e263d4931;hb=f9ef8b045b60ae064c7bd40af599b46707ea4d8a;hp=98ed01849702c0c9e01e534798f05b5b9a0b2515;hpb=50305b602c3953440af716137a56f50cd204375d;p=sbcl.git diff --git a/src/compiler/alpha/cell.lisp b/src/compiler/alpha/cell.lisp index 98ed018..22a2734 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 @@ -63,8 +63,8 @@ (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) @@ -104,7 +104,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)))) @@ -156,7 +156,7 @@ (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,7 +165,7 @@ (: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 n-word-bytes) bsp-tn))) @@ -188,7 +188,7 @@ (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)) @@ -270,7 +270,7 @@ ;;;; mutator accessing -#+gengc +#!+gengc (progn (eval-when (:compile-toplevel :load-toplevel :execute) @@ -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)