0.pre8.25:

[sbcl.git] / src / runtime / x86-assem.S

diff --git a/src/runtime/x86-assem.S b/src/runtime/x86-assem.S
index cd06563..19584b9 100644 (file)
--- a/src/runtime/x86-assem.S
+++ b/src/runtime/x86-assem.S
@@ -16,7 +16,12 @@
 #define LANGUAGE_ASSEMBLY
 #include "validate.h"
 #include "sbcl.h"
+#include "genesis/closure.h"
+#include "genesis/fdefn.h"
+#include "genesis/static-symbols.h"
+#include "genesis/symbol.h"    
 
+       
 /* Minimize conditionalization for different OS naming schemes. */
 #if defined __linux__  || defined __FreeBSD__ /* (but *not* OpenBSD) */
 #define GNAME(var) var
@@ -262,11 +267,7 @@ GNAME(undefined_tramp):
        int3
        .byte   trap_Error
         .byte   2
-#ifdef LONG_FLOAT_WIDETAG
-        .byte   24
-#else
-        .byte   23
-#endif
+        .byte   UNDEFINED_FUN_ERROR
         .byte   sc_DescriptorReg # eax in the Descriptor-reg SC
        ret
        .size   GNAME(undefined_tramp), .-GNAME(undefined_tramp)
@@ -328,11 +329,13 @@ GNAME(do_pending_interrupt):
        ret
        .size   GNAME(do_pending_interrupt),.-GNAME(do_pending_interrupt)
 \f
-#ifdef GENCGC
+#ifdef LISP_FEATURE_GENCGC
 /* This is a fast bzero using the FPU. The first argument is the start
  * address which needs to be aligned on an 8 byte boundary, the second
  * argument is the number of bytes, which must be a nonzero multiple
  * of 8 bytes. */
+/* FIXME whether this is still faster than using the OS's bzero or
+ * equivalent, we don't know */
        .text
        .globl  GNAME(i586_bzero)
        .type   GNAME(i586_bzero),@function
@@ -659,7 +662,7 @@ GNAME(alloc_16_to_edi):
                
 
 \f
-#ifdef GENCGC
+#ifdef LISP_FEATURE_GENCGC_INLINE_ALLOC /* disabled at present */
 
 /* These routines are called from Lisp when an inline allocation 
  * overflows. Every register except the result needs to be preserved.