X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fparms.lisp;h=b3aadeceb76d71492edaf0f49cf74447fa342ee6;hb=13fb19c3183a0effb7c35a2d453d6c6c91726e26;hp=6e343256ad7bc1fef3fda32d0dc493853c5caf28;hpb=51e63f301624e39febdd85b5feba19b7c980f307;p=sbcl.git diff --git a/src/compiler/x86/parms.lisp b/src/compiler/x86/parms.lisp index 6e34325..b3aadec 100644 --- a/src/compiler/x86/parms.lisp +++ b/src/compiler/x86/parms.lisp @@ -152,109 +152,121 @@ ;;; 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. The only range +;;; that is really safe is between the end of the text segment (it +;;; starts at #x3C000000) and #x7C000000. However if the -Z linker +;;; option is used then the safe range is (probably) #x00001000 to +;;; #x48048000, with the text and data segments at #x08048000. #!+win32 (progn - (def!constant read-only-space-start #x02000000) - (def!constant read-only-space-end #x047ff000) + (def!constant read-only-space-start #x22000000) + (def!constant read-only-space-end #x220ff000) - (def!constant static-space-start #x05000000) - (def!constant static-space-end #x07fff000) + (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 #x30000000) - (def!constant linkage-table-space-end #x40000000)) + (def!constant linkage-table-space-start #x22200000) + (def!constant linkage-table-space-end #x222ff000)) #!+linux (progn (def!constant read-only-space-start #x01000000) - (def!constant read-only-space-end #x037ff000) + (def!constant read-only-space-end #x010ff000) - (def!constant static-space-start #x05000000) - (def!constant static-space-end #x07fff000) + (def!constant static-space-start #x01100000) + (def!constant static-space-end #x011ff000) (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)) + (def!constant linkage-table-space-start #x01200000) + (def!constant linkage-table-space-end #x012ff000)) #!+sunos (progn (def!constant read-only-space-start #x20000000) - (def!constant read-only-space-end #x2ffff000) + (def!constant read-only-space-end #x200ff000) - (def!constant static-space-start #x40000000) - (def!constant static-space-end #x42fff000) + (def!constant static-space-start #x20100000) + (def!constant static-space-end #x201ff000) (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)) + (def!constant linkage-table-space-start #x20200000) + (def!constant linkage-table-space-end #x202ff000)) #!+freebsd (progn - (def!constant read-only-space-start #x10000000) - (def!constant read-only-space-end #x1ffff000) + (def!constant read-only-space-start #x01000000) + (def!constant read-only-space-end #x010ff000) - (def!constant static-space-start #x30000000) - (def!constant static-space-end #x37fff000) + (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) - ;; In CMUCL: 0xB0000000->0xB1000000 - (def!constant linkage-table-space-start #x90000000) - (def!constant linkage-table-space-end #x91000000)) + (def!constant linkage-table-space-start #x01200000) + (def!constant linkage-table-space-end #x012ff000)) #!+openbsd (progn - (def!constant read-only-space-start #x40000000) - (def!constant read-only-space-end #x47fff000) + (def!constant read-only-space-start #x47000000) + (def!constant read-only-space-end #x470ff000) - (def!constant static-space-start #x50000000) - (def!constant static-space-end #x5ffff000) + (def!constant static-space-start #x47100000) + (def!constant static-space-end #x471ff000) - (def!constant dynamic-space-start #x80000000) - (def!constant dynamic-space-end #xA0000000) + (def!constant dynamic-space-start #x48000000) + (def!constant dynamic-space-end #x78000000) ;; In CMUCL: 0xB0000000->0xB1000000 - (def!constant linkage-table-space-start #xA0000000) - (def!constant linkage-table-space-end #xA1000000)) + (def!constant linkage-table-space-start #x47200000) + (def!constant linkage-table-space-end #x472ff000)) #!+netbsd (progn (def!constant read-only-space-start #x20000000) - (def!constant read-only-space-end #x2ffff000) + (def!constant read-only-space-end #x200ff000) - (def!constant static-space-start #x30000000) - (def!constant static-space-end #x37fff000) + (def!constant static-space-start #x20100000) + (def!constant static-space-end #x201ff000) (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)) + (def!constant linkage-table-space-start #x20200000) + (def!constant linkage-table-space-end #x202ff000)) #!+darwin (progn (def!constant read-only-space-start #x04000000) - (def!constant read-only-space-end #x07ff8000) + (def!constant read-only-space-end #x040ff000) - (def!constant static-space-start #x08000000) - (def!constant static-space-end #x097fff00) + (def!constant static-space-start #x04100000) + (def!constant static-space-end #x041ff000) (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)) + (def!constant linkage-table-space-start #x04200000) + (def!constant linkage-table-space-end #x042ff000)) ;;; Size of one linkage-table entry in bytes. (def!constant linkage-table-entry-size 8) @@ -265,32 +277,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 @@ -339,6 +338,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.