From e43ffac8c378998d03fa25989c53b66cb734b76d Mon Sep 17 00:00:00 2001 From: Alastair Bridgewater Date: Sat, 3 Apr 2010 00:41:50 +0000 Subject: [PATCH] 1.0.37.28: Remove fop-normal-load games when dumping stuff. * Layouts, fixup-kinds, and assembly-routine names are named by interned symbols, which genesis now knows how to read with cold-fops. --- src/compiler/dump.lisp | 20 ++++---------------- version.lisp-expr | 2 +- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/compiler/dump.lisp b/src/compiler/dump.lisp index 0db369e..c876ba8 100644 --- a/src/compiler/dump.lisp +++ b/src/compiler/dump.lisp @@ -1064,19 +1064,13 @@ (position (fixup-note-position note)) (name (fixup-name fixup)) (flavor (fixup-flavor fixup))) - (dump-fop 'fop-normal-load fasl-output) - (let ((*cold-load-dump* t)) - (dump-object kind fasl-output)) - (dump-fop 'fop-maybe-cold-load fasl-output) + (dump-object kind fasl-output) ;; Depending on the flavor, we may have various kinds of ;; noise before the position. (ecase flavor (:assembly-routine (aver (symbolp name)) - (dump-fop 'fop-normal-load fasl-output) - (let ((*cold-load-dump* t)) - (dump-object name fasl-output)) - (dump-fop 'fop-maybe-cold-load fasl-output) + (dump-object name fasl-output) (dump-fop 'fop-assembler-fixup fasl-output)) ((:foreign :foreign-dataref) (aver (stringp name)) @@ -1212,10 +1206,7 @@ (dump-word length file) (write-segment-contents code-segment (fasl-output-stream file)) (dolist (routine routines) - (dump-fop 'fop-normal-load file) - (let ((*cold-load-dump* t)) - (dump-object (car routine) file)) - (dump-fop 'fop-maybe-cold-load file) + (dump-object (car routine) file) (dump-fop 'fop-assembler-routine file) (dump-word (label-position (cdr routine)) file)) (dump-fixups fixups file) @@ -1380,10 +1371,7 @@ (let ((name (classoid-name (layout-classoid obj)))) (unless name (compiler-error "dumping anonymous layout: ~S" obj)) - (dump-fop 'fop-normal-load file) - (let ((*cold-load-dump* t)) - (dump-object name file)) - (dump-fop 'fop-maybe-cold-load file)) + (dump-object name file)) (sub-dump-object (layout-inherits obj) file) (sub-dump-object (layout-depthoid obj) file) (sub-dump-object (layout-length obj) file) diff --git a/version.lisp-expr b/version.lisp-expr index 9f5533b..47c3023 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".) -"1.0.37.27" +"1.0.37.28" -- 1.7.10.4