From 4a98168727fa44e9b784289c7a32207ccd1d726b Mon Sep 17 00:00:00 2001 From: rtoy <rtoy> Date: Wed, 17 Sep 2008 13:34:44 +0000 Subject: [PATCH] Add OLD-VM as a nickname for the old backend. Use the nickname everywhere. This makes the cross-compile scripts look much more similiar and might allow us to extract the common bits out. --- tools/cross-scripts/cross-sparc-sparc.lisp | 78 +++++++++++----------- tools/cross-scripts/cross-x86-x86.lisp | 68 +++++++++---------- 2 files changed, 73 insertions(+), 73 deletions(-) diff --git a/tools/cross-scripts/cross-sparc-sparc.lisp b/tools/cross-scripts/cross-sparc-sparc.lisp index 5154e5ace..660d085ba 100644 --- a/tools/cross-scripts/cross-sparc-sparc.lisp +++ b/tools/cross-scripts/cross-sparc-sparc.lisp @@ -2,7 +2,7 @@ ;;; Rename the SPARC package and backend so that new-backend does the ;;; right thing. -(rename-package "SPARC" "OLD-SPARC") +(rename-package "SPARC" "OLD-SPARC" '("OLD-VM")) (setf (c:backend-name c:*native-backend*) "OLD-SPARC") (c::new-backend "SPARC" @@ -55,8 +55,8 @@ ;; When compiling the compiler, vm:fixup-code-object and ;; vm:sanctify-for-execution are undefined. Import these to get rid ;; of that error. -(import 'old-sparc::fixup-code-object) -(import 'old-sparc::sanctify-for-execution) +(import 'old-vm::fixup-code-object) +(import 'old-vm::sanctify-for-execution) (export 'extern-alien-name) (export 'fixup-code-object) (export 'sanctify-for-execution) @@ -143,45 +143,45 @@ (find-symbol ,(symbol-name sym) :vm)))) syms)))) - (frob OLD-SPARC:BYTE-BITS OLD-SPARC:WORD-BITS - OLD-SPARC:LOWTAG-BITS - #+long-float OLD-SPARC:SIMPLE-ARRAY-LONG-FLOAT-TYPE - OLD-SPARC:SIMPLE-ARRAY-DOUBLE-FLOAT-TYPE - OLD-SPARC:SIMPLE-ARRAY-SINGLE-FLOAT-TYPE - #+long-float OLD-SPARC:SIMPLE-ARRAY-COMPLEX-LONG-FLOAT-TYPE - OLD-SPARC:SIMPLE-ARRAY-COMPLEX-DOUBLE-FLOAT-TYPE - OLD-SPARC:SIMPLE-ARRAY-COMPLEX-SINGLE-FLOAT-TYPE - OLD-SPARC:SIMPLE-ARRAY-UNSIGNED-BYTE-2-TYPE - OLD-SPARC:SIMPLE-ARRAY-UNSIGNED-BYTE-4-TYPE - OLD-SPARC:SIMPLE-ARRAY-UNSIGNED-BYTE-8-TYPE - OLD-SPARC:SIMPLE-ARRAY-UNSIGNED-BYTE-16-TYPE - OLD-SPARC:SIMPLE-ARRAY-UNSIGNED-BYTE-32-TYPE - OLD-SPARC:SIMPLE-ARRAY-SIGNED-BYTE-8-TYPE - OLD-SPARC:SIMPLE-ARRAY-SIGNED-BYTE-16-TYPE - OLD-SPARC:SIMPLE-ARRAY-SIGNED-BYTE-30-TYPE - OLD-SPARC:SIMPLE-ARRAY-SIGNED-BYTE-32-TYPE - OLD-SPARC:SIMPLE-BIT-VECTOR-TYPE - OLD-SPARC:SIMPLE-STRING-TYPE OLD-SPARC:SIMPLE-VECTOR-TYPE - OLD-SPARC:SIMPLE-ARRAY-TYPE OLD-SPARC:VECTOR-DATA-OFFSET - OLD-SPARC:DOUBLE-FLOAT-DIGITS - old-sparc:single-float-digits - OLD-SPARC:DOUBLE-FLOAT-EXPONENT-BYTE - OLD-SPARC:DOUBLE-FLOAT-NORMAL-EXPONENT-MAX - OLD-SPARC:DOUBLE-FLOAT-SIGNIFICAND-BYTE - OLD-SPARC:SINGLE-FLOAT-EXPONENT-BYTE - OLD-SPARC:SINGLE-FLOAT-NORMAL-EXPONENT-MAX - OLD-SPARC:SINGLE-FLOAT-SIGNIFICAND-BYTE + (frob OLD-VM:BYTE-BITS OLD-VM:WORD-BITS + OLD-VM:LOWTAG-BITS + #+long-float OLD-VM:SIMPLE-ARRAY-LONG-FLOAT-TYPE + OLD-VM:SIMPLE-ARRAY-DOUBLE-FLOAT-TYPE + OLD-VM:SIMPLE-ARRAY-SINGLE-FLOAT-TYPE + #+long-float OLD-VM:SIMPLE-ARRAY-COMPLEX-LONG-FLOAT-TYPE + OLD-VM:SIMPLE-ARRAY-COMPLEX-DOUBLE-FLOAT-TYPE + OLD-VM:SIMPLE-ARRAY-COMPLEX-SINGLE-FLOAT-TYPE + OLD-VM:SIMPLE-ARRAY-UNSIGNED-BYTE-2-TYPE + OLD-VM:SIMPLE-ARRAY-UNSIGNED-BYTE-4-TYPE + OLD-VM:SIMPLE-ARRAY-UNSIGNED-BYTE-8-TYPE + OLD-VM:SIMPLE-ARRAY-UNSIGNED-BYTE-16-TYPE + OLD-VM:SIMPLE-ARRAY-UNSIGNED-BYTE-32-TYPE + OLD-VM:SIMPLE-ARRAY-SIGNED-BYTE-8-TYPE + OLD-VM:SIMPLE-ARRAY-SIGNED-BYTE-16-TYPE + OLD-VM:SIMPLE-ARRAY-SIGNED-BYTE-30-TYPE + OLD-VM:SIMPLE-ARRAY-SIGNED-BYTE-32-TYPE + OLD-VM:SIMPLE-BIT-VECTOR-TYPE + OLD-VM:SIMPLE-STRING-TYPE OLD-VM:SIMPLE-VECTOR-TYPE + OLD-VM:SIMPLE-ARRAY-TYPE OLD-VM:VECTOR-DATA-OFFSET + OLD-VM:DOUBLE-FLOAT-DIGITS + old-vm:single-float-digits + OLD-VM:DOUBLE-FLOAT-EXPONENT-BYTE + OLD-VM:DOUBLE-FLOAT-NORMAL-EXPONENT-MAX + OLD-VM:DOUBLE-FLOAT-SIGNIFICAND-BYTE + OLD-VM:SINGLE-FLOAT-EXPONENT-BYTE + OLD-VM:SINGLE-FLOAT-NORMAL-EXPONENT-MAX + OLD-VM:SINGLE-FLOAT-SIGNIFICAND-BYTE ) #+double-double - (frob OLD-SPARC:SIMPLE-ARRAY-COMPLEX-DOUBLE-DOUBLE-FLOAT-TYPE - OLD-SPARC:SIMPLE-ARRAY-DOUBLE-DOUBLE-FLOAT-TYPE) + (frob OLD-VM:SIMPLE-ARRAY-COMPLEX-DOUBLE-DOUBLE-FLOAT-TYPE + OLD-VM:SIMPLE-ARRAY-DOUBLE-DOUBLE-FLOAT-TYPE) ) ;; Modular arith hacks. When cross-compiling, the compiler wants to ;; constant-fold some stuff, and it needs the following functions to ;; do so. This just gets rid of the hundreds of errors that happen. -(setf (fdefinition 'vm::ash-left-mod32) #'old-sparc::ash-left-mod32) -(setf (fdefinition 'vm::lognot-mod32) #'old-sparc::lognot-mod32) +(setf (fdefinition 'vm::ash-left-mod32) #'old-vm::ash-left-mod32) +(setf (fdefinition 'vm::lognot-mod32) #'old-vm::lognot-mod32) ;; End modular arith hacks (let ((function (symbol-function 'kernel:error-number-or-lose))) @@ -226,9 +226,9 @@ ;; Sometimes during cross-compile sparc::any-reg isn't defined during ;; cross-compile. ;; -;; hack, hack, hack: Make old-sparc::any-reg the same as -;; sparc::any-reg as an SC. Do this by adding old-sparc::any-reg +;; hack, hack, hack: Make old-vm::any-reg the same as +;; sparc::any-reg as an SC. Do this by adding old-vm::any-reg ;; to the hash table with the same value as sparc::any-reg. (let ((ht (c::backend-sc-names c::*target-backend*))) - (setf (gethash 'old-sparc::any-reg ht) - (gethash 'sparc::any-reg ht))) + (setf (gethash 'old-vm::any-reg ht) + (gethash 'vm::any-reg ht))) diff --git a/tools/cross-scripts/cross-x86-x86.lisp b/tools/cross-scripts/cross-x86-x86.lisp index 150513bc1..e05c6c3da 100644 --- a/tools/cross-scripts/cross-x86-x86.lisp +++ b/tools/cross-scripts/cross-x86-x86.lisp @@ -5,7 +5,7 @@ ;;; Rename the X86 package and backend so that new-backend does the ;;; right thing. -(rename-package "X86" "OLD-X86") +(rename-package "X86" "OLD-X86" '("OLD-VM")) (setf (c:backend-name c:*native-backend*) "OLD-X86") (c::new-backend "X86" @@ -113,39 +113,39 @@ (find-symbol ,(symbol-name sym) :vm)))) syms)))) - (frob OLD-X86:BYTE-BITS OLD-X86:WORD-BITS - #+long-float OLD-X86:SIMPLE-ARRAY-LONG-FLOAT-TYPE - OLD-X86:SIMPLE-ARRAY-DOUBLE-FLOAT-TYPE - OLD-X86:SIMPLE-ARRAY-SINGLE-FLOAT-TYPE - #+long-float OLD-X86:SIMPLE-ARRAY-COMPLEX-LONG-FLOAT-TYPE - OLD-X86:SIMPLE-ARRAY-COMPLEX-DOUBLE-FLOAT-TYPE - OLD-X86:SIMPLE-ARRAY-COMPLEX-SINGLE-FLOAT-TYPE - OLD-X86:SIMPLE-ARRAY-UNSIGNED-BYTE-2-TYPE - OLD-X86:SIMPLE-ARRAY-UNSIGNED-BYTE-4-TYPE - OLD-X86:SIMPLE-ARRAY-UNSIGNED-BYTE-8-TYPE - OLD-X86:SIMPLE-ARRAY-UNSIGNED-BYTE-16-TYPE - OLD-X86:SIMPLE-ARRAY-UNSIGNED-BYTE-32-TYPE - OLD-X86:SIMPLE-ARRAY-SIGNED-BYTE-8-TYPE - OLD-X86:SIMPLE-ARRAY-SIGNED-BYTE-16-TYPE - OLD-X86:SIMPLE-ARRAY-SIGNED-BYTE-30-TYPE - OLD-X86:SIMPLE-ARRAY-SIGNED-BYTE-32-TYPE - OLD-X86:SIMPLE-BIT-VECTOR-TYPE - OLD-X86:SIMPLE-STRING-TYPE OLD-X86:SIMPLE-VECTOR-TYPE - OLD-X86:SIMPLE-ARRAY-TYPE OLD-X86:VECTOR-DATA-OFFSET - OLD-X86:DOUBLE-FLOAT-EXPONENT-BYTE - OLD-X86:DOUBLE-FLOAT-NORMAL-EXPONENT-MAX - OLD-X86:DOUBLE-FLOAT-SIGNIFICAND-BYTE - OLD-X86:SINGLE-FLOAT-EXPONENT-BYTE - OLD-X86:SINGLE-FLOAT-NORMAL-EXPONENT-MAX - OLD-X86:SINGLE-FLOAT-SIGNIFICAND-BYTE + (frob OLD-VM:BYTE-BITS OLD-VM:WORD-BITS + #+long-float OLD-VM:SIMPLE-ARRAY-LONG-FLOAT-TYPE + OLD-VM:SIMPLE-ARRAY-DOUBLE-FLOAT-TYPE + OLD-VM:SIMPLE-ARRAY-SINGLE-FLOAT-TYPE + #+long-float OLD-VM:SIMPLE-ARRAY-COMPLEX-LONG-FLOAT-TYPE + OLD-VM:SIMPLE-ARRAY-COMPLEX-DOUBLE-FLOAT-TYPE + OLD-VM:SIMPLE-ARRAY-COMPLEX-SINGLE-FLOAT-TYPE + OLD-VM:SIMPLE-ARRAY-UNSIGNED-BYTE-2-TYPE + OLD-VM:SIMPLE-ARRAY-UNSIGNED-BYTE-4-TYPE + OLD-VM:SIMPLE-ARRAY-UNSIGNED-BYTE-8-TYPE + OLD-VM:SIMPLE-ARRAY-UNSIGNED-BYTE-16-TYPE + OLD-VM:SIMPLE-ARRAY-UNSIGNED-BYTE-32-TYPE + OLD-VM:SIMPLE-ARRAY-SIGNED-BYTE-8-TYPE + OLD-VM:SIMPLE-ARRAY-SIGNED-BYTE-16-TYPE + OLD-VM:SIMPLE-ARRAY-SIGNED-BYTE-30-TYPE + OLD-VM:SIMPLE-ARRAY-SIGNED-BYTE-32-TYPE + OLD-VM:SIMPLE-BIT-VECTOR-TYPE + OLD-VM:SIMPLE-STRING-TYPE OLD-VM:SIMPLE-VECTOR-TYPE + OLD-VM:SIMPLE-ARRAY-TYPE OLD-VM:VECTOR-DATA-OFFSET + OLD-VM:DOUBLE-FLOAT-EXPONENT-BYTE + OLD-VM:DOUBLE-FLOAT-NORMAL-EXPONENT-MAX + OLD-VM:DOUBLE-FLOAT-SIGNIFICAND-BYTE + OLD-VM:SINGLE-FLOAT-EXPONENT-BYTE + OLD-VM:SINGLE-FLOAT-NORMAL-EXPONENT-MAX + OLD-VM:SINGLE-FLOAT-SIGNIFICAND-BYTE ) #+double-double - (frob OLD-X86:SIMPLE-ARRAY-COMPLEX-DOUBLE-DOUBLE-FLOAT-TYPE - OLD-X86:SIMPLE-ARRAY-DOUBLE-DOUBLE-FLOAT-TYPE)) + (frob OLD-VM:SIMPLE-ARRAY-COMPLEX-DOUBLE-DOUBLE-FLOAT-TYPE + OLD-VM:SIMPLE-ARRAY-DOUBLE-DOUBLE-FLOAT-TYPE)) ;; Modular arith hacks -(setf (fdefinition 'vm::ash-left-mod32) #'old-x86::ash-left-mod32) -(setf (fdefinition 'vm::lognot-mod32) #'old-x86::lognot-mod32) +(setf (fdefinition 'vm::ash-left-mod32) #'old-vm::ash-left-mod32) +(setf (fdefinition 'vm::lognot-mod32) #'old-vm::lognot-mod32) ;; End arith hacks (let ((function (symbol-function 'kernel:error-number-or-lose))) @@ -187,9 +187,9 @@ (defparameter *load-stuff* nil) -;; hack, hack, hack: Make old-x86::any-reg the same as -;; x86::any-reg as an SC. Do this by adding old-x86::any-reg +;; hack, hack, hack: Make old-vm::any-reg the same as +;; x86::any-reg as an SC. Do this by adding old-vm::any-reg ;; to the hash table with the same value as x86::any-reg. (let ((ht (c::backend-sc-names c::*target-backend*))) - (setf (gethash 'old-x86::any-reg ht) - (gethash 'x86::any-reg ht))) + (setf (gethash 'old-vm::any-reg ht) + (gethash 'vm::any-reg ht))) -- GitLab