X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fmips%2Fvm.lisp;h=78448a3a54d5a8d4aad46ee538d024767f3d1460;hb=8a8568603cc7cacd188fe1cac18824a69bece6af;hp=340066e2393bfbb9848189f776c9811a1684dc66;hpb=581e3d62de8cb37e13ad9db63e5537c0f962be28;p=sbcl.git

diff --git a/src/compiler/mips/vm.lisp b/src/compiler/mips/vm.lisp
index 340066e..78448a3 100644
--- a/src/compiler/mips/vm.lisp
+++ b/src/compiler/mips/vm.lisp
@@ -1,3 +1,14 @@
+;;;; miscellaneous VM definition noise for MIPS
+
+;;;; This software is part of the SBCL system. See the README file for
+;;;; more information.
+;;;;
+;;;; This software is derived from the CMU CL system, which was
+;;;; written at Carnegie Mellon University and released into the
+;;;; public domain. The software is in the public domain and is
+;;;; provided with absolutely no warranty. See the COPYING and CREDITS
+;;;; files for more information.
+
 (in-package "SB!VM")
 
 
@@ -9,7 +20,7 @@
 (macrolet ((defreg (name offset)
 	       (let ((offset-sym (symbolicate name "-OFFSET")))
 		 `(eval-when (:compile-toplevel :load-toplevel :execute)
-		   (defconstant ,offset-sym ,offset)
+		   (def!constant ,offset-sym ,offset)
 		   (setf (svref *register-names* ,offset-sym) ,(symbol-name name)))))
 
 	   (defregset (name &rest regs)
@@ -93,7 +104,7 @@
       ((null classes)
        (nreverse forms))))
 
-(def!constant sb!vm::kludge-nondeterministic-catch-block-size 7)
+(def!constant kludge-nondeterministic-catch-block-size 7)
 
 (!define-storage-classes
 
@@ -113,7 +124,7 @@
   ;; The non-descriptor stacks.
   (signed-stack non-descriptor-stack) ; (signed-byte 32)
   (unsigned-stack non-descriptor-stack) ; (unsigned-byte 32)
-  (base-char-stack non-descriptor-stack) ; non-descriptor characters.
+  (character-stack non-descriptor-stack) ; non-descriptor characters.
   (sap-stack non-descriptor-stack) ; System area pointers.
   (single-stack non-descriptor-stack) ; single-floats
   (double-stack non-descriptor-stack :element-size 2) ; double floats.
@@ -145,12 +156,12 @@
    :alternate-scs (control-stack))
 
   ;; Non-Descriptor characters
-  (base-char-reg registers
+  (character-reg registers
    :locations #.non-descriptor-regs
    :reserve-locations #.reserve-non-descriptor-regs
    :constant-scs (immediate)
    :save-p t
-   :alternate-scs (base-char-stack))
+   :alternate-scs (character-stack))
 
   ;; Non-Descriptor SAP's (arbitrary pointers into address space)
   (sap-reg registers
@@ -220,7 +231,7 @@
    :alternate-scs (complex-double-stack))
 
   ;; A catch or unwind block.
-  (catch-block control-stack :element-size sb!vm::kludge-nondeterministic-catch-block-size)
+  (catch-block control-stack :element-size kludge-nondeterministic-catch-block-size)
 
   ;; floating point numbers temporarily stuck in integer registers for c-call
   (single-int-carg-reg registers
@@ -275,7 +286,7 @@
      (if (static-symbol-p value)
 	 (sc-number-or-lose 'immediate)
 	 nil))
-    ((signed-byte 30)
+    ((integer #.sb!xc:most-negative-fixnum sb!xc:most-positive-fixnum)
      (sc-number-or-lose 'immediate))
     (system-area-pointer
      (sc-number-or-lose 'immediate))
@@ -341,5 +352,10 @@
       (immediate-constant "Immed"))))
 
 (defun extern-alien-name (name)
-  (declare (type simple-base-string name))
-  name)
+  (declare (type string name))
+  ;; ELF ports currently don't need any prefix
+  (typecase name
+    (simple-base-string name)
+    (base-string (coerce name 'simple-base-string))
+    (t (handler-case (coerce name 'simple-base-string)
+	 (type-error () (error "invalid external alien name: ~S" name))))))