[Sbcl-commits] master: Remove META-SC-NUMBER-OR-LOSE

[Douglas K. <sn...@us...>]

The branch "master" has been updated in SBCL:
       via  641918f0a85dbd80b000e5bd77ac71a866f3e9d7 (commit)
      from  c9c024fb58c8a26c214dbcc6d579a5567715ee1c (commit)

- Log -----------------------------------------------------------------
commit 641918f0a85dbd80b000e5bd77ac71a866f3e9d7
Author: Douglas Katzman <do...@go...>
Date:   Thu May 29 13:24:47 2014 -0400

    Remove META-SC-NUMBER-OR-LOSE
---
 package-data-list.lisp-expr |    1 -
 src/compiler/alpha/vm.lisp  |    6 +++---
 src/compiler/arm/vm.lisp    |    6 +++---
 src/compiler/hppa/vm.lisp   |    6 +++---
 src/compiler/mips/vm.lisp   |    6 +++---
 src/compiler/ppc/vm.lisp    |    6 +++---
 src/compiler/sparc/vm.lisp  |    6 +++---
 src/compiler/vmdef.lisp     |    6 ------
 8 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/package-data-list.lisp-expr b/package-data-list.lisp-expr
index 6f0c7f8..c98bf2a 100644
--- a/package-data-list.lisp-expr
+++ b/package-data-list.lisp-expr
@@ -302,7 +302,6 @@ of SBCL which maintained the CMU-CL-style split into two packages.)"
                "MAKE-STACK-POINTER-TN" "MAKE-TN-REF" "MAKE-UNWIND-BLOCK"
                "MAKE-WIRED-TN" "MAYBE-COMPILER-NOTIFY"
                "MAYBE-INLINE-SYNTACTIC-CLOSURE"
-               "META-SC-NUMBER-OR-LOSE"
                "MORE-ARG-CONTEXT" "MOVABLE" "MOVE" "MULTIPLE-CALL"
                "MULTIPLE-CALL-LOCAL" "MULTIPLE-CALL-NAMED"
                "MULTIPLE-CALL-VARIABLE"
diff --git a/src/compiler/alpha/vm.lisp b/src/compiler/alpha/vm.lisp
index 3a2de07..97f3a6a 100644
--- a/src/compiler/alpha/vm.lisp
+++ b/src/compiler/alpha/vm.lisp
@@ -311,9 +311,9 @@
 ;;;; function call parameters
 
 ;;; the SC numbers for register and stack arguments/return values
