[prev in list] [next in list] [prev in thread] [next in thread] 

List:       sbcl-commits
Subject:    [Sbcl-commits] master: Move Alpha + HPPA insts into their own packages.
From:       "Douglas Katzman" <snuglas () users ! sourceforge ! net>
Date:       2015-12-26 15:21:35
Message-ID: E1aCqf4-0001Ue-Nb () sfs-ml-1 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

The branch "master" has been updated in SBCL:
       via  2819528d3cb1b513485100cf0ae0b106c3e4ee7c (commit)
      from  77113f1c9064cbd193fd5cfa841462229d010163 (commit)

- Log -----------------------------------------------------------------
commit 2819528d3cb1b513485100cf0ae0b106c3e4ee7c
Author: Douglas Katzman <dougk@google.com>
Date:   Wed Dec 23 23:13:38 2015 -0500

    Move Alpha + HPPA insts into their own packages.
---
 package-data-list.lisp-expr   |    1 +
 src/compiler/alpha/insts.lisp |   78 ++++++++++++++-----------
 src/compiler/disassem.lisp    |    4 +-
 src/compiler/hppa/insts.lisp  |  131 ++++++++++++++++++++---------------------
 4 files changed, 109 insertions(+), 105 deletions(-)

diff --git a/package-data-list.lisp-expr b/package-data-list.lisp-expr
index 40aa347..f21bd16 100644
--- a/package-data-list.lisp-expr
+++ b/package-data-list.lisp-expr
@@ -3100,6 +3100,7 @@ structure representations"
                "SINGLE-REG-SC-NUMBER" "SINGLE-STACK-SC-NUMBER"
                "SINGLE-STEP-AROUND-TRAP"
                "SINGLE-STEP-BEFORE-TRAP"
+               "SINGLE-STEP-BREAKPOINT-TRAP"
                "INVALID-ARG-COUNT-TRAP"
                "SINGLE-VALUE-RETURN-BYTE-OFFSET" "SLOT-DOCS"
                "SLOT-NAME" "SLOT-OFFSET" "SLOT-OPTIONS"
diff --git a/src/compiler/alpha/insts.lisp b/src/compiler/alpha/insts.lisp
index cad13a0..a6e73d4 100644
--- a/src/compiler/alpha/insts.lisp
+++ b/src/compiler/alpha/insts.lisp
@@ -9,9 +9,18 @@
 ;;;; provided with absolutely no warranty. See the COPYING and CREDITS
 ;;;; files for more information.
 
-(in-package "SB!VM")
+(in-package "SB!ALPHA-ASM")
 
-(setf sb!disassem:*disassem-inst-alignment-bytes* 4)
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  ;; Imports from this package into SB-VM
+  (import '(reg-tn-encoding) 'sb!vm)
+  ;; Imports from SB-VM into this package
+  (import '(sb!vm::zero sb!vm::fp-single-zero sb!vm::fp-double-zero
+            sb!vm::registers sb!vm::float-registers
+            sb!vm::zero-tn sb!vm::fp-single-zero-tn sb!vm::fp-double-zero-tn
+            sb!vm::zero-offset sb!vm::null-offset sb!vm::code-offset)))
+
+(setf *disassem-inst-alignment-bytes* 4)
 
 
 ;;;; utility functions
