Changeset 12922

Timestamp:

Oct 7, 2009, 10:45:09 PM (11 years ago)

Author:

gb

Message:

Allow fasdumping macptr-typed constants, as long as they're not typed
pointers and as long as they're pointing to the low 64K or high 64K
of the address space.

File:

• trunk/source/lib/nfcomp.lisp (modified) (1 diff)

trunk/source/lib/nfcomp.lisp

@@ -1231 +1231 @@
                                  (ash 1 x8664::fulltag-immheader-2))))
            (case type-code
-             ((#.target::subtag-macptr #.target::subtag-dead-macptr) (unless (%null-ptr-p exp) (fasl-unknown exp)))
+             (#.target::subtag-dead-macptr (fasl-unknown exp))
+             (#.target::subtag-macptr
+              ;; Treat untyped pointers to the high/low 64K of the address
+              ;; space as constants.  Refuse to dump other pointers.
+              (unless (and (zerop (%macptr-type exp))
+                           (zerop (%macptr-domain exp)))
+                (error "Can't dump typed pointer ~s" exp))
+              (let* ((addr (%ptr-to-int exp)))
+                (unless (or (< addr #x10000)
+                            (>= addr (- (ash 1 target::nbits-in-word)
+                                        #x10000)))
+                  (error "Can't dump pointer ~s : address is not in the low or high 64K of the address space." exp))))
              (t (fasl-scan-ref exp)))
            (case type-code