0.6.12.13:

	set up :SB-AFTER-XC-CORE feature so slam.sh is more convenient
	The various core address mismatch states should be fatal
		errors, not just fprintf()s.

diff --git a/base-target-features.lisp-expr b/base-target-features.lisp-expr
index 10e5d56..3ae733f 100644 (file)
--- a/base-target-features.lisp-expr
+++ b/base-target-features.lisp-expr
@@ -128,6 +128,13 @@
  ;; readtable configured so that the system sources can be read.
  ; :sb-show
 
+ ;; This isn't really a target Lisp feature at all, but controls
+ ;; whether the build process produces an after-xc.core file. This
+ ;; can be useful for shortening the edit/compile/debug cycle if
+ ;; you're messing around with low-level internals of the system,
+ ;; as in slam.sh. Otherwise you don't need it.
+ ; :sb-after-xc-core
+
  ;; Enable extra debugging output in the assem.lisp assembler/scheduler
  ;; code. (This is the feature which was called :DEBUG in the
  ;; original CMU CL code.)

diff --git a/make-host-2.sh b/make-host-2.sh
index b2aa8d5..8b0979a 100644 (file)
--- a/make-host-2.sh
+++ b/make-host-2.sh
@@ -102,9 +102,8 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
         ;; cross-compilation host which supports CMU-CL-style SAVE-LISP,
         ;; this can be a good time to run it. The resulting core isn't
        ;; used in the normal build, but can be handy for experimenting
-       ;; with the system.
-        
-       (when (find :sb-show *shebang-features*)
+       ;; with the system. (See slam.sh for an example.)
+       (when (find :sb-after-xc-core *shebang-features*)
           #+cmu (ext:save-lisp "output/after-xc.core" :load-init-file nil)
           #+sbcl (sb-ext:save-lisp-and-die "output/after-xc.core")
          )

diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c
index a016ced..64c495d 100644 (file)
--- a/src/runtime/coreparse.c
+++ b/src/runtime/coreparse.c
@@ -69,7 +69,7 @@ process_directory(int fd, long *ptr, int count)
            if (addr != (os_vm_address_t)DYNAMIC_SPACE_START) {
                fprintf(stderr, "in core: 0x%x - in runtime: 0x%x \n",
                        addr, (os_vm_address_t)DYNAMIC_SPACE_START);
-               fprintf(stderr,"warning: core/runtime address mismatch: DYNAMIC_SPACE_START");
+               lose("core/runtime address mismatch: DYNAMIC_SPACE_START");
            }
 #else
            if ((addr != (os_vm_address_t)DYNAMIC_0_SPACE_START) &&
@@ -77,7 +77,7 @@ process_directory(int fd, long *ptr, int count)
                fprintf(stderr, "in core: 0x%x - in runtime: 0x%x or 0x%x\n",
                        addr, (os_vm_address_t)DYNAMIC_0_SPACE_START,
                        (os_vm_address_t)DYNAMIC_1_SPACE_START);
-               fprintf(stderr,"warning: core/runtime address mismatch: DYNAMIC_SPACE_START");
+               lose("warning: core/runtime address mismatch: DYNAMIC_SPACE_START");
            }
 #endif
 /* FIXME: Should the conditional here be reg_ALLOC instead of

diff --git a/version.lisp-expr b/version.lisp-expr
index bccfa8f..c06db7c 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -15,4 +15,4 @@
 ;;; versions, and a string like "0.6.5.12" is used for versions which
 ;;; aren't released but correspond only to CVS tags or snapshots.
 
-"0.6.12.12"
+"0.6.12.13"