X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fmips%2Fvm.lisp;h=78448a3a54d5a8d4aad46ee538d024767f3d1460;hb=8a8568603cc7cacd188fe1cac18824a69bece6af;hp=f8439577a634d559cce2458e532e875f2bc6ffbd;hpb=dcbf533e60542e16d3180121d80b9bf51ecb4684;p=sbcl.git diff --git a/src/compiler/mips/vm.lisp b/src/compiler/mips/vm.lisp index f843957..78448a3 100644 --- a/src/compiler/mips/vm.lisp +++ b/src/compiler/mips/vm.lisp @@ -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 @@ -286,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)) @@ -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))))))