X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fparms.lisp;h=67655cd8afd8c81a819c46a9effb087406c2750e;hb=c2ac5ba3964165ee2d21ccd4c6bf8bdc48e1a165;hp=816db3180838d02b1c9d6a9e1a1780a86fe1fb1b;hpb=1600081cf1b71b3d0e2e40de1c1c124a3a4fd40c;p=sbcl.git diff --git a/src/compiler/x86/parms.lisp b/src/compiler/x86/parms.lisp index 816db31..67655cd 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,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-end #x020ff000) - (def!constant static-space-start #x05000000) - (def!constant static-space-end #x07fff000) + (def!constant static-space-start #x02100000) + (def!constant static-space-end #x021ff000) (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)) + (def!constant linkage-table-space-start #x02200000) + (def!constant linkage-table-space-end #x022ff000)) #!+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 #x7b000000) + (def!constant read-only-space-end #x7b0ff000) - (def!constant static-space-start #x50000000) - (def!constant static-space-end #x5ffff000) + (def!constant static-space-start #x7b100000) + (def!constant static-space-end #x7b1ff000) - (def!constant dynamic-space-start #x80000000) - (def!constant dynamic-space-end #xA0000000) + (def!constant dynamic-space-start #x4c000000) + (def!constant dynamic-space-end #x7b0ff000) ;; In CMUCL: 0xB0000000->0xB1000000 - (def!constant linkage-table-space-start #xA0000000) - (def!constant linkage-table-space-end #xA1000000)) + (def!constant linkage-table-space-start #x7b200000) + (def!constant linkage-table-space-end #x7b2ff000)) #!+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 #x01000000) - (def!constant read-only-space-end #x04ff8000) + (def!constant read-only-space-start #x04000000) + (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) @@ -270,8 +284,8 @@ cerror breakpoint fun-end-breakpoint - single-step-breakpoint - #!+win32 context-restore) ;; HACK: The Win32 exception handling system does wrong things with this. + 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) @@ -280,7 +294,7 @@ ;;; for the benefit of anyone doing a lexical search for definitions ;;; of these symbols. -(defenum (:prefix object-not- :suffix -trap :start 16) +(defenum (:prefix object-not- :suffix -trap :start 24) list instance) @@ -337,14 +351,16 @@ ;; 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. sb!alien::*enter-alien-callback* ;; see comments in ../x86-64/parms.lisp - sb!pcl::..slot-unbound.. - ))) + sb!pcl::..slot-unbound..))) (defparameter *static-funs* '(length