X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fparms.lisp;h=f12d2930b965f531a05ebb39a94444c14389d507;hb=079ef9dad558ca07cb8178ef428bf738112174fa;hp=27d9cd3118cbd3d48fb4ee3f739c43594eba1575;hpb=3a618201c9f2370bb8784217a866d000371769e5;p=sbcl.git

diff --git a/src/compiler/x86/parms.lisp b/src/compiler/x86/parms.lisp
index 27d9cd3..f12d293 100644
--- a/src/compiler/x86/parms.lisp
+++ b/src/compiler/x86/parms.lisp
@@ -35,12 +35,6 @@
 ;;; addressable object
 (def!constant n-byte-bits 8)
 
-;;; the number of bits to shift between word addresses and byte addresses
-(def!constant word-shift (1- (integer-length (/ n-word-bits n-byte-bits))))
-
-;;; the number of bytes in a word
-(def!constant n-word-bytes (/ n-word-bits n-byte-bits))
-
 (def!constant float-sign-shift 31)
 
 ;;; comment from CMU CL:
@@ -155,52 +149,65 @@
 
 #!+linux
 (progn
+  (def!constant read-only-space-start     #x01000000)
+  (def!constant read-only-space-end       #x037ff000)
 
-  (def!constant read-only-space-start #x01000000)
-  (def!constant read-only-space-end   #x037ff000)
+  (def!constant static-space-start        #x05000000)
+  (def!constant static-space-end          #x07fff000)
 
-  (def!constant static-space-start    #x05000000)
-  (def!constant static-space-end      #x07fff000)
+  (def!constant dynamic-space-start       #x09000000)
+  (def!constant dynamic-space-end         #x29000000)
 
-  (def!constant dynamic-space-start   #x09000000)
-  (def!constant dynamic-space-end     #x29000000))
+  (def!constant linkage-table-space-start #x70000000)
+  (def!constant linkage-table-space-end   #x7ffff000))
 
-#!+(or freebsd openbsd)
+#!+freebsd
 (progn
+  (def!constant read-only-space-start     #x10000000)
+  (def!constant read-only-space-end       #x1ffff000)
+
+  (def!constant static-space-start        #x30000000)
+  (def!constant static-space-end          #x37fff000)
+
+  (def!constant dynamic-space-start       #x48000000)
+  (def!constant dynamic-space-end         #x88000000)
+
+  ;; In CMUCL:  0xB0000000->0xB1000000
+  (def!constant linkage-table-space-start #x90000000)
+  (def!constant linkage-table-space-end   #x91000000))
+
+#!+openbsd
+(progn
+  (def!constant read-only-space-start     #x40000000)
+  (def!constant read-only-space-end       #x47fff000)
+
+  (def!constant static-space-start        #x50000000)
+  (def!constant static-space-end          #x5ffff000)
+
+  (def!constant dynamic-space-start       #x80000000)
+  (def!constant dynamic-space-end         #xA0000000)
 
-  (def!constant read-only-space-start
-    #!+freebsd #x10000000
-    #!+openbsd #x40000000)
-  (def!constant read-only-space-end
-    #!+freebsd #x1ffff000
-    #!+openbsd #x47fff000)
-
-  (def!constant static-space-start
-    #!+freebsd #x30000000
-    #!+openbsd #x50000000)
-  (def!constant static-space-end
-    #!+freebsd #x37fff000
-    #!+openbsd #x5ffff000)
-
-  (def!constant dynamic-space-start
-    #!+freebsd  #x48000000
-    #!+openbsd  #x80000000)
-  (def!constant dynamic-space-end
-    #!+freebsd #x88000000
-    #!+openbsd #xA0000000))
+  ;; In CMUCL: 0xB0000000->0xB1000000
+  (def!constant linkage-table-space-start #xA0000000)
+  (def!constant linkage-table-space-end   #xA1000000))
 
 #!+netbsd
 (progn
+  (def!constant read-only-space-start     #x20000000)
+  (def!constant read-only-space-end       #x2ffff000)
 
-  (def!constant read-only-space-start #x20000000)
-  (def!constant read-only-space-end   #x2ffff000)
+  (def!constant static-space-start        #x30000000)
+  (def!constant static-space-end          #x37fff000)
 
-  (def!constant static-space-start    #x30000000)
-  (def!constant static-space-end      #x37fff000)
+  (def!constant dynamic-space-start       #x60000000)
+  (def!constant dynamic-space-end         #x98000000)
 
-  (def!constant dynamic-space-start   #x60000000)
-  (def!constant dynamic-space-end     #x98000000))
+  ;; In CMUCL: 0xB0000000->0xB1000000
+  (def!constant linkage-table-space-start #xA0000000)
+  (def!constant linkage-table-space-end   #xA1000000))
 
+;;; Size of one linkage-table entry in bytes.
+(def!constant linkage-table-entry-size 8)
 
 ;;; Given that NIL is the first thing allocated in static space, we
 ;;; know its value at compile time:
@@ -262,6 +269,8 @@
     sub-gc
     sb!kernel::internal-error
     sb!kernel::control-stack-exhausted-error
+    sb!kernel::undefined-alien-variable-error
+    sb!kernel::undefined-alien-function-error
     sb!di::handle-breakpoint
     fdefinition-object
     #!+sb-thread sb!thread::handle-thread-exit
@@ -316,7 +325,8 @@
     ;; FIXME: In SBCL, the CLOS code has become sufficiently tightly
     ;; integrated into the system that it'd probably make sense to use
     ;; the ordinary unbound marker for this.
-    sb!pcl::..slot-unbound..))
+    sb!pcl::..slot-unbound..
+    ))
 
 (defparameter *static-funs*
   '(length