X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fassembly%2Fx86%2Fassem-rtns.lisp;h=c56dbdc69ff39ae0cd9d6b23b38161fd1338dca9;hb=872175cd9cb5b4966a36d4bd92421cc407a0355b;hp=65e50b13e8d52aeab5fc2caa63e900de36f82e68;hpb=adf0d51d2bde8b723276bacf94641df9aa5ae561;p=sbcl.git diff --git a/src/assembly/x86/assem-rtns.lisp b/src/assembly/x86/assem-rtns.lisp index 65e50b1..c56dbdc 100644 --- a/src/assembly/x86/assem-rtns.lisp +++ b/src/assembly/x86/assem-rtns.lisp @@ -10,9 +10,6 @@ ;;;; files for more information. (in-package "SB!VM") - -(file-comment - "$Header$") ;;;; RETURN-MULTIPLE @@ -198,7 +195,7 @@ (declare (ignore start count)) - (load-symbol-value catch sb!impl::*current-catch-block*) + (load-symbol-value catch *current-catch-block*) LOOP @@ -233,7 +230,7 @@ (inst or block block) ; check for NULL pointer (inst jmp :z error)) - (load-symbol-value uwp sb!impl::*current-unwind-protect-block*) + (load-symbol-value uwp *current-unwind-protect-block*) ;; Does *cuwpb* match value stored in argument cuwp slot? (inst cmp uwp @@ -241,13 +238,13 @@ ;; If a match, return to context in arg block. (inst jmp :e do-exit) - ;; Not a match - return to *current-unwind-protect-block* context. + ;; Not a match - return to *CURRENT-UNWIND-PROTECT-BLOCK* context. ;; Important! Must save (and return) the arg 'block' for later use!! (move edx-tn block) (move block uwp) ;; Set next unwind protect context. (loadw uwp uwp unwind-block-current-uwp-slot) - (store-symbol-value uwp sb!impl::*current-unwind-protect-block*) + (store-symbol-value uwp *current-unwind-protect-block*) DO-EXIT