X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fparms.lisp;h=2a5a9b8f8627abea887a320bbe37ffbb22860abd;hb=aa2dc9529460ea0d9c99998dc87283fc1a43e808;hp=8ad1f042f3e67d879ce633f898160c6cf61bdbd6;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git diff --git a/src/compiler/x86/parms.lisp b/src/compiler/x86/parms.lisp index 8ad1f04..2a5a9b8 100644 --- a/src/compiler/x86/parms.lisp +++ b/src/compiler/x86/parms.lisp @@ -24,8 +24,6 @@ ;;;; machine architecture parameters -(eval-when (:compile-toplevel :load-toplevel :execute) - (defconstant word-bits 32 #!+sb-doc "Number of bits per word where a word holds one lisp descriptor.") @@ -42,38 +40,37 @@ #!+sb-doc "Number of bytes in a word.") -) ; EVAL-WHEN - -(eval-when (:compile-toplevel :load-toplevel :execute) (defconstant float-sign-shift 31) -;; These values were taken from the alpha code. The values for -;; bias and exponent min/max are not the same as shown in the 486 book. -;; They may be correct for how Python uses them. -(defconstant single-float-bias 126) ; Intel says 127 -(defconstant single-float-exponent-byte (byte 8 23)) -(defconstant single-float-significand-byte (byte 23 0)) -;; The 486 book shows the exponent range -126 to +127. The Lisp -;; code that uses these values seems to want already biased numbers. +;;; comment from CMU CL: +;;; These values were taken from the alpha code. The values for +;;; bias and exponent min/max are not the same as shown in the 486 book. +;;; They may be correct for how Python uses them. +(defconstant single-float-bias 126) ; Intel says 127. +(defconstant-eqx single-float-exponent-byte (byte 8 23) #'equalp) +(defconstant-eqx single-float-significand-byte (byte 23 0) #'equalp) +;;; comment from CMU CL: +;;; The 486 book shows the exponent range -126 to +127. The Lisp +;;; code that uses these values seems to want already biased numbers. (defconstant single-float-normal-exponent-min 1) (defconstant single-float-normal-exponent-max 254) (defconstant single-float-hidden-bit (ash 1 23)) (defconstant single-float-trapping-nan-bit (ash 1 22)) (defconstant double-float-bias 1022) -(defconstant double-float-exponent-byte (byte 11 20)) -(defconstant double-float-significand-byte (byte 20 0)) +(defconstant-eqx double-float-exponent-byte (byte 11 20) #'equalp) +(defconstant-eqx double-float-significand-byte (byte 20 0) #'equalp) (defconstant double-float-normal-exponent-min 1) (defconstant double-float-normal-exponent-max #x7FE) (defconstant double-float-hidden-bit (ash 1 20)) (defconstant double-float-trapping-nan-bit (ash 1 19)) (defconstant long-float-bias 16382) -(defconstant long-float-exponent-byte (byte 15 0)) -(defconstant long-float-significand-byte (byte 31 0)) +(defconstant-eqx long-float-exponent-byte (byte 15 0) #'equalp) +(defconstant-eqx long-float-significand-byte (byte 31 0) #'equalp) (defconstant long-float-normal-exponent-min 1) (defconstant long-float-normal-exponent-max #x7FFE) -(defconstant long-float-hidden-bit (ash 1 31)) ; Actually not hidden +(defconstant long-float-hidden-bit (ash 1 31)) ; actually not hidden (defconstant long-float-trapping-nan-bit (ash 1 30)) (defconstant single-float-digits @@ -85,40 +82,30 @@ (defconstant long-float-digits (+ (byte-size long-float-significand-byte) word-bits 1)) -;;; pfw -- from i486 microprocessor programmers reference manual -(defconstant float-invalid-trap-bit (ash 1 0)) +;;; pfw -- from i486 microprocessor programmer's reference manual +(defconstant float-invalid-trap-bit (ash 1 0)) (defconstant float-denormal-trap-bit (ash 1 1)) (defconstant float-divide-by-zero-trap-bit (ash 1 2)) (defconstant float-overflow-trap-bit (ash 1 3)) (defconstant float-underflow-trap-bit (ash 1 4)) -(defconstant float-inexact-trap-bit (ash 1 5)) +(defconstant float-inexact-trap-bit (ash 1 5)) (defconstant float-round-to-nearest 0) (defconstant float-round-to-negative 1) (defconstant float-round-to-positive 2) (defconstant float-round-to-zero 3) -(defconstant float-rounding-mode (byte 2 10)) -(defconstant float-sticky-bits (byte 6 16)) -(defconstant float-traps-byte (byte 6 0)) -(defconstant float-exceptions-byte (byte 6 16)) -(defconstant float-precision-control (byte 2 8)) -(defconstant float-fast-bit 0) ; No fast mode on x86 - -); EVAL-WHEN +(defconstant-eqx float-rounding-mode (byte 2 10) #'equalp) +(defconstant-eqx float-sticky-bits (byte 6 16) #'equalp) +(defconstant-eqx float-traps-byte (byte 6 0) #'equalp) +(defconstant-eqx float-exceptions-byte (byte 6 16) #'equalp) +(defconstant-eqx float-precision-control (byte 2 8) #'equalp) +(defconstant float-fast-bit 0) ; no fast mode on x86 ;;;; description of the target address space ;;; where to put the different spaces ;;; -;;; FIXME: Couldn't/shouldn't these be DEFCONSTANT instead of DEFPARAMETER? -;;; -;;; FIXME: Since SBCL has a different way of distinguishing between target -;;; and host than the old CMU CL code used, the "TARGET-" prefix is -;;; redundant. Perhaps each *TARGET-FOO* should become *FOO*, probably -;;; at the same time that we unscrew the kludgy way that constants are -;;; duplicated between this file and runtime/x86-validate.h. -;;; ;;; Note: Mostly these values are black magic, inherited from CMU CL ;;; without any documentation. However, there were a few explanatory ;;; comments in the CMU CL sources: @@ -129,13 +116,24 @@ ;;; * On FreeBSD, ;;; ** The space 0x0E000000-0x10000000 is "Foreign segment". ;;; ** The space 0x20000000-0x30000000 is reserved for shared libs. -;;; And there have been a few changes since the fork: +;;; And there have been some changes since the fork from CMU CL: +;;; * The OpenBSD port is new since the fork. We started with +;;; the FreeBSD address map, which actually worked until the +;;; Alpha port patches, for reasons which in retrospect are rather +;;; mysterious. After the Alpha port patches were added, the +;;; OpenBSD port suffered memory corruption problems. While +;;; debugging those, it was discovered that src/runtime/trymap +;;; failed for the control stack region #x40000000-#x47fff000. +;;; After the control stack was moved upward out of this region +;;; (stealing some bytes from dynamic space) the problems went +;;; away. ;;; * The FreeBSD STATIC-SPACE-START value was bumped up from ;;; #x28000000 to #x30000000 when FreeBSD ld.so dynamic linking ;;; support was added for FreeBSD ca. 20000910. This was to keep from -;;; stomping on an address range that the dynamic libraries want to use. -;;; (They want to use this address range even if we try to reserve it -;;; with a call to validate() as the first operation in main().) +;;; stomping on an address range that the dynamic libraries want to +;;; use. (They want to use this address range even if we try to +;;; reserve it with a call to validate() as the first operation in +;;; main().) #!+linux (progn @@ -169,10 +167,15 @@ (defconstant binding-stack-start #x38000000) (defconstant binding-stack-end #x3ffff000) - (defconstant control-stack-start #x40000000) - (defconstant control-stack-end #x47fff000) - - (defconstant dynamic-space-start #x48000000) + (defconstant control-stack-start + #+freebsd #x40000000 + #+openbsd #x48000000) + (defconstant control-stack-end + #+freebsd #x47fff000 + #+openbsd #x4ffff000) + (defconstant dynamic-space-start + #+freebsd #x48000000 + #+openbsd #x50000000) (defconstant dynamic-space-end #x88000000)) ;;; Given that NIL is the first thing allocated in static space, we @@ -189,8 +192,7 @@ breakpoint function-end-breakpoint single-step-breakpoint) -;;; FIXME: It'd be nice to replace all the DEFENUMs with something -;;; a la +;;; 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) @@ -237,10 +239,10 @@ ;; functions that the C code needs to call sb!impl::!cold-init - sb!impl::maybe-gc + maybe-gc sb!kernel::internal-error sb!di::handle-breakpoint - sb!impl::fdefinition-object + fdefinition-object ;; free pointers ;; @@ -253,17 +255,17 @@ *initial-dynamic-space-free-pointer* ;; things needed for non-local exit - sb!impl::*current-catch-block* - sb!impl::*current-unwind-protect-block* - sb!c::*eval-stack-top* + *current-catch-block* + *current-unwind-protect-block* + *eval-stack-top* sb!vm::*alien-stack* ;; interrupt handling - sb!impl::*pseudo-atomic-atomic* - sb!impl::*pseudo-atomic-interrupted* + *pseudo-atomic-atomic* + *pseudo-atomic-interrupted* sb!unix::*interrupts-enabled* sb!unix::*interrupt-pending* - sb!impl::*free-interrupt-context-index* + *free-interrupt-context-index* sb!vm::*allocation-pointer* sb!vm::*binding-stack-pointer*