@@ -45,64 +54,65 @@
        (lambda (name)
          (cond ((null name) nil)
                (t (make-symbol (concatenate 'string "$" name)))))
-       *register-names*))
+       sb!vm::*register-names*))
 
-(sb!disassem:define-arg-type reg
+(define-arg-type reg
   :printer (lambda (value stream dstate)
              (declare (stream stream) (fixnum value))
              (let ((regname (aref reg-symbols value)))
                (princ regname stream)
-               (sb!disassem:maybe-note-associated-storage-ref
+               (maybe-note-associated-storage-ref
                 value
                 'registers
                 regname
                 dstate))))
 
-(sb!disassem:define-arg-type memory-address-annotation
+(define-arg-type memory-address-annotation
   :printer (lambda (value stream dstate)
              (declare (ignore stream))
              (destructuring-bind (reg offset) value
                (cond
                  ((= reg code-offset)
-                  (sb!disassem:note-code-constant offset dstate))
+                  (note-code-constant offset dstate))
                  ((= reg null-offset)
-                  (sb!disassem:maybe-note-nil-indexed-object offset dstate))))))
+                  (maybe-note-nil-indexed-object offset dstate))))))
 
 (defparameter float-reg-symbols
   #.(coerce
      (loop for n from 0 to 31 collect (make-symbol (format nil "~D" n)))
      'vector))
 
-(sb!disassem:define-arg-type fp-reg
+(define-arg-type fp-reg
   :printer (lambda (value stream dstate)
              (declare (stream stream) (fixnum value))
              (let ((regname (aref float-reg-symbols value)))
                (princ regname stream)
-               (sb!disassem:maybe-note-associated-storage-ref
+               (maybe-note-associated-storage-ref
                 value
                 'float-registers
                 regname
                 dstate))))
 
-(sb!disassem:define-arg-type relative-label
+(define-arg-type relative-label
   :sign-extend t
   :use-label (lambda (value dstate)
                (declare (type (signed-byte 21) value)
-                        (type sb!disassem:disassem-state dstate))
-               (+ 4 (ash value 2) (sb!disassem:dstate-cur-addr dstate))))
+                        (type disassem-state dstate))
+               (+ 4 (ash value 2) (dstate-cur-addr dstate))))
 
 ;; We use CALL-PAL BUGCHK as part of our trap logic.  It is invariably
 ;; followed by a trap-code word, which we pick out with the
 ;; semi-traditional prefilter approach.
-(sb!disassem:define-arg-type bugchk-trap-code
+(define-arg-type bugchk-trap-code
     :prefilter (lambda (value dstate)
                  (declare (ignore value))
-                 (sb!disassem:read-suffix 32 dstate)))
+                 (read-suffix 32 dstate)))
 
 ;;;; DEFINE-INSTRUCTION-FORMATs for the disassembler
 
