X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fparms.lisp;h=ec89f340f6e1f11b7f4f667405777c2219c1ebf5;hb=92f0ce474660fa51f33126f07ef7103b8b8843c3;hp=d22a4a589812cc8a3501ab365f54e6b1806d6199;hpb=afe9091b25da5799f7bfd71c5497cbbd71045012;p=sbcl.git diff --git a/src/compiler/x86/parms.lisp b/src/compiler/x86/parms.lisp index d22a4a5..ec89f34 100644 --- a/src/compiler/x86/parms.lisp +++ b/src/compiler/x86/parms.lisp @@ -35,9 +35,11 @@ ;;; addressable object (def!constant n-byte-bits 8) -;;; The size in bytes of the GENCGC pages. Should be a multiple of the -;;; architecture code size. -(def!constant gencgc-page-size 4096) +;;; The minimum immediate offset in a memory-referencing instruction. +(def!constant minimum-immediate-offset (- (expt 2 31))) + +;;; The maximum immediate offset in a memory-referencing instruction. +(def!constant maximum-immediate-offset (1- (expt 2 31))) (def!constant float-sign-shift 31) @@ -150,109 +152,48 @@ ;;; FYI, this can be looked at with the "pmap" program, and if you ;;; set the top-down mmap allocation option in the kernel (not yet ;;; the default), all bets are totally off! - -#!+win32 -(progn - - (def!constant read-only-space-start #x02000000) - (def!constant read-only-space-end #x047ff000) - - (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 linkage-table-space-start #x30000000) - (def!constant linkage-table-space-end #x40000000)) - -#!+linux -(progn - (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 dynamic-space-start #x09000000) - (def!constant dynamic-space-end #x29000000) - - (def!constant linkage-table-space-start #x70000000) - (def!constant linkage-table-space-end #x7ffff000)) - -#!+sunos -(progn - (def!constant read-only-space-start #x20000000) - (def!constant read-only-space-end #x2ffff000) - - (def!constant static-space-start #x40000000) - (def!constant static-space-end #x42fff000) - - (def!constant dynamic-space-start #x48000000) - (def!constant dynamic-space-end #xA0000000) - - (def!constant linkage-table-space-start #xA2000000) - (def!constant linkage-table-space-end #xA3000000)) - -#!+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) - - ;; 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 static-space-start #x30000000) - (def!constant static-space-end #x37fff000) - - (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)) - - -#!+darwin -(progn - (def!constant read-only-space-start #x04000000) - (def!constant read-only-space-end #x07ff8000) - - (def!constant static-space-start #x08000000) - (def!constant static-space-end #x097fff00) - - (def!constant dynamic-space-start #x10000000) - (def!constant dynamic-space-end #x6ffff000) - - (def!constant linkage-table-space-start #x0a000000) - (def!constant linkage-table-space-end #x0b000000)) +;;; * For FreeBSD, the requirement of user and kernel space are +;;; getting larger, and users tend to extend them. +;;; If MAXDSIZ is extended from 512MB to 1GB, we can't use up to +;;; around 0x50000000. +;;; And if KVA_PAGES is extended from 1GB to 1.5GB, we can't use +;;; down to around 0xA0000000. +;;; So we use 0x58000000--0x98000000 for dynamic space. +;;; * OpenBSD address space changes for W^X as well as malloc() +;;; randomization made the old addresses unsafe. +;;; ** By default (linked without -Z option): +;;; The executable's text segment starts at #x1c000000 and the +;;; data segment MAXDSIZ bytes higher, at #x3c000000. Shared +;;; library text segments start randomly between #x00002000 and +;;; #x10002000, with the data segment MAXDSIZ bytes after that. +;;; ** If the -Z linker option is used: +;;; The executable's text and data segments simply start at +;;; #x08048000, data immediately following text. Shared library +;;; text and data is placed as if allocated by malloc(). +;;; ** In both cases, the randomized range for malloc() starts +;;; MAXDSIZ bytes after the end of the data segment (#x48048000 +;;; with -Z, #x7c000000 without), and extends 256 MB. +;;; ** The read only, static, and linkage table spaces should be +;;; safe with and without -Z if they are located just before +;;; #x1c000000. +;;; ** Ideally the dynamic space should be at #x94000000, 64 MB +;;; after the end of the highest random malloc() address. +;;; Unfortunately the dynamic space must be in the lower half +;;; of the address space, where there are no large areas which +;;; are unused both with and without -Z. So we break -Z by +;;; starting at #x40000000. By only using 512 - 64 MB we can +;;; run under the default 512 MB data size resource limit. + +;;; NetBSD configuration used to have this comment regarding the linkage +;;; table: "In CMUCL: 0xB0000000->0xB1000000" + +#!+win32 (!gencgc-space-setup #x22000000 nil nil #x10000) +#!+linux (!gencgc-space-setup #x01000000 #x09000000) +#!+sunos (!gencgc-space-setup #x20000000 #x48000000) +#!+freebsd (!gencgc-space-setup #x01000000 #x58000000) +#!+openbsd (!gencgc-space-setup #x1b000000 #x40000000) +#!+netbsd (!gencgc-space-setup #x20000000 #x60000000) +#!+darwin (!gencgc-space-setup #x04000000 #x10000000) ;;; Size of one linkage-table entry in bytes. (def!constant linkage-table-entry-size 8) @@ -263,32 +204,21 @@ ;;;; other miscellaneous constants -(defenum (:suffix -trap :start 8) - halt - pending-interrupt - error - cerror - breakpoint - fun-end-breakpoint - single-step-around - single-step-before) -;;; FIXME: It'd be nice to replace all the DEFENUMs with something like -;;; (WITH-DEF-ENUM (:START 8) -;;; (DEF-ENUM HALT-TRAP) -;;; (DEF-ENUM PENDING-INTERRUPT-TRAP) -;;; ..) -;;; for the benefit of anyone doing a lexical search for definitions -;;; of these symbols. - -(defenum (:prefix object-not- :suffix -trap :start 24) - list - instance) - -(defenum (:prefix trace-table-) - normal - call-site - fun-prologue - fun-epilogue) +(defenum (:start 8) + halt-trap + pending-interrupt-trap + error-trap + cerror-trap + breakpoint-trap + fun-end-breakpoint-trap + single-step-around-trap + single-step-before-trap) + +(defenum (:start 24) + object-not-list-trap + object-not-instance-trap + #!+sb-safepoint global-safepoint-trap + #!+sb-safepoint csp-safepoint-trap) ;;;; static symbols @@ -313,9 +243,6 @@ ;; interrupt handling *pseudo-atomic-bits* - #!+sb-thread *stop-for-gc-pending* - #!+sb-thread *free-tls-index* - #!+sb-thread *tls-index-lock* *allocation-pointer* *binding-stack-pointer* @@ -360,10 +287,8 @@ sb!kernel:two-arg-ior sb!kernel:two-arg-xor sb!kernel:two-arg-gcd - sb!kernel:two-arg-lcm)) + sb!kernel:two-arg-lcm + sb!kernel:%coerce-callable-to-fun)) -;;;; stuff added by jrd - -;;; FIXME: Is this used? Delete it or document it. -;;; cf the sparc PARMS.LISP -(defparameter *assembly-unit-length* 8) +#!+win32 +(defconstant +win32-tib-arbitrary-field-offset+ #.(+ #xE10 (* 4 63)))