X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fsystem.lisp;h=2bbfa625476c8d7c84370fd8342b4bb01b302a46;hb=bc46c8bcdd6ac8918df8ea9e9db49808e4924fcf;hp=18657641bab84ca7e2536acdc5834697e4fdd199;hpb=7848e760d71ba19c6b69b636d12b7ebd28696bf8;p=sbcl.git diff --git a/src/compiler/x86/system.lisp b/src/compiler/x86/system.lisp index 1865764..2bbfa62 100644 --- a/src/compiler/x86/system.lisp +++ b/src/compiler/x86/system.lisp @@ -10,14 +10,11 @@ ;;;; files for more information. (in-package "SB!VM") - -(file-comment - "$Header$") ;;;; 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)) @@ -27,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) @@ -37,16 +34,16 @@ (: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 function-pointer-type) + (inst cmp al-tn fun-pointer-lowtag) (inst jmp :e function-ptr) - ;; pick off structures and list pointers + ;; Pick off structures and list pointers. (inst test al-tn 1) (inst jmp :ne done) - ;; pick off fixnums + ;; Pick off fixnums. (inst and al-tn 3) (inst jmp :e done) @@ -55,28 +52,28 @@ (inst jmp done) FUNCTION-PTR - (load-type al-tn object (- sb!vm:function-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:function-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))) @@ -89,7 +86,7 @@ (:generator 6 (move eax type) (inst mov - (make-ea :byte :base function :disp (- function-pointer-type)) + (make-ea :byte :base function :disp (- fun-pointer-lowtag)) al-tn) (move result eax))) @@ -100,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) @@ -110,8 +107,8 @@ (:results (res :scs (unsigned-reg))) (:result-types positive-fixnum) (:generator 6 - (loadw res x 0 function-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) @@ -124,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) @@ -145,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)))))) @@ -199,52 +196,48 @@ (: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 (- function-pointer-type other-pointer-type))) + :disp (- fun-pointer-lowtag other-pointer-lowtag))) (inst add func code))) -(defknown %function-self (function) function (flushable)) - -(define-vop (%function-self) +(define-vop (%simple-fun-self) (:policy :fast-safe) - (:translate %function-self) + (:translate %simple-fun-self) (:args (function :scs (descriptor-reg))) (:results (result :scs (descriptor-reg))) (:generator 3 - (loadw result function function-self-slot function-pointer-type) + (loadw result function simple-fun-self-slot fun-pointer-lowtag) (inst lea result (make-ea :byte :base result - :disp (- function-pointer-type - (* function-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 +;;; 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-function (closure) - `(%function-self ,closure)) - -(def-source-transform %funcallable-instance-function (fin) - `(%function-self ,fin)) +(define-source-transform %closure-fun (closure) + `(%simple-fun-self ,closure)) -(defknown (setf %function-self) (function function) function (unsafe)) +(define-source-transform %funcallable-instance-fun (fin) + `(%simple-fun-self ,fin)) -(define-vop (%set-function-self) +(define-vop (%set-fun-self) (:policy :fast-safe) - (:translate (setf %function-self)) + (:translate (setf %simple-fun-self)) (:args (new-self :scs (descriptor-reg) :target result :to :result) (function :scs (descriptor-reg) :to :result)) (:temporary (:sc any-reg :from (:argument 0) :to :result) temp) @@ -252,24 +245,31 @@ (:generator 3 (inst lea temp (make-ea :byte :base new-self - :disp (- (ash function-code-offset word-shift) - function-pointer-type))) - (storew temp function function-self-slot function-pointer-type) + :disp (- (ash simple-fun-code-offset word-shift) + fun-pointer-lowtag))) + (storew temp function simple-fun-self-slot fun-pointer-lowtag) (move result new-self))) -;; We would have really liked to use a source-transform for this, but -;; they don't work with SETF functions. -(defknown ((setf %funcallable-instance-function)) (function function) function +;;; KLUDGE: This seems to be some kind of weird override of the way +;;; that the objdef.lisp code would ordinarily set up the slot +;;; accessor. It's inherited from CMU CL, and it works, and naively +;;; deleting it seemed to cause problems, but it's not obvious why +;;; it's done this way. Any ideas? -- WHN 2001-08-02 +(defknown ((setf %funcallable-instance-fun)) (function function) function (unsafe)) -(deftransform (setf %funcallable-instance-function) ((value fin)) - '(setf (%function-self fin) value)) +;;; CMU CL comment: +;;; We would have really liked to use a source-transform for this, but +;;; they don't work with SETF functions. +;;; FIXME: Can't we just use DEFSETF or something? +(deftransform (setf %funcallable-instance-fun) ((value fin)) + '(setf (%simple-fun-self fin) value)) ;;;; 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)))))