From 5d85169bd166290cb2c6848b0d6c10b1219c63fd Mon Sep 17 00:00:00 2001 From: dtc <dtc> Date: Thu, 13 Feb 1997 01:20:37 +0000 Subject: [PATCH] Cleanup of some backend symbols; the following have been moved to the x86 package: *allocation-pointer* *binding-stack-pointer* *x86-cgc-active-p* *static-blue-bag* *internal-gc-trigger* All *unused-static-** --- compiler/x86/cell.lisp | 14 +++++++------- compiler/x86/macros.lisp | 6 +++--- compiler/x86/nlx.lisp | 4 ++-- compiler/x86/parms.lisp | 22 +++++++++++----------- compiler/x86/system.lisp | 6 +++--- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/compiler/x86/cell.lisp b/compiler/x86/cell.lisp index d2a1a7298..84ba3922e 100644 --- a/compiler/x86/cell.lisp +++ b/compiler/x86/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/x86/cell.lisp,v 1.1 1997/01/18 14:31:23 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/cell.lisp,v 1.2 1997/02/13 01:20:32 dtc Exp $") ;;; ;;; ********************************************************************** ;;; @@ -182,10 +182,10 @@ (symbol :scs (descriptor-reg))) (:temporary (:sc dword-reg) temp bsp) (:generator 5 - (load-symbol-value bsp lisp::*binding-stack-pointer*) + (load-symbol-value bsp *binding-stack-pointer*) (loadw temp symbol symbol-value-slot other-pointer-type) (inst add bsp (* binding-size word-bytes)) - (store-symbol-value bsp lisp::*binding-stack-pointer*) + (store-symbol-value bsp *binding-stack-pointer*) (storew temp bsp (- binding-value-slot binding-size)) (storew symbol bsp (- binding-symbol-slot binding-size)) (storew val symbol symbol-value-slot other-pointer-type))) @@ -193,20 +193,20 @@ (define-vop (unbind) (:temporary (:sc dword-reg) symbol value bsp) (:generator 0 - (load-symbol-value bsp lisp::*binding-stack-pointer*) + (load-symbol-value bsp *binding-stack-pointer*) (loadw symbol bsp (- binding-symbol-slot binding-size)) (loadw value bsp (- binding-value-slot binding-size)) (storew value symbol symbol-value-slot other-pointer-type) (storew 0 bsp (- binding-symbol-slot binding-size)) (inst sub bsp (* binding-size word-bytes)) - (store-symbol-value bsp lisp::*binding-stack-pointer*))) + (store-symbol-value bsp *binding-stack-pointer*))) (define-vop (unbind-to-here) (:args (where :scs (descriptor-reg any-reg))) (:temporary (:sc dword-reg) symbol value bsp) (:generator 0 - (load-symbol-value bsp lisp::*binding-stack-pointer*) + (load-symbol-value bsp *binding-stack-pointer*) (inst cmp where bsp) (inst jmp :e done) @@ -222,7 +222,7 @@ (inst sub bsp (* binding-size word-bytes)) (inst cmp where bsp) (inst jmp :ne loop) - (store-symbol-value bsp lisp::*binding-stack-pointer*) + (store-symbol-value bsp *binding-stack-pointer*) DONE)) diff --git a/compiler/x86/macros.lisp b/compiler/x86/macros.lisp index 5d6c09013..82b9ef373 100644 --- a/compiler/x86/macros.lisp +++ b/compiler/x86/macros.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/x86/macros.lisp,v 1.2 1997/02/12 21:01:25 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/macros.lisp,v 1.3 1997/02/13 01:20:33 dtc Exp $") ;;; ;;; ********************************************************************** ;;; @@ -114,9 +114,9 @@ #-cgc (defmacro with-allocation ((alloc) &body body) `(progn - (load-symbol-value ,alloc lisp::*allocation-pointer*) + (load-symbol-value ,alloc *allocation-pointer*) ,@body - (store-symbol-value ,alloc lisp::*allocation-pointer*))) + (store-symbol-value ,alloc *allocation-pointer*))) #-cgc (defmacro with-fixed-allocation ((result alloc type-code size) &body body) diff --git a/compiler/x86/nlx.lisp b/compiler/x86/nlx.lisp index e27299c44..818a414c3 100644 --- a/compiler/x86/nlx.lisp +++ b/compiler/x86/nlx.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/x86/nlx.lisp,v 1.2 1997/02/08 21:35:06 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/nlx.lisp,v 1.3 1997/02/13 01:20:37 dtc Exp $") ;;; ;;; ********************************************************************** ;;; @@ -83,7 +83,7 @@ (define-vop (current-binding-pointer) (:results (res :scs (any-reg descriptor-reg))) (:generator 1 - (load-symbol-value res lisp::*binding-stack-pointer*))) + (load-symbol-value res *binding-stack-pointer*))) ;;;; Unwind block hackery: diff --git a/compiler/x86/parms.lisp b/compiler/x86/parms.lisp index bd44729e8..8d0b43098 100644 --- a/compiler/x86/parms.lisp +++ b/compiler/x86/parms.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/x86/parms.lisp,v 1.3 1997/02/12 23:03:25 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/parms.lisp,v 1.4 1997/02/13 01:20:35 dtc Exp $") ;;; ;;; ********************************************************************** ;;; @@ -210,13 +210,13 @@ ;;; ;;; pfw X86 doesn't have enough registers to keep these things there. ;;; Note these spaces grow from low to high addresses. -(defvar lisp::*allocation-pointer*) -(defvar lisp::*binding-stack-pointer*) -(defvar lisp::*x86-cgc-active-p*) -(defvar lisp::*static-blue-bag* nil) +(defvar *allocation-pointer*) +(defvar *binding-stack-pointer*) +(defvar *x86-cgc-active-p*) +(defvar *static-blue-bag* nil) (defparameter static-symbols - `(t + '(t ;; The C startup code must fill these in. lisp::lisp-environment-list @@ -246,10 +246,10 @@ unix::*interrupt-pending* ;; added by pfw - lisp::*allocation-pointer* - lisp::*binding-stack-pointer* - lisp::*x86-cgc-active-p* - lisp::*internal-gc-trigger* ; Keep C code happy + *allocation-pointer* + *binding-stack-pointer* + *x86-cgc-active-p* + *internal-gc-trigger* ; Keep C code happy *fp-constant-1s0* *fp-constant-1d0* @@ -267,7 +267,7 @@ *unused-static-2* *unused-static-1* - lisp::*static-blue-bag* ; Must be last or change C code + *static-blue-bag* ; Must be last or change C code )) (defparameter static-functions diff --git a/compiler/x86/system.lisp b/compiler/x86/system.lisp index d91e0018c..7174c2191 100644 --- a/compiler/x86/system.lisp +++ b/compiler/x86/system.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/x86/system.lisp,v 1.2 1997/02/11 16:16:08 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/system.lisp,v 1.3 1997/02/13 01:20:36 dtc Exp $") ;;; ;;; ********************************************************************** ;;; @@ -168,7 +168,7 @@ (:translate dynamic-space-free-pointer) (:policy :fast-safe) (:generator 1 - (load-symbol-value int lisp::*allocation-pointer*))) + (load-symbol-value int *allocation-pointer*))) (define-vop (binding-stack-pointer-sap) (:results (int :scs (sap-reg))) @@ -176,7 +176,7 @@ (:translate binding-stack-pointer-sap) (:policy :fast-safe) (:generator 1 - (load-symbol-value int lisp::*binding-stack-pointer*))) + (load-symbol-value int *binding-stack-pointer*))) (define-vop (control-stack-pointer-sap) (:results (int :scs (sap-reg))) -- GitLab