X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fparms.lisp;h=0f94e7cce1d3cdb04a6d3fa75077216688adfad6;hb=5745b5a5b2e3b967bf3876b4306f31b3c78495fa;hp=33b2d4addc43c92fe1aae44d6563a42c28729b12;hpb=04ee798422795a1e3d664c257a6b02b833eec4c6;p=sbcl.git diff --git a/src/compiler/x86/parms.lisp b/src/compiler/x86/parms.lisp index 33b2d4a..0f94e7c 100644 --- a/src/compiler/x86/parms.lisp +++ b/src/compiler/x86/parms.lisp @@ -152,21 +152,52 @@ ;;; 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! +;;; * 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. #!+win32 (progn - (def!constant read-only-space-start #x02000000) - (def!constant read-only-space-end #x020ff000) + (def!constant read-only-space-start #x22000000) + (def!constant read-only-space-end #x220ff000) - (def!constant static-space-start #x02100000) - (def!constant static-space-end #x021ff000) + (def!constant static-space-start #x22100000) + (def!constant static-space-end #x221ff000) - (def!constant dynamic-space-start #x09000000) - (def!constant dynamic-space-end #x29000000) + (def!constant dynamic-space-start #x22300000) + (def!constant dynamic-space-end #x42300000) - (def!constant linkage-table-space-start #x02200000) - (def!constant linkage-table-space-end #x022ff000)) + (def!constant linkage-table-space-start #x22200000) + (def!constant linkage-table-space-end #x222ff000)) #!+linux (progn @@ -198,32 +229,31 @@ #!+freebsd (progn - (def!constant read-only-space-start #x10000000) - (def!constant read-only-space-end #x100ff000) + (def!constant read-only-space-start #x01000000) + (def!constant read-only-space-end #x010ff000) - (def!constant static-space-start #x10100000) - (def!constant static-space-end #x101ff000) + (def!constant static-space-start #x01100000) + (def!constant static-space-end #x011ff000) - (def!constant dynamic-space-start #x48000000) - (def!constant dynamic-space-end #x88000000) + (def!constant dynamic-space-start #x58000000) + (def!constant dynamic-space-end #x98000000) - (def!constant linkage-table-space-start #x10200000) - (def!constant linkage-table-space-end #x102ff000)) + (def!constant linkage-table-space-start #x01200000) + (def!constant linkage-table-space-end #x012ff000)) #!+openbsd (progn - (def!constant read-only-space-start #x10000000) - (def!constant read-only-space-end #x100ff000) + (def!constant read-only-space-start #x1b000000) + (def!constant read-only-space-end #x1b0ff000) - (def!constant static-space-start #x10100000) - (def!constant static-space-end #x101ff000) + (def!constant static-space-start #x1b100000) + (def!constant static-space-end #x1b1ff000) - (def!constant dynamic-space-start #x80000000) - (def!constant dynamic-space-end #xA0000000) + (def!constant dynamic-space-start #x40000000) + (def!constant dynamic-space-end #x5bfff000) - ;; In CMUCL: 0xB0000000->0xB1000000 - (def!constant linkage-table-space-start #x10200000) - (def!constant linkage-table-space-end #x102ff000)) + (def!constant linkage-table-space-start #x1b200000) + (def!constant linkage-table-space-end #x1b2ff000)) #!+netbsd (progn @@ -264,32 +294,19 @@ ;;;; 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) ;;;; static symbols @@ -338,6 +355,9 @@ ;; For GC-AND-SAVE *restart-lisp-function* + ;; For the UNWIND-TO-FRAME-AND-CALL VOP + *unwind-to-frame-function* + ;; Needed for callbacks to work across saving cores. see ;; ALIEN-CALLBACK-ASSEMBLER-WRAPPER in c-call.lisp for gory ;; details.