X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Ftarget-disassem.lisp;h=3879374f0d919783bc9605f173d54566e103ca52;hb=35fecfc13c93b85d30a23375ca2850cbbf4a923e;hp=0a6fa384789d7c98ed9a5045c189995db236db8c;hpb=f6a2be77637d025bfded9430f02863c28f74f77a;p=sbcl.git

diff --git a/src/compiler/target-disassem.lisp b/src/compiler/target-disassem.lisp
index 0a6fa38..3879374 100644
--- a/src/compiler/target-disassem.lisp
+++ b/src/compiler/target-disassem.lisp
@@ -44,8 +44,9 @@
   (sort insts #'> :key #'specializer-rank))
 
 (defun specialization-error (insts)
-  (error "~@<internal disassembler error: ~2I~_Instructions either aren't related or conflict in some way: ~4I~_~S~:>"
-	 insts))
+  (bug
+   "~@<Instructions either aren't related or conflict in some way: ~4I~_~S~:>"
+   insts))
 
 ;;; Given a list of instructions INSTS, Sees if one of these instructions is a
 ;;; more general form of all the others, in which case they are put into its
@@ -506,7 +507,7 @@
   (setf (dstate-cur-offs dstate) 0)
   (setf (dstate-cur-labels dstate) (dstate-labels dstate)))
 
-(defun do-offs-hooks (before-address stream dstate)
+(defun call-offs-hooks (before-address stream dstate)
   (declare (type (or null stream) stream)
 	   (type disassem-state dstate))
   (let ((cur-offs (dstate-cur-offs dstate)))
@@ -527,7 +528,7 @@
 	  (unless (= (dstate-next-offs dstate) cur-offs)
 	    (return)))))))
 
-(defun do-fun-hooks (chunk stream dstate)
+(defun call-fun-hooks (chunk stream dstate)
   (let ((hooks (dstate-fun-hooks dstate))
 	(cur-offs (dstate-cur-offs dstate)))
     (setf (dstate-next-offs dstate) cur-offs)
@@ -568,10 +569,10 @@
 
       (setf (dstate-next-offs dstate) (dstate-cur-offs dstate))
 
-      (do-offs-hooks t stream dstate)
+      (call-offs-hooks t stream dstate)
       (unless (or prefix-p (null stream))
 	(print-current-address stream dstate))
-      (do-offs-hooks nil stream dstate)
+      (call-offs-hooks nil stream dstate)
 
       (unless (> (dstate-next-offs dstate) (dstate-cur-offs dstate))
 	(sb!sys:without-gcing
@@ -581,7 +582,7 @@
 		(sap-ref-dchunk (dstate-segment-sap dstate)
 				(dstate-cur-offs dstate)
 				(dstate-byte-order dstate))))
-	   (let ((fun-prefix-p (do-fun-hooks chunk stream dstate)))
+	   (let ((fun-prefix-p (call-fun-hooks chunk stream dstate)))
 	     (if (> (dstate-next-offs dstate) (dstate-cur-offs dstate))
 		 (setf prefix-p fun-prefix-p)
 		 (let ((inst (find-inst chunk ispace)))