X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Fgeneric%2Fearly-objdef.lisp;h=f93401ccb3ec43fa3f99c0f1b930a01b41bb99ce;hb=dec94b039e8ec90baf21463df839a6181de606f6;hp=bc31436f80dfe68ff4fa3ce125959a1f1a984431;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git

diff --git a/src/compiler/generic/early-objdef.lisp b/src/compiler/generic/early-objdef.lisp
index bc31436..f93401c 100644
--- a/src/compiler/generic/early-objdef.lisp
+++ b/src/compiler/generic/early-objdef.lisp
@@ -13,20 +13,31 @@
 
 ;;; FIXME: It's clever using :SUFFIX -TYPE for these things, but it's
 ;;; a pain for people just learning to find their way around the code
-;;; who want to figure out where things like EVEN-FIXNUM type are
-;;; defined. Remove the :SUFFIXes and just expand out the full names.
+;;; who want to use lexical search to figure out where things like
+;;; EVEN-FIXNUM-TYPE are defined. Remove the :SUFFIXes and just expand
+;;; out the full names. Or even define them in DEF-FROB EVEN-FIXNUM-TYPE
+;;; style so searches like 'def.*even-fixnum-type' can find them.
 
-;;; the main types. These types are represented by the low three bits of the
-;;; pointer or immeditate object.
-(defenum (:suffix -type)
-  even-fixnum
-  function-pointer
-  other-immediate-0
-  list-pointer
-  odd-fixnum
-  instance-pointer
-  other-immediate-1
-  other-pointer)
+;;; the main types. These types are represented by the low three bits
+;;; of the pointer or immediate object.
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  ;; The EVAL-WHEN is necessary (at least for Lispworks), because the
+  ;; second DEFENUM uses the value of OTHER-IMMEDIATE-0-TYPE, which is
+  ;; defined in the first DEFENUM. -- AL 20000216
+  (defenum (:suffix -type)
+    even-fixnum
+    ;; Note: CMU CL, and SBCL < 0.pre7.39, had FUNCTION-POINTER-TYPE
+    ;; here. We swapped FUNCTION-POINTER-TYPE and
+    ;; INSTANCE-POINTER-TYPE in sbcl-0.pre7.39 in order to help with a
+    ;; low-level pun in the function call sequence on the PPC port.
+    ;; For more information, see the PPC port code. -- WHN 2001-10-03
+    instance-pointer
+    other-immediate-0
+    list-pointer
+    odd-fixnum
+    function-pointer
+    other-immediate-1
+    other-pointer))
 
 ;;; the heap types. Each of these types is in the header of objects in
 ;;; the heap.
@@ -74,8 +85,7 @@
   byte-code-function
   byte-code-closure
   closure-function-header
-  #!-gengc return-pc-header
-  #!+gengc forwarding-pointer
+  return-pc-header
   value-cell-header
   symbol-header
   base-char
@@ -83,8 +93,7 @@
   unbound-marker
   weak-pointer
   instance-header
-  fdefn
-  )
+  fdefn)
 
 ;;; the different vector subtypes
 (defenum (:prefix vector- :suffix -subtype)