0.pre8.28

[sbcl.git] / src / assembly / x86 / assem-rtns.lisp

diff --git a/src/assembly/x86/assem-rtns.lisp b/src/assembly/x86/assem-rtns.lisp
index 108acb4..c006ebe 100644 (file)
--- a/src/assembly/x86/assem-rtns.lisp
+++ b/src/assembly/x86/assem-rtns.lisp
@@ -197,7 +197,7 @@
 
   (declare (ignore start count))
 
-  (load-symbol-value catch *current-catch-block*)
+  (load-tl-symbol-value catch *current-catch-block*)
 
   LOOP
 
@@ -232,7 +232,7 @@
     (inst or block block)              ; check for NULL pointer
     (inst jmp :z error))
 
-  (load-symbol-value uwp *current-unwind-protect-block*)
+  (load-tl-symbol-value uwp *current-unwind-protect-block*)
 
   ;; Does *CURRENT-UNWIND-PROTECT-BLOCK* match the value stored in
   ;; argument's CURRENT-UWP-SLOT?
@@ -247,7 +247,9 @@
   (move block uwp)
   ;; Set next unwind protect context.
   (loadw uwp uwp unwind-block-current-uwp-slot)
-  (store-symbol-value uwp *current-unwind-protect-block*)
+  ;; we're about to reload ebp anyway, so let's borrow it here as a
+  ;; temporary.  Hope this works
+  (store-tl-symbol-value uwp *current-unwind-protect-block* ebp-tn)
 
   DO-EXIT