X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fvm.lisp;h=97d10f78804e9415b9f74f59bbb011d0516c3bfb;hb=22c1de0a40df83bb5628974010a879cb2c17ff53;hp=bb7a6221dede3aca253995227e0b75eb3422f768;hpb=22b819c0cd0ca0ea5be52ba280b9e9e0b8e86210;p=sbcl.git diff --git a/src/compiler/x86/vm.lisp b/src/compiler/x86/vm.lisp index bb7a622..97d10f7 100644 --- a/src/compiler/x86/vm.lisp +++ b/src/compiler/x86/vm.lisp @@ -375,20 +375,9 @@ ;;; If value can be represented as an immediate constant, then return ;;; the appropriate SC number, otherwise return NIL. (!def-vm-support-routine immediate-constant-sc (value) - ;; KLUDGE: although this might not look different from the FIXNUM - ;; below, in the TYPECASE, SB-INT:FIXNUMP actually tests against the - ;; target FIXNUM type, as opposed to TYPECASE FIXNUM which tests - ;; against the host FIXNUM range. - #+sb-xc-host - (when (fixnump value) - ;; FIXME: this block name was not obvious. Also, since this idiom - ;; is presumably going to be repeated in all six (current) - ;; backends, it would be nice to wrap it up somewhat more nicely. - ;; -- CSR, 2003-04-20 - (return-from impl-of-vm-support-routine-immediate-constant-sc - (sc-number-or-lose 'immediate))) (typecase value - ((or fixnum #-sb-xc-host system-area-pointer character) + ((or (integer #.sb!xc:most-negative-fixnum #.sb!xc:most-positive-fixnum) + #-sb-xc-host system-area-pointer character) (sc-number-or-lose 'immediate)) (symbol (when (static-symbol-p value) @@ -461,7 +450,7 @@ ;;; The loader uses this to convert alien names to the form they need in ;;; the symbol table (for example, prepending an underscore). (defun extern-alien-name (name) - (declare (type simple-string name)) + (declare (type simple-base-string name)) ;; OpenBSD is non-ELF, and needs a _ prefix #!+openbsd (concatenate 'string "_" name) ;; The other (ELF) ports currently don't need any prefix