[cmucl-commit] [git] CMU Common Lisp branch master updated. snapshot-2013-05-1-gba06f21

Raymond Toy rtoy at common-lisp.net
Wed May 15 03:02:43 UTC 2013


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMU Common Lisp".

The branch, master has been updated
       via  ba06f21ff5d6192b78746bd634eacb69fee17739 (commit)
      from  32d261e41c94c72e95ea13ea87c89a4b6f13ee45 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ba06f21ff5d6192b78746bd634eacb69fee17739
Author: Raymond Toy <toy.raymond at gmail.com>
Date:   Tue May 14 20:02:28 2013 -0700

    Wrap exports in eval-when.
    
     src/compiler/generic/objdef.lisp::
     src/compiler/generic/utils.lisp:;
     src/compiler/generic/vm-macs.lisp::
     src/compiler/sparc/c-callback.lisp::
     src/compiler/sparc/parms.lisp::
    
      When export lost its compile-time effects and became a normal
      function, the exports in many files no longer took affect while
      compiling the file.  This change makes the compile-time effects
      happen as before in selected files. With this change, the sparc port
      can be cross-compiled from x86 again.
    
     src/tools/cross-scripts/cross-x86-sparc.lisp::
      Need to frob CHAR-BYTES, which is needed by BYTE-BASH-COPY. .

diff --git a/src/code/float-trap.lisp b/src/code/float-trap.lisp
index 0995883..d97d04e 100644
--- a/src/code/float-trap.lisp
+++ b/src/code/float-trap.lisp
@@ -18,7 +18,9 @@
 (in-package "VM")
 (intl:textdomain "cmucl")
 
+(eval-when (:compile-toplevel :load-toplevel :execute)
 (export '(current-float-trap floating-point-modes sigfpe-handler))
+)
 (in-package "EXTENSIONS")
 (export '(set-floating-point-modes get-floating-point-modes
 	  with-float-traps-masked))
diff --git a/src/code/room.lisp b/src/code/room.lisp
index 85e8a41..1c5418b 100644
--- a/src/code/room.lisp
+++ b/src/code/room.lisp
@@ -15,10 +15,12 @@
 (use-package "SYSTEM")
 (intl:textdomain "cmucl")
 
+(eval-when (:compile-toplevel :load-toplevel :execute)
 (export '(memory-usage count-no-ops descriptor-vs-non-descriptor-storage
 		       instance-usage find-holes print-allocated-objects
 		       code-breakdown uninterned-symbol-count
 		       list-allocated-objects))
+)
 (in-package "LISP")
 (import '(
 	  dynamic-0-space-start dynamic-1-space-start read-only-space-start
diff --git a/src/code/sparc-svr4-vm.lisp b/src/code/sparc-svr4-vm.lisp
index 92b7af0..646dbd4 100644
--- a/src/code/sparc-svr4-vm.lisp
+++ b/src/code/sparc-svr4-vm.lisp
@@ -17,10 +17,12 @@
 
 (intl:textdomain "cmucl-sparc-vm")
 
+(eval-when (:compile-toplevel :load-toplevel :execute)
 (export '(fixup-code-object internal-error-arguments
 	  sigcontext-program-counter sigcontext-register
 	  sigcontext-float-register sigcontext-floating-point-modes
 	  extern-alien-name sanctify-for-execution))
+)
 
 #+complex-fp-vops
 (sys:register-lisp-feature :complex-fp-vops)
diff --git a/src/compiler/generic/objdef.lisp b/src/compiler/generic/objdef.lisp
index da04b4f..d64178a 100644
--- a/src/compiler/generic/objdef.lisp
+++ b/src/compiler/generic/objdef.lisp
@@ -17,6 +17,7 @@
 (in-package "VM")
 (intl:textdomain "cmucl")
 
+(eval-when (:compile-toplevel :load-toplevel :execute)
 (export '(lowtag-bits lowtag-mask lowtag-limit type-bits type-mask
 	  target-most-positive-fixnum target-most-negative-fixnum
 	  even-fixnum-type function-pointer-type other-immediate-0-type
@@ -52,6 +53,7 @@
 	  complex-double-double-float-type
 	  simple-array-double-double-float-type
 	  simple-array-complex-double-double-float-type))
+)
 
 (in-package "KERNEL")
 (export '(%make-funcallable-instance
diff --git a/src/compiler/generic/utils.lisp b/src/compiler/generic/utils.lisp
index e036fa8..fe24ad0 100644
--- a/src/compiler/generic/utils.lisp
+++ b/src/compiler/generic/utils.lisp
@@ -17,8 +17,10 @@
 (in-package "VM")
 (intl:textdomain "cmucl")
 
+(eval-when (:compile-toplevel :load-toplevel :execute)
 (export '(fixnumize static-symbol-p static-symbol-offset offset-static-symbol
 	  static-function-offset))
+)
 
 
 
