From 84a32efd99c40f551f58f3c8d4aacc649f0925e3 Mon Sep 17 00:00:00 2001 From: ram <ram> Date: Mon, 1 Mar 1993 14:52:04 +0000 Subject: [PATCH] structure => instance --- compiler/sparc/cell.lisp | 42 +++++++++++++++++------------------ compiler/sparc/type-vops.lisp | 12 +++++----- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/compiler/sparc/cell.lisp b/compiler/sparc/cell.lisp index b10584ea6..d93a793fa 100644 --- a/compiler/sparc/cell.lisp +++ b/compiler/sparc/cell.lisp @@ -7,7 +7,7 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (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 @@ -;;;; Structure hackery: +;;;; Instance hackery: -(define-vop (structure-length) +(define-vop (instance-length) (:policy :fast-safe) - (:translate structure-length) + (:translate %instance-length) (:args (struct :scs (descriptor-reg))) (:temporary (:scs (non-descriptor-reg)) temp) (:results (res :scs (unsigned-reg))) (:result-types positive-fixnum) (:generator 4 - (loadw temp struct 0 structure-pointer-type) + (loadw temp struct 0 instance-pointer-type) (inst srl res temp vm:type-bits))) -(define-vop (structure-ref slot-ref) - (:variant structure-slots-offset structure-pointer-type) +(define-vop (instance-ref slot-ref) + (:variant instance-slots-offset instance-pointer-type) (:policy :fast-safe) - (:translate structure-ref) - (:arg-types structure (:constant index))) + (:translate %instance-ref) + (:arg-types instance (:constant index))) -(define-vop (structure-set slot-set) +(define-vop (instance-set slot-set) (:policy :fast-safe) - (:translate structure-set) - (:variant structure-slots-offset structure-pointer-type) - (:arg-types structure (:constant index) *)) + (:translate %instance-set) + (:variant instance-slots-offset instance-pointer-type) + (:arg-types instance (:constant index) *)) -(define-vop (structure-index-ref word-index-ref) +(define-vop (instance-index-ref word-index-ref) (:policy :fast-safe) - (:translate structure-ref) - (:variant structure-slots-offset structure-pointer-type) - (:arg-types structure positive-fixnum)) + (:translate %instance-ref) + (:variant instance-slots-offset instance-pointer-type) + (:arg-types instance positive-fixnum)) -(define-vop (structure-index-set word-index-set) +(define-vop (instance-index-set word-index-set) (:policy :fast-safe) - (:translate structure-set) - (:variant structure-slots-offset structure-pointer-type) - (:arg-types structure positive-fixnum *)) + (:translate %instance-set) + (:variant instance-slots-offset instance-pointer-type) + (:arg-types instance positive-fixnum *)) diff --git a/compiler/sparc/type-vops.lisp b/compiler/sparc/type-vops.lisp index e8c3e2a88..ceb69187d 100644 --- a/compiler/sparc/type-vops.lisp +++ b/compiler/sparc/type-vops.lisp @@ -7,7 +7,7 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (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 @@ (move result value))) (primitive-type-vop check-list (:check) list) -(def-type-vops structurep nil nil nil vm:structure-pointer-type) -(define-vop (check-structure check-type) +(def-type-vops %instancep nil nil nil vm:instance-pointer-type) +(define-vop (check-instance check-type) (:generator 3 (inst and temp value lowtag-mask) - (inst cmp temp structure-pointer-type) - (inst t :ne (logior (ash (tn-offset value) 8) object-not-structure-trap)) + (inst cmp temp instance-pointer-type) + (inst t :ne (logior (ash (tn-offset value) 8) object-not-instance-trap)) (move result value))) -(primitive-type-vop check-structure (:check) structure) +(primitive-type-vop check-instance (:check) instance) (def-type-vops bignump check-bigunm bignum object-not-bignum-error vm:bignum-type) -- GitLab