X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Fparms.lisp;h=0eca5b960c2f753ffcb4bc9887b1ff70e9c6fadd;hb=80304981972c91c1b3f3fca75f36dacf1fecf307;hp=c6184789bd03e2c6544d387fcfd7947ba5af3fcd;hpb=63fcb94b875a97e468d9add229e220ecceec2352;p=sbcl.git

diff --git a/src/compiler/alpha/parms.lisp b/src/compiler/alpha/parms.lisp
index c618478..0eca5b9 100644
--- 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)
 
 ;;;; static symbols
 
@@ -169,12 +169,10 @@
     sb!impl::*!initial-fdefn-objects*
 
     ;; Functions that the C code needs to call
-    sb!impl::%initial-function
-    sb!impl::maybe-gc
+    maybe-gc
     sb!kernel::internal-error
     sb!di::handle-breakpoint
-    sb!di::handle-function-end-breakpoint
-    sb!impl::fdefinition-object
+    sb!di::handle-fun-end-breakpoint
 
     ;; free Pointers
     *read-only-space-free-pointer*
@@ -182,16 +180,16 @@
     *initial-dynamic-space-free-pointer*
 
     ;; things needed for non-local exit
-    sb!impl::*current-catch-block*
-    sb!impl::*current-unwind-protect-block*
-    sb!c::*eval-stack-top*
+    *current-catch-block*
+    *current-unwind-protect-block*
+    *eval-stack-top*
 
     ;; interrupt handling
-    sb!impl::*free-interrupt-context-index*
+    *free-interrupt-context-index*
     sb!unix::*interrupts-enabled*
     sb!unix::*interrupt-pending*))
 
-(defparameter *static-functions*
+(defparameter *static-funs*
   '(length
     sb!kernel:two-arg-+
     sb!kernel:two-arg--