Skip to content
Snippets Groups Projects
Commit 84a32efd authored by ram's avatar ram
Browse files

structure => instance

parent ca1d0851
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;; ;;;
(ext:file-comment (ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/cell.lisp,v 1.14 1992/12/16 20:27:10 wlott Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/cell.lisp,v 1.15 1993/03/01 14:51:21 ram Exp $")
;;; ;;;
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
...@@ -235,42 +235,42 @@ ...@@ -235,42 +235,42 @@
;;;; Structure hackery: ;;;; Instance hackery:
(define-vop (structure-length) (define-vop (instance-length)
(:policy :fast-safe) (:policy :fast-safe)
(:translate structure-length) (:translate %instance-length)
(:args (struct :scs (descriptor-reg))) (:args (struct :scs (descriptor-reg)))
(:temporary (:scs (non-descriptor-reg)) temp) (:temporary (:scs (non-descriptor-reg)) temp)
(:results (res :scs (unsigned-reg))) (:results (res :scs (unsigned-reg)))
(:result-types positive-fixnum) (:result-types positive-fixnum)
(:generator 4 (:generator 4
(loadw temp struct 0 structure-pointer-type) (loadw temp struct 0 instance-pointer-type)
(inst srl res temp vm:type-bits))) (inst srl res temp vm:type-bits)))
(define-vop (structure-ref slot-ref) (define-vop (instance-ref slot-ref)
(:variant structure-slots-offset structure-pointer-type) (:variant instance-slots-offset instance-pointer-type)
(:policy :fast-safe) (:policy :fast-safe)
(:translate structure-ref) (:translate %instance-ref)
(:arg-types structure (:constant index))) (:arg-types instance (:constant index)))
(define-vop (structure-set slot-set) (define-vop (instance-set slot-set)
(:policy :fast-safe) (:policy :fast-safe)
(:translate structure-set) (:translate %instance-set)
(:variant structure-slots-offset structure-pointer-type) (:variant instance-slots-offset instance-pointer-type)
(:arg-types structure (:constant index) *)) (:arg-types instance (:constant index) *))
(define-vop (structure-index-ref word-index-ref) (define-vop (instance-index-ref word-index-ref)
(:policy :fast-safe) (:policy :fast-safe)
(:translate structure-ref) (:translate %instance-ref)
(:variant structure-slots-offset structure-pointer-type) (:variant instance-slots-offset instance-pointer-type)
(:arg-types structure positive-fixnum)) (:arg-types instance positive-fixnum))
(define-vop (structure-index-set word-index-set) (define-vop (instance-index-set word-index-set)
(:policy :fast-safe) (:policy :fast-safe)
(:translate structure-set) (:translate %instance-set)
(:variant structure-slots-offset structure-pointer-type) (:variant instance-slots-offset instance-pointer-type)
(:arg-types structure positive-fixnum *)) (:arg-types instance positive-fixnum *))
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;; ;;;
(ext:file-comment (ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/type-vops.lisp,v 1.12 1992/12/05 21:57:12 wlott Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/type-vops.lisp,v 1.13 1993/03/01 14:52:04 ram Exp $")
;;; ;;;
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
...@@ -85,14 +85,14 @@ ...@@ -85,14 +85,14 @@
(move result value))) (move result value)))
(primitive-type-vop check-list (:check) list) (primitive-type-vop check-list (:check) list)
(def-type-vops structurep nil nil nil vm:structure-pointer-type) (def-type-vops %instancep nil nil nil vm:instance-pointer-type)
(define-vop (check-structure check-type) (define-vop (check-instance check-type)
(:generator 3 (:generator 3
(inst and temp value lowtag-mask) (inst and temp value lowtag-mask)
(inst cmp temp structure-pointer-type) (inst cmp temp instance-pointer-type)
(inst t :ne (logior (ash (tn-offset value) 8) object-not-structure-trap)) (inst t :ne (logior (ash (tn-offset value) 8) object-not-instance-trap))
(move result value))) (move result value)))
(primitive-type-vop check-structure (:check) structure) (primitive-type-vop check-instance (:check) instance)
(def-type-vops bignump check-bigunm bignum (def-type-vops bignump check-bigunm bignum
object-not-bignum-error vm:bignum-type) object-not-bignum-error vm:bignum-type)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment