0.pre7.129:

[sbcl.git] / src / compiler / alpha / parms.lisp

diff --git a/src/compiler/alpha/parms.lisp b/src/compiler/alpha/parms.lisp
index 55511ad..0eca5b9 100644 (file)
--- a/src/compiler/alpha/parms.lisp
+++ b/src/compiler/alpha/parms.lisp
@@ -11,19 +11,19 @@
 
 (eval-when  (:compile-toplevel :load-toplevel :execute)
 
-(defconstant word-bits 32
+(defconstant n-word-bits 32
   #!+sb-doc
   "Number of bits per word where a word holds one lisp descriptor.")
 
-(defconstant byte-bits 8
+(defconstant n-byte-bits 8
   #!+sb-doc
   "Number of bits per byte where a byte is the smallest addressable object.")
 
-(defconstant word-shift (1- (integer-length (/ word-bits byte-bits)))
+(defconstant word-shift (1- (integer-length (/ n-word-bits n-byte-bits)))
   #!+sb-doc
   "Number of bits to shift between word addresses and byte addresses.")
 
-(defconstant word-bytes (/ word-bits byte-bits)
+(defconstant n-word-bytes (/ n-word-bits n-byte-bits)
   #!+sb-doc
   "Number of bytes in a word.")
 
@@ -49,7 +49,7 @@
   (+ (byte-size single-float-significand-byte) 1))
 
 (defconstant double-float-digits
-  (+ (byte-size double-float-significand-byte) word-bits 1))
+  (+ (byte-size double-float-significand-byte) n-word-bits 1))
 
 ;; Values in 17f code seem to be same as HPPA. These values are from
 ;; DEC Assembly Language Programmers guide. The active bits are
@@ -140,14 +140,14 @@
   error
   cerror
   breakpoint
-  function-end-breakpoint
+  fun-end-breakpoint
   single-step-breakpoint)
 
 (defenum (:prefix trace-table-)
   normal
   call-site
-  function-prologue
-  function-epilogue)
+  fun-prologue
+  fun-epilogue)
 \f
 ;;;; static symbols
 
@@ -172,8 +172,7 @@
     maybe-gc
     sb!kernel::internal-error
     sb!di::handle-breakpoint
-    sb!di::handle-function-end-breakpoint
-    fdefinition-object
+    sb!di::handle-fun-end-breakpoint
 
     ;; free Pointers
     *read-only-space-free-pointer*
@@ -190,7 +189,7 @@
     sb!unix::*interrupts-enabled*
     sb!unix::*interrupt-pending*))
 
-(defparameter *static-functions*
+(defparameter *static-funs*
   '(length
     sb!kernel:two-arg-+
     sb!kernel:two-arg--