X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fmips%2Fvm.lisp;h=ad62ee5562b3368810b000c9e5470f29f8c821b1;hb=b3b94b75dcaf5380326bb64c4ae1795559e27a7d;hp=854fc35e8887f75dcb3755fb493c7031d56be542;hpb=b3403ba11749366786ed574f4cdf51813dff2ff7;p=sbcl.git

diff --git a/src/compiler/mips/vm.lisp b/src/compiler/mips/vm.lisp
index 854fc35..ad62ee5 100644
--- a/src/compiler/mips/vm.lisp
+++ b/src/compiler/mips/vm.lisp
@@ -107,7 +107,7 @@
                                                          "-SC-NUMBER"))))
                 (list* `(define-storage-class ,sc-name ,index
                           ,@(cdr class))
-                       `(defconstant ,constant-name ,index)
+                       `(def!constant ,constant-name ,index)
                        `(export ',constant-name)
                        forms)))
        (index 0 (1+ index))
@@ -306,7 +306,7 @@
          (sc-number-or-lose 'immediate)
          nil))
     ((or (integer #.sb!xc:most-negative-fixnum #.sb!xc:most-positive-fixnum)
-         system-area-pointer character)
+         character)
      (sc-number-or-lose 'immediate))
     (system-area-pointer
      (sc-number-or-lose 'immediate))
@@ -318,20 +318,20 @@
 
 ;;; The SC numbers for register and stack arguments/return values.
 ;;;
-(defconstant register-arg-scn (meta-sc-number-or-lose 'descriptor-reg))
-(defconstant immediate-arg-scn (meta-sc-number-or-lose 'any-reg))
-(defconstant control-stack-arg-scn (meta-sc-number-or-lose 'control-stack))
+(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))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
 
 ;;; Offsets of special stack frame locations
-(defconstant ocfp-save-offset 0)
-(defconstant lra-save-offset 1)
-(defconstant nfp-save-offset 2)
+(def!constant ocfp-save-offset 0)
+(def!constant lra-save-offset 1)
+(def!constant nfp-save-offset 2)
 
 ;;; The number of arguments/return values passed in registers.
 ;;;
-(defconstant register-arg-count 6)
+(def!constant register-arg-count 6)
 
 ;;; The offsets within the register-arg SC that we pass values in, first
 ;;; value first.
@@ -354,7 +354,7 @@
           *register-arg-offsets*))
 
 ;;; This is used by the debugger.
-(defconstant single-value-return-byte-offset 8)
+(def!constant single-value-return-byte-offset 8)
 
 ;;; This function is called by debug output routines that want a pretty name
 ;;; for a TN's location.  It returns a thing that can be printed with PRINC.
@@ -371,4 +371,6 @@
       (constant (format nil "Const~D" offset))
       (immediate-constant "Immed"))))
 
-
+(!def-vm-support-routine combination-implementation-style (node)
+  (declare (type sb!c::combination node) (ignore node))
+  (values :default nil))