X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Fmips%2Fvm.lisp;h=6d37198842cfad32df2e49b6175d4b71aadfd46b;hb=cb296ae5a022a5b0f1fd573584301b0d2a9493f9;hp=f06177075793e2391e3eb84f740c07d73d31b4fc;hpb=4ed3f0d08c3a57a6762018d9622f253ab9d0f2b6;p=sbcl.git

diff --git a/src/compiler/mips/vm.lisp b/src/compiler/mips/vm.lisp
index f061770..6d37198 100644
--- a/src/compiler/mips/vm.lisp
+++ b/src/compiler/mips/vm.lisp
@@ -20,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)
@@ -124,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.
@@ -156,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
@@ -352,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))))))