X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fppc%2Fvm.lisp;h=720f8b31af2578ebfd935476d975e0fd94af0434;hb=9304704f68a18894fa8eb985b387465e5d25e1d5;hp=e20d14136cd0b844a8f5f66164be3aa9b0f2e3c2;hpb=8974d768a634343d958de35e9ce90cec235590a3;p=sbcl.git

diff --git a/src/compiler/ppc/vm.lisp b/src/compiler/ppc/vm.lisp
index e20d141..720f8b3 100644
--- a/src/compiler/ppc/vm.lisp
+++ b/src/compiler/ppc/vm.lisp
@@ -74,14 +74,14 @@
   (defreg a3 27)
   (defreg l0 28)
   (defreg l1 29)
-  (defreg l2 30)
+  (defreg #!-sb-thread l2 #!+sb-thread thread 30)
   (defreg lip 31)
 
   (defregset non-descriptor-regs
       nl0 nl1 nl2 nl3 nl4 nl5 nl6 #+nil nl7 cfunc nargs nfp)
 
   (defregset descriptor-regs
-      fdefn a0 a1 a2 a3  ocfp lra cname lexenv l0 l1 l2 )
+      fdefn a0 a1 a2 a3  ocfp lra cname lexenv l0 l1 #!-sb-thread l2 )
 
 
  (defregset *register-arg-offsets*  a0 a1 a2 a3)
@@ -262,6 +262,7 @@
   (defregtn code descriptor-reg)
   (defregtn alloc any-reg)
   (defregtn lra descriptor-reg)
+  (defregtn lexenv descriptor-reg)
 
   (defregtn nargs any-reg)
   (defregtn bsp any-reg)
@@ -272,7 +273,7 @@
 
 ;;; 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)
+(defun immediate-constant-sc (value)
   (typecase value
     ((integer 0 0)
      (sc-number-or-lose 'zero))
@@ -286,6 +287,11 @@
          (sc-number-or-lose 'immediate)
          nil))))
 
+(defun boxed-immediate-sc-p (sc)
+  (or (eql sc (sc-number-or-lose 'zero))
+      (eql sc (sc-number-or-lose 'null))
+      (eql sc (sc-number-or-lose 'immediate))))
+
 ;;; A predicate to see if a character can be used as an inline
 ;;; constant (the immediate field in the instruction used is sixteen
 ;;; bits wide, which is not the same as any defined subtype of
@@ -326,6 +332,11 @@
                               :offset n))
           *register-arg-offsets*))
 
+#!+sb-thread
+(defparameter thread-base-tn
+  (make-random-tn :kind :normal :sc (sc-or-lose 'unsigned-reg)
+                  :offset thread-offset))
+
 (export 'single-value-return-byte-offset)
 
 ;;; This is used by the debugger.
@@ -333,7 +344,7 @@
 
 ;;; 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.
-(!def-vm-support-routine location-print-name (tn)
+(defun location-print-name (tn)
   (declare (type tn tn))
   (let ((sb (sb-name (sc-sb (tn-sc tn))))
         (offset (tn-offset tn)))
@@ -346,7 +357,7 @@
       (constant (format nil "Const~D" offset))
       (immediate-constant "Immed"))))
 
-(!def-vm-support-routine combination-implementation-style (node)
+(defun combination-implementation-style (node)
   (declare (type sb!c::combination node))
   (flet ((valid-funtype (args result)
            (sb!c::valid-fun-use node
@@ -358,7 +369,7 @@
          ((or (valid-funtype '(fixnum fixnum) '*)
               (valid-funtype '((signed-byte 32) (signed-byte 32)) '*)
               (valid-funtype '((unsigned-byte 32) (unsigned-byte 32)) '*))
-          (values :direct nil))
+          (values :maybe nil))
          (t (values :default nil))))
       (logbitp
        (cond
@@ -370,21 +381,25 @@
          (t (values :default nil))))
       ;; FIXME: can handle MIN and MAX here
       (sb!kernel:%ldb
-       (cond
-         ((or (valid-funtype '((constant-arg (integer 1 29))
-                               (constant-arg (integer 0 29))
-                               fixnum)
-                             'fixnum)
-              (valid-funtype '((constant-arg (integer 1 29))
-                               (constant-arg (integer 0 29))
-                               (signed-byte 32))
-                             'fixnum)
-              (valid-funtype '((constant-arg (integer 1 29))
-                               (constant-arg (integer 0 29))
-                               (unsigned-byte 32))
-                             'fixnum))
-          (values :transform
-                  '(lambda (size posn integer)
-                    (%%ldb integer size posn))))
-         (t (values :default nil))))
+       (flet ((validp (type width)
+                (and (valid-funtype `((constant-arg (integer 1 29))
+                                      (constant-arg (mod ,width))
+                                      ,type)
+                                    'fixnum)
+                     (destructuring-bind (size posn integer)
+                         (sb!c::basic-combination-args node)
+                       (declare (ignore integer))
+                       (<= (+ (sb!c::lvar-value size)
+                              (sb!c::lvar-value posn))
+                           width)))))
+         (if (or (validp 'fixnum 29)
+                 (validp '(signed-byte 32) 32)
+                 (validp '(unsigned-byte 32) 32))
+             (values :transform '(lambda (size posn integer)
+                                  (%%ldb integer size posn)))
+             (values :default nil))))
       (t (values :default nil)))))
+
+(defun primitive-type-indirect-cell-type (ptype)
+  (declare (ignore ptype))
+  nil)