From: Thiemo Seufer <ths@networkno.de>
Date: Thu, 8 Sep 2005 08:09:40 +0000 (+0000)
Subject: Always keep the break instruction in the branch delay slot.
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=0cc62b164c3b51eb084d33e383b4be9b9ecb13a9;hp=b2426aa7337c9eae7a325e39e381aaf704294d8e;p=sbcl.git

Always keep the break instruction in the branch delay slot.
---

diff --git a/src/compiler/mips/macros.lisp b/src/compiler/mips/macros.lisp
index dd32fdc..89190ad 100644
--- a/src/compiler/mips/macros.lisp
+++ b/src/compiler/mips/macros.lisp
@@ -215,8 +215,9 @@
   "Cause a continuable error.  If the error is continued, execution resumes at
   LABEL."
   `(progn
-     (inst b ,label)
-     ,@(emit-error-break vop cerror-trap error-code values)))
+     (without-scheduling ()
+       (inst b ,label)
+       ,@(emit-error-break vop cerror-trap error-code values))))
 
 (defmacro generate-error-code (vop error-code &rest values)
   "Generate-Error-Code Error-code Value*
diff --git a/version.lisp-expr b/version.lisp-expr
index 4151d0b..d2e8d70 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.4.48"
+"0.9.4.49"