(move temp offset)
(inst neg temp)
(inst mov result
- (make-ea :dword :base sap :disp (- word-bytes) :index temp))))
+ (make-ea :dword :base sap :disp (- n-word-bytes) :index temp))))
(define-vop (read-control-stack-c)
(:translate stack-ref)
(:result-types *)
(:generator 5
(inst mov result (make-ea :dword :base sap
- :disp (- (* (1+ index) word-bytes))))))
+ :disp (- (* (1+ index) n-word-bytes))))))
(define-vop (write-control-stack)
(:translate %set-stack-ref)
(move temp offset)
(inst neg temp)
(inst mov
- (make-ea :dword :base sap :disp (- word-bytes) :index temp) value)
+ (make-ea :dword :base sap :disp (- n-word-bytes) :index temp) value)
(move result value)))
(define-vop (write-control-stack-c)
(:result-types *)
(:generator 5
(inst mov (make-ea :dword :base sap
- :disp (- (* (1+ index) word-bytes)))
+ :disp (- (* (1+ index) n-word-bytes)))
value)
(move result value)))
(let ((bogus (gen-label))
(done (gen-label)))
(loadw temp thing 0 lowtag)
- (inst shr temp type-bits)
+ (inst shr temp n-widetag-bits)
(inst jmp :z bogus)
- (inst shl temp (1- (integer-length word-bytes)))
- (unless (= lowtag other-pointer-type)
- (inst add temp (- lowtag other-pointer-type)))
+ (inst shl temp (1- (integer-length n-word-bytes)))
+ (unless (= lowtag other-pointer-lowtag)
+ (inst add temp (- lowtag other-pointer-lowtag)))
(move code thing)
(inst sub code temp)
(emit-label done)
(define-vop (code-from-lra code-from-mumble)
(:translate sb!di::lra-code-header)
- (:variant other-pointer-type))
+ (:variant other-pointer-lowtag))
(define-vop (code-from-function code-from-mumble)
(:translate sb!di::fun-code-header)
- (:variant fun-pointer-type))
+ (:variant fun-pointer-lowtag))
(define-vop (make-lisp-obj)
(:policy :fast-safe)
(:results (res :scs (unsigned-reg)))
(:result-types positive-fixnum)
(:generator 5
- (loadw res fun 0 fun-pointer-type)
- (inst shr res type-bits)))
+ (loadw res fun 0 fun-pointer-lowtag)
+ (inst shr res n-widetag-bits)))