From ba94fb1763a2f1e01a3b75a9e1415f051c5a559f Mon Sep 17 00:00:00 2001 From: William Harold Newman Date: Thu, 1 Apr 2004 02:05:05 +0000 Subject: [PATCH] 0.8.8.14: tidying... ...*REVERSED-TYPE-INFO-INIT-FORMS* isn't needed at run time. ...HOLES stuff is long-dead code -- seems to be related to something on old old CMU CL SPARC port -- so delete it. (pointed out by nyef on #lisp) ...For that matter, FIND-HOLES is no longer used either, so delete it too. ...belated *and*-*edit* in cut-and-paste-and-edit of FTYPE declaration of !COLD-LOSE --- package-data-list.lisp-expr | 2 +- src/code/cold-init.lisp | 2 +- src/code/room.lisp | 26 -------------------------- src/compiler/globaldb.lisp | 6 +++--- src/runtime/validate.c | 26 -------------------------- version.lisp-expr | 2 +- 6 files changed, 6 insertions(+), 58 deletions(-) diff --git a/package-data-list.lisp-expr b/package-data-list.lisp-expr index 75312d4..efbbcf3 100644 --- a/package-data-list.lisp-expr +++ b/package-data-list.lisp-expr @@ -1992,7 +1992,7 @@ structure representations" "ERROR-TRAP" "EVEN-FIXNUM-LOWTAG" "EXPORTED-STATIC-SYMBOLS" "EXTERN-ALIEN-NAME" "FDEFN-FUN-SLOT" "FDEFN-NAME-SLOT" "FDEFN-RAW-ADDR-SLOT" - "FDEFN-SIZE" "FDEFN-WIDETAG" "FIND-HOLES" "FIXNUMIZE" + "FDEFN-SIZE" "FDEFN-WIDETAG" "FIXNUMIZE" "FIXUP-CODE-OBJECT" "FLOAT-DENORMAL-TRAP-BIT" "FLOAT-DIVIDE-BY-ZERO-TRAP-BIT" "FLOAT-IMPRECISE-TRAP-BIT" "FLOAT-INVALID-TRAP-BIT" diff --git a/src/code/cold-init.lisp b/src/code/cold-init.lisp index bc37148..a360161 100644 --- a/src/code/cold-init.lisp +++ b/src/code/cold-init.lisp @@ -49,7 +49,7 @@ ;;;; putting ourselves out of our misery when things become too much to bear -(declaim (ftype (function (simple-string) nil) critically-unreachable)) +(declaim (ftype (function (simple-string) nil) !cold-lose)) (defun !cold-lose (msg) (%primitive print msg) (%primitive print "too early in cold init to recover from errors") diff --git a/src/code/room.lisp b/src/code/room.lisp index 43f552e..fdebda6 100644 --- a/src/code/room.lisp +++ b/src/code/room.lisp @@ -568,32 +568,6 @@ (values)) -(defun find-holes (&rest spaces) - (dolist (space (or spaces '(:read-only :static :dynamic))) - (format t "In ~A space:~%" space) - (let ((start-addr nil) - (total-bytes 0)) - (declare (type (or null (unsigned-byte 32)) start-addr) - (type (unsigned-byte 32) total-bytes)) - (map-allocated-objects - (lambda (object typecode bytes) - (declare (ignore typecode) - (type (unsigned-byte 32) bytes)) - (if (and (consp object) - (eql (car object) 0) - (eql (cdr object) 0)) - (if start-addr - (incf total-bytes bytes) - (setf start-addr (sb!di::get-lisp-obj-address object) - total-bytes bytes)) - (when start-addr - (format t "~:D bytes at #X~X~%" total-bytes start-addr) - (setf start-addr nil)))) - space) - (when start-addr - (format t "~:D bytes at #X~X~%" total-bytes start-addr)))) - (values)) - ;;;; PRINT-ALLOCATED-OBJECTS (defun print-allocated-objects (space &key (percent 0) (pages 5) diff --git a/src/compiler/globaldb.lisp b/src/compiler/globaldb.lisp index 05bee48..f7fbd60 100644 --- a/src/compiler/globaldb.lisp +++ b/src/compiler/globaldb.lisp @@ -263,7 +263,7 @@ ;;; order in which the TYPE-INFO-creation forms are generated doesn't ;;; match the relative order in which the forms need to be executed at ;;; cold load time. -(defparameter *reversed-type-info-init-forms* nil) +(defparameter *!reversed-type-info-init-forms* nil) ;;; Define a new type of global information for CLASS. TYPE is the ;;; name of the type, DEFAULT is the value for that type when it @@ -320,7 +320,7 @@ (declare (ignorable name)) ,',default)) (setf (type-info-type type-info) ',',type-spec)) - *reversed-type-info-init-forms*)) + *!reversed-type-info-init-forms*)) ',type)) ) ; EVAL-WHEN @@ -1400,7 +1400,7 @@ ;;; we can set their DEFAULT and TYPE slots. (macrolet ((frob () `(!cold-init-forms - ,@(reverse *reversed-type-info-init-forms*)))) + ,@(reverse *!reversed-type-info-init-forms*)))) (frob)) ;;;; a hack for detecting diff --git a/src/runtime/validate.c b/src/runtime/validate.c index aa0890f..b8bf283 100644 --- a/src/runtime/validate.c +++ b/src/runtime/validate.c @@ -34,28 +34,6 @@ ensure_space(lispobj *start, unsigned long size) } } -#ifdef HOLES - -static os_vm_address_t holes[] = HOLES; - -static void -make_holes(void) -{ - int i; - - for (i = 0; i < sizeof(holes)/sizeof(holes[0]); i++) { - if (os_validate(holes[i], HOLE_SIZE) == NULL) { - fprintf(stderr, - "make_holes: failed to validate %ld bytes at 0x%08X\n", - HOLE_SIZE, - (unsigned long)holes[i]); - exit(1); - } - os_protect(holes[i], HOLE_SIZE, 0); - } -} -#endif - void validate(void) { @@ -73,10 +51,6 @@ validate(void) ensure_space( (lispobj *)DYNAMIC_1_SPACE_START , DYNAMIC_SPACE_SIZE); #endif -#ifdef HOLES - make_holes(); -#endif - #ifdef PRINTNOISE printf(" done.\n"); #endif diff --git a/version.lisp-expr b/version.lisp-expr index bd1c7b3..0288866 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.8.9.13" +"0.8.9.14" -- 1.7.10.4