From: Cyrus Harmon <ch-sbcl@bobobeach.com>
Date: Wed, 15 Mar 2006 04:59:20 +0000 (+0000)
Subject: 0.9.10.34
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=9e02121865a6d59a49021dcbe3e5ba6afbca8b58;p=sbcl.git

0.9.10.34
    Fix disassembly of break-containing functions on Darwin
    ... switch on (word-imm-code chunk dstate) instead of
        byte-imm-code under Darwin
    ... whitespace to make word-imm match byte-imm
---

diff --git a/src/compiler/x86/insts.lisp b/src/compiler/x86/insts.lisp
index f58b42a..ea56bf5 100644
--- a/src/compiler/x86/insts.lisp
+++ b/src/compiler/x86/insts.lisp
@@ -632,8 +632,8 @@
 ;;; Two byte instruction with an immediate byte argument.
 ;;;
 (sb!disassem:define-instruction-format (word-imm 24
-                                                 :default-printer '(:name :tab code))
-    (op :field (byte 16 0))
+                                     :default-printer '(:name :tab code))
+  (op :field (byte 16 0))
   (code :field (byte 8 16)))
 
 
@@ -1941,7 +1941,8 @@
     ;; Lisp (with (DESCRIBE 'BYTE-IMM-CODE)) than to definitively deduce
     ;; from first principles whether it's defined in some way that genesis
     ;; can't grok.
-    (case (byte-imm-code chunk dstate)
+    (case #-darwin (byte-imm-code chunk dstate)
+          #+darwin (word-imm-code chunk dstate)
       (#.error-trap
        (nt "error trap")
        (sb!disassem:handle-break-args #'snarf-error-junk stream dstate))
diff --git a/version.lisp-expr b/version.lisp-expr
index d8c6441..81e61d6 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.10.33"
+"0.9.10.34"