X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fsparc%2Finsts.lisp;h=2138a177383fca2e39451a876b3087df0dc4fcb4;hb=22c1de0a40df83bb5628974010a879cb2c17ff53;hp=bd3589cf368568ee75013c31b590193ab90d9a8d;hpb=9728093863d1ed201719d1f7ef61b9df29bb1d44;p=sbcl.git

diff --git a/src/compiler/sparc/insts.lisp b/src/compiler/sparc/insts.lisp
index bd3589c..2138a17 100644
--- a/src/compiler/sparc/insts.lisp
+++ b/src/compiler/sparc/insts.lisp
@@ -15,6 +15,9 @@
 ;;;(def-assembler-params
 ;;;    :scheduler-p t
 ;;;  :max-locations 100)
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (setf sb!assem:*assem-scheduler-p* t)
+  (setf sb!assem:*assem-max-locations* 100))
 
 ;;; Constants, types, conversion functions, some disassembler stuff.
 (defun reg-tn-encoding (tn)
@@ -117,74 +120,6 @@ about function addresses and register values.")
       (- val (ash 1 13))
       val))
 
-;;; Oh, come on, this is ridiculous. I'm not going to solve
-;;; bootstrapping issues for a disassembly note. Does this make me
-;;; lazy? Christophe, 2001-09-02. FIXME
-#+nil
-(macrolet
-    ((frob (&rest names)
-       (let ((results (mapcar (lambda (n)
-				  (let ((nn (intern (concatenate 'string (string n)
-								 "-TYPE"))))
-				    `(,(eval nn) ,nn)))
-			      names)))
-	 `(eval-when (:compile-toplevel :load-toplevel :execute)
-	   (def!constant header-word-type-alist
-	     ',results)))))
-  ;; This is the same list as in objdefs.
-  (frob bignum
-	ratio
-	single-float
-	double-float
-	#!+long-float long-float
-	complex
-	complex-single-float
-	complex-double-float
-	#!+long-float complex-long-float
-  
-	simple-array
-	simple-string
-	simple-bit-vector
-	simple-vector
-	simple-array-unsigned-byte-2
-	simple-array-unsigned-byte-4
-	simple-array-unsigned-byte-8
-	simple-array-unsigned-byte-16
-	simple-array-unsigned-byte-32
-	simple-array-signed-byte-8
-	simple-array-signed-byte-16
-	simple-array-signed-byte-30
-	simple-array-signed-byte-32
-	simple-array-single-float
-	simple-array-double-float
-	#!+long-float simple-array-long-float
-	simple-array-complex-single-float
-	simple-array-complex-double-float
-	#!+long-float simple-array-complex-long-float
-	complex-string
-	complex-bit-vector
-	complex-vector
-	complex-array
-  
-	code-header
-	function-header
-	closure-header
-	funcallable-instance-header
-	byte-code-function
-	byte-code-closure
-	closure-function-header
-	#!-gengc return-pc-header
-	#!+gengc forwarding-pointer
-	value-cell-header
-	symbol-header
-	base-char
-	sap
-	unbound-marker
-	weak-pointer
-	instance-header
-	fdefn
-	#!+(or gengc gencgc) scavenger-hook))
-
 ;; Look at the current instruction and see if we can't add some notes
 ;; about what's happening.
 
@@ -325,9 +260,9 @@ about function addresses and register values.")
 		 (maybe-add-notes value dstate))))
 
 (defparameter float-reg-symbols
-  (coerce 
-   (loop for n from 0 to 63 collect (make-symbol (format nil "%F~d" n)))
-   'vector))
+  #.(coerce 
+     (loop for n from 0 to 63 collect (make-symbol (format nil "%F~d" n)))
+     'vector))
 
 (sb!disassem:define-arg-type fp-reg
   :printer (lambda (value stream dstate)
@@ -946,7 +881,7 @@ about function addresses and register values.")
   (with-ref-format `(:NAME :TAB rd ", " ,ref-format))
   #'equalp)
 
-) ; eval-when (compile eval)
+) ; EVAL-WHEN
 
 (macrolet ((define-f3-inst (name op op3 &key fixup load-store (dest-kind 'reg)
 				 (printer :default) reads writes flushable print-name)
@@ -1210,12 +1145,12 @@ about function addresses and register values.")
 ;; registers.
 (define-instruction rdy (segment dst)
   (:declare (type tn dst))
-  (:printer format-3-immed ((op #b10) (op3 #b101000) (rs1 0) (immed 0))
+  (:printer format-3-reg ((op #b10) (op3 #b101000) (rs1 0) (immed 0))
             '('RD :tab '%Y ", " rd))
   (:dependencies (reads :y) (writes dst))
   (:delay 0)
-  (:emitter (emit-format-3-immed segment #b10 (reg-tn-encoding dst) #b101000
-				 0 0 0)))
+  (:emitter (emit-format-3-reg segment #b10 (reg-tn-encoding dst) #b101000
+			       0 0 0 0)))
 
 (defconstant-eqx wry-printer
   '('WR :tab rs1 (:unless (:constant 0) ", " (:choose immed rs2)) ", " '%Y)