-(def!constant register-arg-scn (meta-sc-number-or-lose 'descriptor-reg))
-(def!constant immediate-arg-scn (meta-sc-number-or-lose 'any-reg))
-(def!constant control-stack-arg-scn (meta-sc-number-or-lose 'control-stack))
+(def!constant register-arg-scn (sc-number-or-lose 'descriptor-reg))
+(def!constant immediate-arg-scn (sc-number-or-lose 'any-reg))
+(def!constant control-stack-arg-scn (sc-number-or-lose 'control-stack))
 
 (eval-when  (:compile-toplevel :load-toplevel :execute)
 
diff --git a/src/compiler/arm/vm.lisp b/src/compiler/arm/vm.lisp
index 5f12dcd..523633a 100644
--- a/src/compiler/arm/vm.lisp
+++ b/src/compiler/arm/vm.lisp
@@ -259,9 +259,9 @@
 ;;;; function call parameters
 
 ;;; the SC numbers for register and stack arguments/return values
-(def!constant register-arg-scn (meta-sc-number-or-lose 'descriptor-reg))
-(def!constant immediate-arg-scn (meta-sc-number-or-lose 'any-reg))
-(def!constant control-stack-arg-scn (meta-sc-number-or-lose 'control-stack))
+(def!constant register-arg-scn (sc-number-or-lose 'descriptor-reg))
+(def!constant immediate-arg-scn (sc-number-or-lose 'any-reg))
+(def!constant control-stack-arg-scn (sc-number-or-lose 'control-stack))
 
 ;;; offsets of special stack frame locations
 (def!constant ocfp-save-offset 0)
diff --git a/src/compiler/hppa/vm.lisp b/src/compiler/hppa/vm.lisp
index cf06b35..341c642 100644
--- a/src/compiler/hppa/vm.lisp
+++ b/src/compiler/hppa/vm.lisp
@@ -336,9 +336,9 @@
 
 ;;; The SC numbers for register and stack arguments/return values.
 ;;;
-(def!constant register-arg-scn (meta-sc-number-or-lose 'descriptor-reg))
-(def!constant immediate-arg-scn (meta-sc-number-or-lose 'any-reg))
-(def!constant control-stack-arg-scn (meta-sc-number-or-lose 'control-stack))
+(def!constant register-arg-scn (sc-number-or-lose 'descriptor-reg))
+(def!constant immediate-arg-scn (sc-number-or-lose 'any-reg))
+(def!constant control-stack-arg-scn (sc-number-or-lose 'control-stack))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
 
diff --git a/src/compiler/mips/vm.lisp b/src/compiler/mips/vm.lisp
index 9f77ec4..15adf76 100644
--- a/src/compiler/mips/vm.lisp
+++ b/src/compiler/mips/vm.lisp
@@ -320,9 +320,9 @@
 
 ;;; The SC numbers for register and stack arguments/return values.
 ;;;
-(def!constant register-arg-scn (meta-sc-number-or-lose 'descriptor-reg))
-(def!constant immediate-arg-scn (meta-sc-number-or-lose 'any-reg))
-(def!constant control-stack-arg-scn (meta-sc-number-or-lose 'control-stack))
+(def!constant register-arg-scn (sc-number-or-lose 'descriptor-reg))
+(def!constant immediate-arg-scn (sc-number-or-lose 'any-reg))
+(def!constant control-stack-arg-scn (sc-number-or-lose 'control-stack))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
 
diff --git a/src/compiler/ppc/vm.lisp b/src/compiler/ppc/vm.lisp
index 96ddb83..acd2380 100644
--- a/src/compiler/ppc/vm.lisp
+++ b/src/compiler/ppc/vm.lisp
@@ -300,9 +300,9 @@
 ;;;; function call parameters
 
 ;;; the SC numbers for register and stack arguments/return values
-(def!constant register-arg-scn (meta-sc-number-or-lose 'descriptor-reg))
-(def!constant immediate-arg-scn (meta-sc-number-or-lose 'any-reg))
-(def!constant control-stack-arg-scn (meta-sc-number-or-lose 'control-stack))
+(def!constant register-arg-scn (sc-number-or-lose 'descriptor-reg))
+(def!constant immediate-arg-scn (sc-number-or-lose 'any-reg))
+(def!constant control-stack-arg-scn (sc-number-or-lose 'control-stack))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
 
diff --git a/src/compiler/sparc/vm.lisp b/src/compiler/sparc/vm.lisp
index babb5cc..fbdd6f7 100644
--- a/src/compiler/sparc/vm.lisp
+++ b/src/compiler/sparc/vm.lisp
@@ -326,9 +326,9 @@
 ;;;; function call parameters
 
 ;;; the SC numbers for register and stack arguments/return values.
-(def!constant register-arg-scn (meta-sc-number-or-lose 'descriptor-reg))
-(def!constant immediate-arg-scn (meta-sc-number-or-lose 'any-reg))
-(def!constant control-stack-arg-scn (meta-sc-number-or-lose 'control-stack))
+(def!constant register-arg-scn (sc-number-or-lose 'descriptor-reg))
+(def!constant immediate-arg-scn (sc-number-or-lose 'any-reg))
+(def!constant control-stack-arg-scn (sc-number-or-lose 'control-stack))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
 
diff --git a/src/compiler/vmdef.lisp b/src/compiler/vmdef.lisp
index 07fefe1..57949cb 100644
--- a/src/compiler/vmdef.lisp
+++ b/src/compiler/vmdef.lisp
@@ -33,12 +33,6 @@
 
 (defun sc-number-or-lose (x)
   (the sc-number (sc-number (sc-or-lose x))))
-
-;;; This is like the non-meta versions, except we go for the
-;;; meta-compile-time info. These should not be used after load time,
-;;; since compiling the compiler changes the definitions.
-(defun meta-sc-number-or-lose (x) ; FIXME: remove
-  (the sc-number (sc-number (sc-or-lose x))))
 
 ;;;; side effect classes
 

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


hooks/post-receive
-- 
SBCL