projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.0.33
[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
867b2d9
..
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))
(declare (ignore start count))
- (load-symbol-value catch *current-catch-block*)
+ (load-tl-symbol-value catch *current-catch-block*)
LOOP
LOOP
@@
-213,7
+213,7
@@
EXIT
EXIT
- ;; Hear EAX points to catch block containing symbol pointed to by EDX.
+ ;; Here EAX points to catch block containing symbol pointed to by EDX.
(inst jmp (make-fixup 'unwind :assembly-routine)))
;;;; non-local exit noise
(inst jmp (make-fixup 'unwind :assembly-routine)))
;;;; non-local exit noise
@@
-232,9
+232,10
@@
(inst or block block) ; check for NULL pointer
(inst jmp :z error))
(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 *cuwpb* match value stored in argument cuwp slot?
+ ;; Does *CURRENT-UNWIND-PROTECT-BLOCK* match the value stored in
+ ;; argument's CURRENT-UWP-SLOT?
(inst cmp uwp
(make-ea-for-object-slot block unwind-block-current-uwp-slot 0))
;; If a match, return to context in arg block.
(inst cmp uwp
(make-ea-for-object-slot block unwind-block-current-uwp-slot 0))
;; If a match, return to context in arg block.
@@
-246,15
+247,17
@@
(move block uwp)
;; Set next unwind protect context.
(loadw uwp uwp unwind-block-current-uwp-slot)
(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
(loadw ebp-tn block unwind-block-current-cont-slot)
;; Uwp-entry expects some things in known locations so that they can
DO-EXIT
(loadw ebp-tn block unwind-block-current-cont-slot)
;; Uwp-entry expects some things in known locations so that they can
- ;; be saved on the stack: the block in edx-tn; start in ebx-tn; and
- ;; count in ecx-tn
+ ;; be saved on the stack: the block in edx-tn, start in ebx-tn, and
+ ;; count in ecx-tn.
(inst jmp (make-ea :byte :base block
:disp (* unwind-block-entry-pc-slot n-word-bytes))))
(inst jmp (make-ea :byte :base block
:disp (* unwind-block-entry-pc-slot n-word-bytes))))