X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fsystem.lisp;h=2bbfa625476c8d7c84370fd8342b4bb01b302a46;hb=e049902f5e7c30501d2dbb7a41d058a0c717fc1f;hp=b6e58849929203c83b3f43da1f0c3f3cd4519bc5;hpb=f143939b1dbaf38ebd4f92c851fbc4ecddf37af1;p=sbcl.git diff --git a/src/compiler/x86/system.lisp b/src/compiler/x86/system.lisp index b6e5884..2bbfa62 100644 --- a/src/compiler/x86/system.lisp +++ b/src/compiler/x86/system.lisp @@ -13,8 +13,8 @@ ;;;; type frobbing VOPs -(define-vop (get-lowtag) - (:translate get-lowtag) +(define-vop (lowtag-of) + (:translate lowtag-of) (:policy :fast-safe) (:args (object :scs (any-reg descriptor-reg control-stack) :target result)) @@ -24,8 +24,8 @@ (move result object) (inst and result lowtag-mask))) -(define-vop (get-type) - (:translate get-type) +(define-vop (widetag-of) + (:translate widetag-of) (:policy :fast-safe) (:args (object :scs (descriptor-reg))) (:temporary (:sc unsigned-reg :offset eax-offset :to (:result 0)) eax) @@ -34,9 +34,9 @@ (:generator 6 (inst mov eax object) (inst and al-tn lowtag-mask) - (inst cmp al-tn other-pointer-type) + (inst cmp al-tn other-pointer-lowtag) (inst jmp :e other-ptr) - (inst cmp al-tn fun-pointer-type) + (inst cmp al-tn fun-pointer-lowtag) (inst jmp :e function-ptr) ;; Pick off structures and list pointers. @@ -52,28 +52,28 @@ (inst jmp done) FUNCTION-PTR - (load-type al-tn object (- sb!vm:fun-pointer-type)) + (load-type al-tn object (- fun-pointer-lowtag)) (inst jmp done) OTHER-PTR - (load-type al-tn object (- sb!vm:other-pointer-type)) + (load-type al-tn object (- other-pointer-lowtag)) DONE (inst movzx result al-tn))) -(define-vop (function-subtype) - (:translate function-subtype) +(define-vop (fun-subtype) + (:translate fun-subtype) (:policy :fast-safe) (:args (function :scs (descriptor-reg))) (:temporary (:sc byte-reg :from (:eval 0) :to (:eval 1)) temp) (:results (result :scs (unsigned-reg))) (:result-types positive-fixnum) (:generator 6 - (load-type temp function (- sb!vm:fun-pointer-type)) + (load-type temp function (- fun-pointer-lowtag)) (inst movzx result temp))) -(define-vop (set-function-subtype) - (:translate (setf function-subtype)) +(define-vop (set-fun-subtype) + (:translate (setf fun-subtype)) (:policy :fast-safe) (:args (type :scs (unsigned-reg) :target eax) (function :scs (descriptor-reg))) @@ -86,7 +86,7 @@ (:generator 6 (move eax type) (inst mov - (make-ea :byte :base function :disp (- fun-pointer-type)) + (make-ea :byte :base function :disp (- fun-pointer-lowtag)) al-tn) (move result eax))) @@ -97,8 +97,8 @@ (:results (res :scs (unsigned-reg))) (:result-types positive-fixnum) (:generator 6 - (loadw res x 0 other-pointer-type) - (inst shr res type-bits))) + (loadw res x 0 other-pointer-lowtag) + (inst shr res n-widetag-bits))) (define-vop (get-closure-length) (:translate get-closure-length) @@ -107,8 +107,8 @@ (:results (res :scs (unsigned-reg))) (:result-types positive-fixnum) (:generator 6 - (loadw res x 0 fun-pointer-type) - (inst shr res type-bits))) + (loadw res x 0 fun-pointer-lowtag) + (inst shr res n-widetag-bits))) (define-vop (set-header-data) (:translate set-header-data) @@ -121,9 +121,9 @@ :from (:argument 1) :to (:result 0)) eax) (:generator 6 (move eax data) - (inst shl eax (- type-bits 2)) - (inst mov al-tn (make-ea :byte :base x :disp (- other-pointer-type))) - (storew eax x 0 other-pointer-type) + (inst shl eax (- n-widetag-bits 2)) + (inst mov al-tn (make-ea :byte :base x :disp (- other-pointer-lowtag))) + (storew eax x 0 other-pointer-lowtag) (move res x))) (define-vop (make-fixnum) @@ -142,7 +142,7 @@ (:results (res :scs (any-reg descriptor-reg) :from (:argument 0))) (:generator 2 (move res val) - (inst shl res (- type-bits 2)) + (inst shl res (- n-widetag-bits 2)) (inst or res (sc-case type (unsigned-reg type) (immediate (tn-value type)))))) @@ -196,22 +196,22 @@ (:results (sap :scs (sap-reg) :from (:argument 0))) (:result-types system-area-pointer) (:generator 10 - (loadw sap code 0 other-pointer-type) - (inst shr sap type-bits) + (loadw sap code 0 other-pointer-lowtag) + (inst shr sap n-widetag-bits) (inst lea sap (make-ea :byte :base code :index sap :scale 4 - :disp (- other-pointer-type))))) + :disp (- other-pointer-lowtag))))) -(define-vop (compute-function) +(define-vop (compute-fun) (:args (code :scs (descriptor-reg) :to (:result 0)) (offset :scs (signed-reg unsigned-reg) :to (:result 0))) (:arg-types * positive-fixnum) (:results (func :scs (descriptor-reg) :from (:argument 0))) (:generator 10 - (loadw func code 0 other-pointer-type) - (inst shr func type-bits) + (loadw func code 0 other-pointer-lowtag) + (inst shr func n-widetag-bits) (inst lea func (make-ea :byte :base offset :index func :scale 4 - :disp (- fun-pointer-type other-pointer-type))) + :disp (- fun-pointer-lowtag other-pointer-lowtag))) (inst add func code))) (define-vop (%simple-fun-self) @@ -220,19 +220,19 @@ (:args (function :scs (descriptor-reg))) (:results (result :scs (descriptor-reg))) (:generator 3 - (loadw result function simple-fun-self-slot fun-pointer-type) + (loadw result function simple-fun-self-slot fun-pointer-lowtag) (inst lea result (make-ea :byte :base result - :disp (- fun-pointer-type - (* simple-fun-code-offset word-bytes)))))) + :disp (- fun-pointer-lowtag + (* simple-fun-code-offset n-word-bytes)))))) ;;; The closure function slot is a pointer to raw code on X86 instead ;;; of a pointer to the code function object itself. This VOP is used ;;; to reference the function object given the closure object. -(def-source-transform %closure-fun (closure) +(define-source-transform %closure-fun (closure) `(%simple-fun-self ,closure)) -(def-source-transform %funcallable-instance-fun (fin) +(define-source-transform %funcallable-instance-fun (fin) `(%simple-fun-self ,fin)) (define-vop (%set-fun-self) @@ -246,8 +246,8 @@ (inst lea temp (make-ea :byte :base new-self :disp (- (ash simple-fun-code-offset word-shift) - fun-pointer-type))) - (storew temp function simple-fun-self-slot fun-pointer-type) + fun-pointer-lowtag))) + (storew temp function simple-fun-self-slot fun-pointer-lowtag) (move result new-self))) ;;; KLUDGE: This seems to be some kind of weird override of the way @@ -266,10 +266,10 @@ ;;;; other miscellaneous VOPs -(defknown sb!unix::do-pending-interrupt () (values)) -(define-vop (sb!unix::do-pending-interrupt) +(defknown sb!unix::receive-pending-interrupt () (values)) +(define-vop (sb!unix::receive-pending-interrupt) (:policy :fast-safe) - (:translate sb!unix::do-pending-interrupt) + (:translate sb!unix::receive-pending-interrupt) (:generator 1 (inst break pending-interrupt-trap))) @@ -295,5 +295,5 @@ (:info index) (:generator 0 (inst inc (make-ea :dword :base count-vector - :disp (- (* (+ vector-data-offset index) word-bytes) - other-pointer-type))))) + :disp (- (* (+ vector-data-offset index) n-word-bytes) + other-pointer-lowtag)))))