diff --git a/src/compiler/generic/vm-macs.lisp b/src/compiler/generic/vm-macs.lisp
index f97ac12..883cdb1 100644
--- a/src/compiler/generic/vm-macs.lisp
+++ b/src/compiler/generic/vm-macs.lisp
@@ -163,8 +163,8 @@
 	(forms `(def-alloc ,alloc-trans ,offset ,variable-length ,header
 			   ,lowtag ',(inits))))
       `(progn
-	 (export ',(exports))
 	 (eval-when (compile load eval)
+	   (export ',(exports))
 	   (%define-primitive-object
 	    ',(make-primitive-object :name name
 				     :header header
diff --git a/src/compiler/sparc/c-callback.lisp b/src/compiler/sparc/c-callback.lisp
index 24bd7af..b1fa10c 100644
--- a/src/compiler/sparc/c-callback.lisp
+++ b/src/compiler/sparc/c-callback.lisp
@@ -13,8 +13,10 @@
 (use-package "ALIEN-INTERNALS")
 
 ;;; Support for callbacks to Lisp.
+(eval-when (:compile-toplevel :load-toplevel :execute)
 (export '(make-callback-trampoline callback-accessor-form
 	  compatible-function-types-p))
+)
 
 (defun callback-accessor-form (type sp offset)
   (let ((parsed-type (alien::parse-alien-type type)))
diff --git a/src/compiler/sparc/parms.lisp b/src/compiler/sparc/parms.lisp
index 4ff61bc..be73a40 100644
--- a/src/compiler/sparc/parms.lisp
+++ b/src/compiler/sparc/parms.lisp
@@ -61,6 +61,7 @@
 
 ;;;; Machine Architecture parameters:
 
+(eval-when (:compile-toplevel :load-toplevel :execute)
 (export '(word-bits byte-bits char-bits word-shift word-bytes char-bytes
 	  fixnum-tag-bits fixnum-tag-mask positive-fixnum-bits
 
@@ -86,6 +87,7 @@
 	  float-underflow-trap-bit float-overflow-trap-bit
 	  float-imprecise-trap-bit float-invalid-trap-bit
 	  float-divide-by-zero-trap-bit))
+)
 
 #+double-double
 (export '(double-double-float-digits))
@@ -208,11 +210,13 @@
 
 ;;;; Description of the target address space.
 
+(eval-when (:compile-toplevel :load-toplevel :execute)
 (export '(target-read-only-space-start
 	  target-static-space-start
 	  target-dynamic-space-start
 	  target-foreign-linkage-space-start
 	  target-foreign-linkage-entry-size))
+)
 
 ;;; Where to put the different spaces.  Must match the C code!
 ;;; 
@@ -228,6 +232,7 @@
 
 ;;;; Other random constants.
 
+(eval-when (:compile-toplevel :load-toplevel :execute)
 (export '(halt-trap pending-interrupt-trap error-trap cerror-trap
 	  breakpoint-trap function-end-breakpoint-trap
 	  after-breakpoint-trap allocation-trap
@@ -239,6 +244,7 @@
 #+heap-overflow-check
 (export '(dynamic-space-overflow-error-trap
 	  dynamic-space-overflow-warning-trap))
+)
 	  
 (defenum (:suffix -trap :start 8)
   halt
@@ -268,7 +274,9 @@
 
 ;;;; Static symbols.
 
+(eval-when (:compile-toplevel :load-toplevel :execute)
 (export '(static-symbols static-functions))
+)
 
 ;;; These symbols are loaded into static space directly after NIL so
 ;;; that the system can compute their address by adding a constant
diff --git a/src/tools/cross-scripts/cross-x86-sparc.lisp b/src/tools/cross-scripts/cross-x86-sparc.lisp
index 0e6dfbd..3525b69 100644
--- a/src/tools/cross-scripts/cross-x86-sparc.lisp
+++ b/src/tools/cross-scripts/cross-x86-sparc.lisp
@@ -186,8 +186,10 @@
 				       (find-symbol ,(symbol-name sym)
 						    :vm))))
 			       syms))))
-  (frob OLD-VM:BYTE-BITS OLD-VM:WORD-BITS
+  (frob OLD-VM:BYTE-BITS
+	OLD-VM:WORD-BITS
 	OLD-VM:CHAR-BITS
+	OLD-VM:CHAR-BYTES
 	OLD-VM:LOWTAG-BITS
 	#+long-float OLD-VM:SIMPLE-ARRAY-LONG-FLOAT-TYPE 
 	OLD-VM:SIMPLE-ARRAY-DOUBLE-FLOAT-TYPE 

-----------------------------------------------------------------------

Summary of changes:
 src/code/float-trap.lisp                     |    2 ++
 src/code/room.lisp                           |    2 ++
 src/code/sparc-svr4-vm.lisp                  |    2 ++
 src/compiler/generic/objdef.lisp             |    2 ++
 src/compiler/generic/utils.lisp              |    2 ++
 src/compiler/generic/vm-macs.lisp            |    2 +-
 src/compiler/sparc/c-callback.lisp           |    2 ++
 src/compiler/sparc/parms.lisp                |    8 ++++++++
 src/tools/cross-scripts/cross-x86-sparc.lisp |    4 +++-
 9 files changed, 24 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMU Common Lisp


More information about the cmucl-commit mailing list