-(sb!disassem:define-instruction-format
-    (memory 32 :default-printer '(:name :tab ra "," disp "(" rb ")" memory-address-annotation))
+(define-instruction-format (memory 32
+                            :default-printer '(:name :tab ra "," disp "(" rb ")"
+                                               memory-address-annotation))
   (op   :field (byte 6 26))
   (ra   :field (byte 5 21) :type 'reg)
   (rb   :field (byte 5 16) :type 'reg)
@@ -110,22 +120,22 @@
   (memory-address-annotation :fields (list (byte 5 16) (byte 16 0))
                              :type 'memory-address-annotation))
 
-(sb!disassem:define-instruction-format
-    (jump 32 :default-printer '(:name :tab ra ",(" rb ")," hint))
+(define-instruction-format (jump 32
+                            :default-printer '(:name :tab ra ",(" rb ")," hint))
   (op    :field (byte 6 26))
   (ra    :field (byte 5 21) :type 'reg)
   (rb    :field (byte 5 16) :type 'reg)
   (subop :field (byte 2 14))
   (hint  :field (byte 14 0)))
 
-(sb!disassem:define-instruction-format
-    (branch 32 :default-printer '(:name :tab ra "," disp))
+(define-instruction-format (branch 32
+                            :default-printer '(:name :tab ra "," disp))
   (op   :field (byte 6 26))
   (ra   :field (byte 5 21) :type 'reg)
   (disp :field (byte 21 0) :type 'relative-label))
 
-(sb!disassem:define-instruction-format
-    (reg-operate 32 :default-printer '(:name :tab ra "," rb "," rc))
+(define-instruction-format (reg-operate 32
+                            :default-printer '(:name :tab ra "," rb "," rc))
   (op  :field (byte 6 26))
   (ra  :field (byte 5 21) :type 'reg)
   (rb  :field (byte 5 16) :type 'reg)
@@ -134,8 +144,8 @@
   (fn  :field (byte 7 5))
   (rc  :field (byte 5 0) :type 'reg))
 
-(sb!disassem:define-instruction-format
-    (lit-operate 32 :default-printer '(:name :tab ra "," lit "," rc))
+(define-instruction-format (lit-operate 32
+                            :default-printer '(:name :tab ra "," lit "," rc))
   (op  :field (byte 6 26))
   (ra  :field (byte 5 21) :type 'reg)
   (lit :field (byte 8 13))
@@ -143,21 +153,21 @@
   (fn  :field (byte 7 5))
   (rc  :field (byte 5 0) :type 'reg))
 
-(sb!disassem:define-instruction-format
-    (fp-operate 32 :default-printer '(:name :tab fa "," fb "," fc))
+(define-instruction-format (fp-operate 32
+                            :default-printer '(:name :tab fa "," fb "," fc))
   (op :field (byte 6 26))
   (fa :field (byte 5 21) :type 'fp-reg)
   (fb :field (byte 5 16) :type 'fp-reg)
   (fn :field (byte 11 5))
   (fc :field (byte 5 0) :type 'fp-reg))
 
-(sb!disassem:define-instruction-format
-    (call-pal 32 :default-printer '('call_pal :tab 'pal_ :name))
+(define-instruction-format (call-pal 32
+                            :default-printer '('call_pal :tab 'pal_ :name))
   (op      :field (byte 6 26) :value 0)
   (palcode :field (byte 26 0)))
 
-(sb!disassem:define-instruction-format
-    (bugchk 32 :default-printer '('call_pal :tab 'pal_bugchk "," code))
+(define-instruction-format (bugchk 32
+                            :default-printer '('call_pal :tab 'pal_bugchk "," code))
   (op      :field (byte 6 26) :value 0)
   (palcode :field (byte 26 0) :value #x81)
   (code :type 'bugchk-trap-code :reader bugchk-trap-code))
@@ -503,7 +513,7 @@
 
 (defun bugchk-trap-control (chunk inst stream dstate)
   (declare (ignore inst))
-  (flet ((nt (x) (if stream (sb!disassem:note x dstate))))
+  (flet ((nt (x) (if stream (note x dstate))))
     (case (bugchk-trap-code chunk dstate)
       (#.halt-trap
        (nt "Halt trap"))
@@ -511,10 +521,10 @@
        (nt "Pending interrupt trap"))
       (#.error-trap
        (nt "Error trap")
-       (sb!disassem:handle-break-args #'snarf-error-junk stream dstate))
+       (handle-break-args #'snarf-error-junk stream dstate))
       (#.cerror-trap
        (nt "Cerror trap")
-       (sb!disassem:handle-break-args #'snarf-error-junk stream dstate))
+       (handle-break-args #'snarf-error-junk stream dstate))
       (#.breakpoint-trap
        (nt "Breakpoint trap"))
       (#.fun-end-breakpoint-trap
diff --git a/src/compiler/disassem.lisp b/src/compiler/disassem.lisp
index e311c81..38cd1a0 100644
--- a/src/compiler/disassem.lisp
+++ b/src/compiler/disassem.lisp
@@ -35,9 +35,7 @@
 ;; if that backend has been converted to use a distinct ASM package.
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defparameter sb!assem::*backend-instruction-set-package*
-    (or #!+(or arm arm64 mips ppc sparc x86 x86-64)
-        (find-package #.(sb-cold::backend-asm-package-name))
-        (find-package "SB!VM")))) ; temporary
+    (find-package #.(sb-cold::backend-asm-package-name))))
 
 (defvar *disassem-inst-space* nil)
 
diff --git a/src/compiler/hppa/insts.lisp b/src/compiler/hppa/insts.lisp
index 1f2ca12..ed84739 100644
--- a/src/compiler/hppa/insts.lisp
+++ b/src/compiler/hppa/insts.lisp
@@ -9,7 +9,18 @@
 ;;;; provided with absolutely no warranty. See the COPYING and CREDITS
 ;;;; files for more information.
 
-(in-package "SB!VM")
+(in-package "SB!HPPA-ASM")
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  ;; Imports from this package into SB-VM
+  (import '(reg-tn-encoding) 'sb!vm)
+  ;; Imports from SB-VM into this package
+  (import '(sb!vm::zero sb!vm::registers sb!vm::float-registers
+            sb!vm::single-reg sb!vm::double-reg
+            sb!vm::complex-single-reg sb!vm::complex-double-reg
+            sb!vm::fp-single-zero sb!vm::fp-double-zero
+            sb!vm::zero-tn
+            sb!vm::null-offset sb!vm::code-offset sb!vm::zero-offset)))
 
 ; normally assem-scheduler-p is t, and nil if debugging the assembler
 (eval-when (:compile-toplevel :load-toplevel :execute)
@@ -126,7 +137,7 @@
 
 ;;;; Initial disassembler setup.
 
-(setf sb!disassem:*disassem-inst-alignment-bytes* 4)
+(setf *disassem-inst-alignment-bytes* 4)
 
 (defvar *disassem-use-lisp-reg-names* t)
 
@@ -160,14 +171,14 @@
        (lambda (name)
          (cond ((null name) nil)
                (t (make-symbol (concatenate 'string "$" name)))))
-       *register-names*))
+       sb!vm::*register-names*))
 
-(sb!disassem:define-arg-type reg
+(define-arg-type reg
   :printer (lambda (value stream dstate)
              (declare (stream stream) (fixnum value))
              (let ((regname (aref reg-symbols value)))
                (princ regname stream)
-               (sb!disassem:maybe-note-associated-storage-ref
+               (maybe-note-associated-storage-ref
                 value
                 'registers
                 regname
@@ -178,18 +189,18 @@
      (loop for n from 0 to 31 collect (make-symbol (format nil "$F~d" n)))
      'vector))
 
-(sb!disassem:define-arg-type fp-reg
+(define-arg-type fp-reg
   :printer (lambda (value stream dstate)
              (declare (stream stream) (fixnum value))
              (let ((regname (aref float-reg-symbols value)))
                (princ regname stream)
-               (sb!disassem:maybe-note-associated-storage-ref
+               (maybe-note-associated-storage-ref
                 value
                 'float-registers
                 regname
                 dstate))))
 
-(sb!disassem:define-arg-type fp-fmt-0c
+(define-arg-type fp-fmt-0c
   :printer (lambda (value stream dstate)
              (declare (ignore dstate) (stream stream) (fixnum value))
              (ecase value
@@ -203,11 +214,6 @@
         (logior (ash -1 (1- n)) normal)
         normal)))
 
-(defun sign-extend (x n)
-  (if (logbitp (1- n) x)
-      (logior (ash -1 (1- n)) x)
-      x))
-
 (defun assemble-bits (x list)
   (let ((result 0)
         (offset 0))
@@ -217,7 +223,7 @@
     result))
 
 (macrolet ((define-imx-decode (name bits)
-  `(sb!disassem:define-arg-type ,name
+  `(define-arg-type ,name
      :printer (lambda (value stream dstate)
      (declare (ignore dstate) (stream stream) (fixnum value))
      (format stream "~S" (low-sign-extend value ,bits))))))
@@ -225,13 +231,13 @@
   (define-imx-decode im11 11)
   (define-imx-decode im14 14))
 
-(sb!disassem:define-arg-type im3
+(define-arg-type im3
   :printer (lambda (value stream dstate)
              (declare (ignore dstate) (stream stream) (fixnum value))
              (format stream "~S" (assemble-bits value `(,(byte 1 0)
                                                           ,(byte 2 1))))))
 
-(sb!disassem:define-arg-type im21
+(define-arg-type im21
   :printer (lambda (value stream dstate)
              (declare (ignore dstate) (stream stream) (fixnum value))
              (format stream "~S"
@@ -239,77 +245,76 @@
                                             ,(byte 2 14) ,(byte 5 16)
                                             ,(byte 2 12))))))
 
-(sb!disassem:define-arg-type cp
+(define-arg-type cp
   :printer (lambda (value stream dstate)
              (declare (ignore dstate) (stream stream) (fixnum value))
              (format stream "~S" (- 31 value))))
 
-(sb!disassem:define-arg-type clen
+(define-arg-type clen
   :printer (lambda (value stream dstate)
              (declare (ignore dstate) (stream stream) (fixnum value))
              (format stream "~S" (- 32 value))))
 
-(sb!disassem:define-arg-type compare-condition
+(define-arg-type compare-condition
   :printer #("" \,= \,< \,<= \,<< \,<<= \,SV \,OD \,TR \,<> \,>=
              \,> \,>>= \,>> \,NSV \,EV))
 
-(sb!disassem:define-arg-type compare-condition-false
+(define-arg-type compare-condition-false
   :printer #(\,TR \,<> \,>= \,> \,>>= \,>> \,NSV \,EV
              "" \,= \,< \,<= \,<< \,<<= \,SV \,OD))
 
-(sb!disassem:define-arg-type add-condition
+(define-arg-type add-condition
   :printer #("" \,= \,< \,<= \,NUV \,ZNV \,SV \,OD \,TR \,<> \,>= \,> \,UV
              \,VNZ \,NSV \,EV))
 
-(sb!disassem:define-arg-type add-condition-false
+(define-arg-type add-condition-false
   :printer #(\,TR \,<> \,>= \,> \,UV \,VNZ \,NSV \,EV
              "" \,= \,< \,<= \,NUV \,ZNV \,SV \,OD))
 
-(sb!disassem:define-arg-type logical-condition
+(define-arg-type logical-condition
   :printer #("" \,= \,< \,<= "" "" "" \,OD \,TR \,<> \,>= \,> "" "" "" \,EV))
 
-(sb!disassem:define-arg-type unit-condition
+(define-arg-type unit-condition
   :printer #("" "" \,SBZ \,SHZ \,SDC \,SBC \,SHC \,TR "" \,NBZ \,NHZ \,NDC
              \,NBC \,NHC))
 
-(sb!disassem:define-arg-type extract/deposit-condition
+(define-arg-type extract/deposit-condition
   :printer #("" \,= \,< \,OD \,TR \,<> \,>= \,EV))
 
-(sb!disassem:define-arg-type extract/deposit-condition-false
+(define-arg-type extract/deposit-condition-false
   :printer #(\,TR \,<> \,>= \,EV "" \,= \,< \,OD))
 
-(sb!disassem:define-arg-type nullify
+(define-arg-type nullify
   :printer #("" \,N))
 
-(sb!disassem:define-arg-type fcmp-cond
+(define-arg-type fcmp-cond
   :printer #(\FALSE? \FALSE \? \!<=> \= \=T \?= \!<> \!?>= \< \?<
                      \!>= \!?> \<= \?<= \!> \!?<= \> \?>\ \!<= \!?< \>=
                      \?>= \!< \!?= \<> \!= \!=T \!? \<=> \TRUE? \TRUE))
 
-(sb!disassem:define-arg-type integer
+(define-arg-type integer
   :printer (lambda (value stream dstate)
              (declare (ignore dstate) (stream stream) (fixnum value))
              (format stream "~S" value)))
 
-(sb!disassem:define-arg-type space
+(define-arg-type space
   :printer #("" |1,| |2,| |3,|))
 
-(sb!disassem:define-arg-type memory-address-annotation
+(define-arg-type memory-address-annotation
   :printer (lambda (value stream dstate)
              (declare (ignore stream))
              (destructuring-bind (reg raw-offset) value
                (let ((offset (low-sign-extend raw-offset 14)))
                  (cond
                    ((= reg code-offset)
-                    (sb!disassem:note-code-constant offset dstate))
+                    (note-code-constant offset dstate))
                    ((= reg null-offset)
-                    (sb!disassem:maybe-note-nil-indexed-object offset dstate)))))))
+                    (maybe-note-nil-indexed-object offset dstate)))))))
 
 
 ;;;; Define-instruction-formats for disassembler.
 
-(sb!disassem:define-instruction-format
-    (load/store 32)
+(define-instruction-format (load/store 32)
   (op   :field (byte 6 26))
   (b    :field (byte 5 21) :type 'reg)
   (t/r  :field (byte 5 16) :type 'reg)
@@ -332,8 +337,7 @@
                                   (:cond ((m :constant 1) '\,M)))
   #'equalp)
 
-(sb!disassem:define-instruction-format
-    (extended-load/store 32)
+(define-instruction-format (extended-load/store 32)
   (op1     :field (byte 6 26) :value 3)
   (b       :field (byte 5 21) :type 'reg)
   (x/im5/r :field (byte 5 16) :type 'reg)
@@ -344,48 +348,44 @@
   (m       :field (byte 1 5))
   (t/im5   :field (byte 5 0) :type 'reg))
 
-(sb!disassem:define-instruction-format
-    (ldil 32 :default-printer '(:name :tab im21 "," t))
+(define-instruction-format (ldil 32 :default-printer '(:name :tab im21 "," t))
   (op    :field (byte 6 26))
   (t   :field (byte 5 21) :type 'reg)
   (im21 :field (byte 21 0) :type 'im21))
 
-(sb!disassem:define-instruction-format
-    (branch17 32)
+(define-instruction-format (branch17 32)
   (op1 :field (byte 6 26))
   (t   :field (byte 5 21) :type 'reg)
   (w   :fields `(,(byte 5 16) ,(byte 11 2) ,(byte 1 0))
        :use-label
        (lambda (value dstate)
-         (declare (type sb!disassem:disassem-state dstate) (list value))
+         (declare (type disassem-state dstate) (list value))
          (let ((x (logior (ash (first value) 12) (ash (second value) 1)
                           (third value))))
            (+ (ash (sign-extend
                     (assemble-bits x `(,(byte 1 0) ,(byte 5 12) ,(byte 1 1)
                                        ,(byte 10 2))) 17) 2)
-              (sb!disassem:dstate-cur-addr dstate) 8))))
+              (dstate-cur-addr dstate) 8))))
   (op2 :field (byte 3 13))
   (n   :field (byte 1 1) :type 'nullify))
 
-(sb!disassem:define-instruction-format
-    (branch12 32)
+(define-instruction-format (branch12 32)
   (op1 :field (byte 6 26))
   (r2  :field (byte 5 21) :type 'reg)
   (r1  :field (byte 5 16) :type 'reg)
   (w   :fields `(,(byte 11 2) ,(byte 1 0))
        :use-label
        (lambda (value dstate)
-         (declare (type sb!disassem:disassem-state dstate) (list value))
+         (declare (type disassem-state dstate) (list value))
          (let ((x (logior (ash (first value) 1) (second value))))
            (+ (ash (sign-extend
                     (assemble-bits x `(,(byte 1 0) ,(byte 1 1) ,(byte 10 2)))
                     12) 2)
-              (sb!disassem:dstate-cur-addr dstate) 8))))
+              (dstate-cur-addr dstate) 8))))
   (c   :field (byte 3 13))
   (n   :field (byte 1 1) :type 'nullify))
 
-(sb!disassem:define-instruction-format
-    (branch 32)
+(define-instruction-format (branch 32)
   (op1 :field (byte 6 26))
   (t   :field (byte 5 21) :type 'reg)
   (x   :field (byte 5 16) :type 'reg)
@@ -394,8 +394,8 @@
   (n   :field (byte 1 1) :type 'nullify)
   (x2  :field (byte 1 0)))
 
-(sb!disassem:define-instruction-format
-     (r3-inst 32 :default-printer '(:name c :tab r1 "," r2 "," t))
+(define-instruction-format (r3-inst 32
+                            :default-printer '(:name c :tab r1 "," r2 "," t))
   (r3 :field (byte 6 26) :value 2)
   (r2 :field (byte 5 21) :type 'reg)
   (r1 :field (byte 5 16) :type 'reg)
@@ -404,8 +404,8 @@
   (op :field (byte 7 5))
   (t  :field (byte 5 0) :type 'reg))
 
-(sb!disassem:define-instruction-format
-    (imm-inst 32 :default-printer '(:name c :tab im11 "," r "," t))
+(define-instruction-format (imm-inst 32
+                            :default-printer '(:name c :tab im11 "," r "," t))
   (op   :field (byte 6 26))
   (r    :field (byte 5 21) :type 'reg)
   (t    :field (byte 5 16) :type 'reg)
@@ -414,8 +414,7 @@
   (o    :field (byte 1 11))
   (im11 :field (byte 11 0) :type 'im11))
 
-(sb!disassem:define-instruction-format
-    (extract/deposit-inst 32)
+(define-instruction-format (extract/deposit-inst 32)
   (op1    :field (byte 6 26))
   (r2     :field (byte 5 21) :type 'reg)
   (r1     :field (byte 5 16) :type 'reg)
@@ -424,8 +423,8 @@
   (cp     :field (byte 5 5) :type 'cp)
   (t/clen :field (byte 5 0) :type 'clen))
 
-(sb!disassem:define-instruction-format
-    (break 32 :default-printer '(:name :tab im13 "," im5))
+(define-instruction-format (break 32
+                            :default-printer '(:name :tab im13 "," im5))
   (op1  :field (byte 6 26) :value 0)
   (im13 :field (byte 13 13))
   (q2   :field (byte 8 5) :value 0)
@@ -460,14 +459,14 @@
 
 (defun break-control (chunk inst stream dstate)
   (declare (ignore inst))
-  (flet ((nt (x) (if stream (sb!disassem:note x dstate))))
+  (flet ((nt (x) (if stream (note x dstate))))
     (case (break-im5 chunk dstate)
       (#.error-trap
        (nt "Error trap")
-       (sb!disassem:handle-break-args #'snarf-error-junk stream dstate))
+       (handle-break-args #'snarf-error-junk stream dstate))
       (#.cerror-trap
        (nt "Cerror trap")
-       (sb!disassem:handle-break-args #'snarf-error-junk stream dstate))
+       (handle-break-args #'snarf-error-junk stream dstate))
       (#.breakpoint-trap
        (nt "Breakpoint trap"))
       (#.pending-interrupt-trap
@@ -479,8 +478,7 @@
       (#.single-step-around-trap
        (nt "Single step around trap")))))
 
-(sb!disassem:define-instruction-format
-    (system-inst 32)
+(define-instruction-format (system-inst 32)
   (op1 :field (byte 6 26) :value 0)
   (r1  :field (byte 5 21) :type 'reg)
   (r2  :field (byte 5 16) :type 'reg)
@@ -488,8 +486,7 @@
   (op2 :field (byte 8 5))
   (r3  :field (byte 5 0) :type 'reg))
 
-(sb!disassem:define-instruction-format
-    (fp-load/store 32)
+(define-instruction-format (fp-load/store 32)
   (op :field (byte 6 26))
   (b  :field (byte 5 21) :type 'reg)
   (x  :field (byte 5 16) :type 'reg)
@@ -502,8 +499,7 @@
   (m  :field (byte 1 5))
   (t  :field (byte 5 0) :type 'fp-reg))
 
-(sb!disassem:define-instruction-format
-    (fp-class-0-inst 32)
+(define-instruction-format (fp-class-0-inst 32)
   (op1 :field (byte 6 26))
   (r   :field (byte 5 21) :type 'fp-reg)
   (x1  :field (byte 5 16) :type 'fp-reg)
@@ -514,8 +510,7 @@
   (x4  :field (byte 1 5))
   (t   :field (byte 5 0) :type 'fp-reg))
 
-(sb!disassem:define-instruction-format
-    (fp-class-1-inst 32)
+(define-instruction-format (fp-class-1-inst 32)
   (op1 :field (byte 6 26))
   (r   :field (byte 5 21) :type 'fp-reg)
   (x1  :field (byte 4 17) :value 0)

-----------------------------------------------------------------------


hooks/post-receive
-- 
SBCL

------------------------------------------------------------------------------
_______________________________________________
Sbcl-commits mailing list
Sbcl-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sbcl-commits
[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic