From 3e72870f4289445c8213b803b281853d7b00a200 Mon Sep 17 00:00:00 2001 From: Stas Boukarev Date: Sat, 30 Apr 2016 19:37:49 +0300 Subject: [PATCH] Rename slots in unwind-block and catch-block. Remove the "current" prefix. Rename "cont" to "cfp". --- package-data-list.lisp-expr | 8 ++++---- src/assembly/alpha/assem-rtns.lisp | 8 ++++---- src/assembly/arm/assem-rtns.lisp | 8 ++++---- src/assembly/arm64/assem-rtns.lisp | 8 ++++---- src/assembly/hppa/assem-rtns.lisp | 8 ++++---- src/assembly/mips/assem-rtns.lisp | 8 ++++---- src/assembly/ppc/assem-rtns.lisp | 8 ++++---- src/assembly/sparc/assem-rtns.lisp | 8 ++++---- src/assembly/x86-64/assem-rtns.lisp | 6 +++--- src/assembly/x86/assem-rtns.lisp | 12 ++++++------ src/code/debug-int.lisp | 10 +++++----- src/code/debug.lisp | 2 +- src/compiler/alpha/nlx.lisp | 14 +++++++------- src/compiler/arm/nlx.lisp | 20 ++++++++++---------- src/compiler/arm64/nlx.lisp | 20 ++++++++++---------- src/compiler/generic/objdef.lisp | 12 ++++++------ src/compiler/hppa/nlx.lisp | 14 +++++++------- src/compiler/mips/nlx.lisp | 14 +++++++------- src/compiler/ppc/nlx.lisp | 14 +++++++------- src/compiler/sparc/nlx.lisp | 14 +++++++------- src/compiler/x86-64/nlx.lisp | 14 +++++++------- src/compiler/x86/nlx.lisp | 14 +++++++------- src/runtime/monitor.c | 6 +++--- 23 files changed, 125 insertions(+), 125 deletions(-) diff --git a/package-data-list.lisp-expr b/package-data-list.lisp-expr index 6fe929537..17b390aeb 100644 --- a/package-data-list.lisp-expr +++ b/package-data-list.lisp-expr @@ -2904,8 +2904,8 @@ structure representations" "BIGNUM-DIGITS-OFFSET" "BIGNUM-WIDETAG" "BINDING-SIZE" "BINDING-SYMBOL-SLOT" "BINDING-VALUE-SLOT" "BREAKPOINT-TRAP" "N-BYTE-BITS" "BYTE-REG-SC-NUMBER" - "CATCH-BLOCK-CURRENT-CODE-SLOT" - "CATCH-BLOCK-CURRENT-CONT-SLOT" "CATCH-BLOCK-CURRENT-UWP-SLOT" + "CATCH-BLOCK-CODE-SLOT" + "CATCH-BLOCK-CFP-SLOT" "CATCH-BLOCK-UWP-SLOT" "CATCH-BLOCK-ENTRY-PC-SLOT" "CATCH-BLOCK-PREVIOUS-CATCH-SLOT" "CATCH-BLOCK-SC-NUMBER" "CATCH-BLOCK-SIZE" "CATCH-BLOCK-TAG-SLOT" "CERROR-TRAP" @@ -3126,8 +3126,8 @@ structure representations" "UNBOUND-MARKER-WIDETAG" "NO-TLS-VALUE-MARKER-WIDETAG" "UNSIGNED-REG-SC-NUMBER" "UNSIGNED-STACK-SC-NUMBER" - "UNWIND-BLOCK-CURRENT-CODE-SLOT" "UNWIND-BLOCK-CURRENT-CONT-SLOT" - "UNWIND-BLOCK-CURRENT-UWP-SLOT" "UNWIND-BLOCK-ENTRY-PC-SLOT" + "UNWIND-BLOCK-CODE-SLOT" "UNWIND-BLOCK-CFP-SLOT" + "UNWIND-BLOCK-UWP-SLOT" "UNWIND-BLOCK-ENTRY-PC-SLOT" "UNWIND-BLOCK-SIZE" "VALUE-CELL-HEADER-WIDETAG" "VALUE-CELL-SIZE" "VALUE-CELL-VALUE-SLOT" "VECTOR-DATA-OFFSET" "VECTOR-LENGTH-SLOT" "VECTOR-NORMAL-SUBTYPE" diff --git a/src/assembly/alpha/assem-rtns.lisp b/src/assembly/alpha/assem-rtns.lisp index 5a2d9f9a0..e3b5d0690 100644 --- a/src/assembly/alpha/assem-rtns.lisp +++ b/src/assembly/alpha/assem-rtns.lisp @@ -178,7 +178,7 @@ (let ((error (generate-error-code nil 'invalid-unwind-error))) (inst beq block error)) - (loadw target-uwp block unwind-block-current-uwp-slot) + (loadw target-uwp block unwind-block-uwp-slot) (inst cmpeq cur-uwp target-uwp temp1) (inst beq temp1 do-uwp) @@ -186,15 +186,15 @@ do-exit - (loadw cfp-tn cur-uwp unwind-block-current-cont-slot) - (loadw code-tn cur-uwp unwind-block-current-code-slot) + (loadw cfp-tn cur-uwp unwind-block-cfp-slot) + (loadw code-tn cur-uwp unwind-block-code-slot) (progn (loadw lra cur-uwp unwind-block-entry-pc-slot) (lisp-return lra lip :frob-code nil)) do-uwp - (loadw next-uwp cur-uwp unwind-block-current-uwp-slot) + (loadw next-uwp cur-uwp unwind-block-uwp-slot) (store-symbol-value next-uwp *current-unwind-protect-block*) (inst br zero-tn do-exit)) diff --git a/src/assembly/arm/assem-rtns.lisp b/src/assembly/arm/assem-rtns.lisp index f8ea48565..b3877082f 100644 --- a/src/assembly/arm/assem-rtns.lisp +++ b/src/assembly/arm/assem-rtns.lisp @@ -216,15 +216,15 @@ (inst b :eq error)) (load-symbol-value cur-uwp *current-unwind-protect-block*) - (loadw ocfp block unwind-block-current-uwp-slot) + (loadw ocfp block unwind-block-uwp-slot) (inst cmp cur-uwp ocfp) - (loadw ocfp cur-uwp unwind-block-current-uwp-slot 0 :ne) + (loadw ocfp cur-uwp unwind-block-uwp-slot 0 :ne) (store-symbol-value ocfp *current-unwind-protect-block* :ne) (move cur-uwp block :eq) - (loadw cfp-tn cur-uwp unwind-block-current-cont-slot) - (loadw code-tn cur-uwp unwind-block-current-code-slot) + (loadw cfp-tn cur-uwp unwind-block-cfp-slot) + (loadw code-tn cur-uwp unwind-block-code-slot) (loadw lra cur-uwp unwind-block-entry-pc-slot) (lisp-return lra :known)) diff --git a/src/assembly/arm64/assem-rtns.lisp b/src/assembly/arm64/assem-rtns.lisp index a410f0052..204661150 100644 --- a/src/assembly/arm64/assem-rtns.lisp +++ b/src/assembly/arm64/assem-rtns.lisp @@ -185,16 +185,16 @@ (let ((error (generate-error-code nil 'invalid-unwind-error))) (inst cbz block error)) (load-tl-symbol-value cur-uwp *current-unwind-protect-block*) - (loadw ocfp block unwind-block-current-uwp-slot) + (loadw ocfp block unwind-block-uwp-slot) (inst cmp cur-uwp ocfp) (inst b :eq EQ) - (loadw ocfp cur-uwp unwind-block-current-uwp-slot) + (loadw ocfp cur-uwp unwind-block-uwp-slot) (store-tl-symbol-value ocfp *current-unwind-protect-block*) EQ (inst csel cur-uwp block cur-uwp :eq) - #.(assert (and (= unwind-block-current-cont-slot 1) - (= unwind-block-current-code-slot 2))) + #.(assert (and (= unwind-block-cfp-slot 1) + (= unwind-block-code-slot 2))) (inst ldp cfp-tn code-tn (@ cur-uwp n-word-bytes)) (loadw lra cur-uwp unwind-block-entry-pc-slot) (lisp-return lra lip :known)) diff --git a/src/assembly/hppa/assem-rtns.lisp b/src/assembly/hppa/assem-rtns.lisp index 47899ab48..b9482b12f 100644 --- a/src/assembly/hppa/assem-rtns.lisp +++ b/src/assembly/hppa/assem-rtns.lisp @@ -135,19 +135,19 @@ (inst bc := nil block zero-tn error)) (load-symbol-value cur-uwp *current-unwind-protect-block*) - (loadw target-uwp block unwind-block-current-uwp-slot) + (loadw target-uwp block unwind-block-uwp-slot) (inst bc :<> nil cur-uwp target-uwp DO-UWP) (move block cur-uwp) DO-EXIT - (loadw cfp-tn cur-uwp unwind-block-current-cont-slot) - (loadw code-tn cur-uwp unwind-block-current-code-slot) + (loadw cfp-tn cur-uwp unwind-block-cfp-slot) + (loadw code-tn cur-uwp unwind-block-code-slot) (loadw lra cur-uwp unwind-block-entry-pc-slot) (lisp-return lra :frob-code nil) DO-UWP - (loadw next-uwp cur-uwp unwind-block-current-uwp-slot) + (loadw next-uwp cur-uwp unwind-block-uwp-slot) (inst b DO-EXIT) (store-symbol-value next-uwp *current-unwind-protect-block*)) diff --git a/src/assembly/mips/assem-rtns.lisp b/src/assembly/mips/assem-rtns.lisp index 0e6b1096a..d2f83288d 100644 --- a/src/assembly/mips/assem-rtns.lisp +++ b/src/assembly/mips/assem-rtns.lisp @@ -172,20 +172,20 @@ (inst nop)) (load-symbol-value cur-uwp *current-unwind-protect-block*) - (loadw target-uwp block unwind-block-current-uwp-slot) + (loadw target-uwp block unwind-block-uwp-slot) (inst bne cur-uwp target-uwp DO-UWP) (inst nop) (move cur-uwp block) DO-EXIT - (loadw cfp-tn cur-uwp unwind-block-current-cont-slot) - (loadw code-tn cur-uwp unwind-block-current-code-slot) + (loadw cfp-tn cur-uwp unwind-block-cfp-slot) + (loadw code-tn cur-uwp unwind-block-code-slot) (loadw lra cur-uwp unwind-block-entry-pc-slot) (lisp-return lra lip :frob-code nil) DO-UWP - (loadw next-uwp cur-uwp unwind-block-current-uwp-slot) + (loadw next-uwp cur-uwp unwind-block-uwp-slot) (inst b DO-EXIT) (store-symbol-value next-uwp *current-unwind-protect-block*)) diff --git a/src/assembly/ppc/assem-rtns.lisp b/src/assembly/ppc/assem-rtns.lisp index e6839a993..622088b64 100644 --- a/src/assembly/ppc/assem-rtns.lisp +++ b/src/assembly/ppc/assem-rtns.lisp @@ -158,7 +158,7 @@ (inst beq error)) (load-tl-symbol-value cur-uwp *current-unwind-protect-block*) - (loadw target-uwp block unwind-block-current-uwp-slot) + (loadw target-uwp block unwind-block-uwp-slot) (inst cmpw cur-uwp target-uwp) (inst bne do-uwp) @@ -166,14 +166,14 @@ DO-EXIT - (loadw cfp-tn cur-uwp unwind-block-current-cont-slot) - (loadw code-tn cur-uwp unwind-block-current-code-slot) + (loadw cfp-tn cur-uwp unwind-block-cfp-slot) + (loadw code-tn cur-uwp unwind-block-code-slot) (loadw lra cur-uwp unwind-block-entry-pc-slot) (lisp-return lra lip) DO-UWP - (loadw next-uwp cur-uwp unwind-block-current-uwp-slot) + (loadw next-uwp cur-uwp unwind-block-uwp-slot) (store-tl-symbol-value next-uwp *current-unwind-protect-block* cfp-tn) (inst b do-exit)) diff --git a/src/assembly/sparc/assem-rtns.lisp b/src/assembly/sparc/assem-rtns.lisp index 28d0d4943..a1ba8c4e8 100644 --- a/src/assembly/sparc/assem-rtns.lisp +++ b/src/assembly/sparc/assem-rtns.lisp @@ -179,7 +179,7 @@ (inst b :eq error)) (load-symbol-value cur-uwp *current-unwind-protect-block*) - (loadw target-uwp block unwind-block-current-uwp-slot) + (loadw target-uwp block unwind-block-uwp-slot) (inst cmp cur-uwp target-uwp) (inst b :ne do-uwp) (inst nop) @@ -188,14 +188,14 @@ DO-EXIT - (loadw cfp-tn cur-uwp unwind-block-current-cont-slot) - (loadw code-tn cur-uwp unwind-block-current-code-slot) + (loadw cfp-tn cur-uwp unwind-block-cfp-slot) + (loadw code-tn cur-uwp unwind-block-code-slot) (loadw lra cur-uwp unwind-block-entry-pc-slot) (lisp-return lra :frob-code nil) DO-UWP - (loadw next-uwp cur-uwp unwind-block-current-uwp-slot) + (loadw next-uwp cur-uwp unwind-block-uwp-slot) (inst b do-exit) (store-symbol-value next-uwp *current-unwind-protect-block*)) diff --git a/src/assembly/x86-64/assem-rtns.lisp b/src/assembly/x86-64/assem-rtns.lisp index 52417a561..bcfda97c0 100644 --- a/src/assembly/x86-64/assem-rtns.lisp +++ b/src/assembly/x86-64/assem-rtns.lisp @@ -284,7 +284,7 @@ ;; 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)) + (make-ea-for-object-slot block unwind-block-uwp-slot 0)) ;; If a match, return to context in arg block. (inst jmp :e DO-EXIT) @@ -293,12 +293,12 @@ (move rdx-tn block) (move block uwp) ;; Set next unwind protect context. - (loadw uwp uwp unwind-block-current-uwp-slot) + (loadw uwp uwp unwind-block-uwp-slot) (store-tl-symbol-value uwp *current-unwind-protect-block*) DO-EXIT - (loadw rbp-tn block unwind-block-current-cont-slot) + (loadw rbp-tn block unwind-block-cfp-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 diff --git a/src/assembly/x86/assem-rtns.lisp b/src/assembly/x86/assem-rtns.lisp index d0ad3915c..42e7e2e46 100644 --- a/src/assembly/x86/assem-rtns.lisp +++ b/src/assembly/x86/assem-rtns.lisp @@ -274,7 +274,7 @@ ;; 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)) + (make-ea-for-object-slot block unwind-block-uwp-slot 0)) ;; If a match, return to context in arg block. (inst jmp :e DO-EXIT) @@ -283,14 +283,14 @@ (move edx-tn block) (move block uwp) ;; Set next unwind protect context. - (loadw uwp uwp unwind-block-current-uwp-slot) + (loadw uwp uwp unwind-block-uwp-slot) ;; 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) + (loadw ebp-tn block unwind-block-cfp-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 @@ -350,7 +350,7 @@ ;; By now we've unwound all the UWP frames required, so we ;; just jump to our target block. - (loadw ebp-tn block unwind-block-current-cont-slot) + (loadw ebp-tn block unwind-block-cfp-slot) ;; Nlx-entry expects the arg start in ebx-tn and the arg count ;; in ecx-tn. Fortunately, that's where they are already. @@ -424,7 +424,7 @@ n-word-bytes)))) ;; Update *CURRENT-UNWIND-PROTECT-BLOCK*. - (loadw ebx-tn block unwind-block-current-uwp-slot) + (loadw ebx-tn block unwind-block-uwp-slot) (store-tl-symbol-value ebx-tn *current-unwind-protect-block* ecx-tn) ;; Uwp-entry expects some things in known locations so that they can @@ -436,7 +436,7 @@ (inst xor ebx-tn ebx-tn) (inst xor ecx-tn ecx-tn) (inst mov ebx-tn ebp-tn) - (loadw ebp-tn block unwind-block-current-cont-slot) + (loadw ebp-tn block unwind-block-cfp-slot) (inst jmp (make-ea-for-object-slot block unwind-block-entry-pc-slot 0))) #!+win32 diff --git a/src/code/debug-int.lisp b/src/code/debug-int.lisp index 9aca16225..9b34c7450 100644 --- a/src/code/debug-int.lisp +++ b/src/code/debug-int.lisp @@ -1082,12 +1082,12 @@ register." (when (sap= fp #!-alpha (sap-ref-sap catch - (* sb!vm:catch-block-current-cont-slot + (* sb!vm:catch-block-cfp-slot sb!vm:n-word-bytes)) #!+alpha (int-sap (sap-ref-32 catch - (* sb!vm:catch-block-current-cont-slot + (* sb!vm:catch-block-cfp-slot sb!vm:n-word-bytes)))) (let* (#!-(or x86 x86-64) (lra (stack-ref catch sb!vm:catch-block-entry-pc-slot)) @@ -1097,7 +1097,7 @@ register." sb!vm:n-word-bytes))) #!-(or x86 x86-64) (component - (stack-ref catch sb!vm:catch-block-current-code-slot)) + (stack-ref catch sb!vm:catch-block-code-slot)) #!+(or x86 x86-64) (component (component-from-component-ptr (component-ptr-from-pc ra))) @@ -1139,12 +1139,12 @@ register." do (when (sap= fp #!-alpha (sap-ref-sap catch - (* sb!vm:catch-block-current-cont-slot + (* sb!vm:catch-block-cfp-slot sb!vm:n-word-bytes)) #!+alpha (int-sap (sap-ref-32 catch - (* sb!vm:catch-block-current-cont-slot + (* sb!vm:catch-block-cfp-slot sb!vm:n-word-bytes)))) (let ((current-tag #!-(or x86 x86-64) diff --git a/src/code/debug.lisp b/src/code/debug.lisp index fe5133303..d1598b7fa 100644 --- a/src/code/debug.lisp +++ b/src/code/debug.lisp @@ -1858,7 +1858,7 @@ forms that explicitly control this kind of evaluation.") sb!vm:n-fixnum-tag-bits)))) (enclosing-uwp (loop for uwp-block = current-uwp then (sap-ref-sap uwp-block - sb!vm:unwind-block-current-uwp-slot) + sb!vm:unwind-block-uwp-slot) when (or (zerop (sap-int uwp-block)) #!+stack-grows-downward-not-upward (sap> uwp-block frame-pointer) diff --git a/src/compiler/alpha/nlx.lisp b/src/compiler/alpha/nlx.lisp index 1135d5c58..e2c54a7e8 100644 --- a/src/compiler/alpha/nlx.lisp +++ b/src/compiler/alpha/nlx.lisp @@ -77,9 +77,9 @@ (:generator 22 (inst lda block (* (tn-offset tn) n-word-bytes) cfp-tn) (load-symbol-value temp *current-unwind-protect-block*) - (storew temp block unwind-block-current-uwp-slot) - (storew cfp-tn block unwind-block-current-cont-slot) - (storew code-tn block unwind-block-current-code-slot) + (storew temp block unwind-block-uwp-slot) + (storew cfp-tn block unwind-block-cfp-slot) + (storew code-tn block unwind-block-code-slot) (inst compute-lra-from-code temp code-tn entry-label ndescr) (storew temp block catch-block-entry-pc-slot))) @@ -97,9 +97,9 @@ (:generator 44 (inst lda result (* (tn-offset tn) n-word-bytes) cfp-tn) (load-symbol-value temp *current-unwind-protect-block*) - (storew temp result catch-block-current-uwp-slot) - (storew cfp-tn result catch-block-current-cont-slot) - (storew code-tn result catch-block-current-code-slot) + (storew temp result catch-block-uwp-slot) + (storew cfp-tn result catch-block-cfp-slot) + (storew code-tn result catch-block-code-slot) (inst compute-lra-from-code temp code-tn entry-label ndescr) (storew temp result catch-block-entry-pc-slot) @@ -134,7 +134,7 @@ (:translate %unwind-protect-breakup) (:generator 17 (load-symbol-value block *current-unwind-protect-block*) - (loadw block block unwind-block-current-uwp-slot) + (loadw block block unwind-block-uwp-slot) (store-symbol-value block *current-unwind-protect-block*))) ;;;; NLX entry VOPs diff --git a/src/compiler/arm/nlx.lisp b/src/compiler/arm/nlx.lisp index 3c62da274..cc8696f31 100644 --- a/src/compiler/arm/nlx.lisp +++ b/src/compiler/arm/nlx.lisp @@ -75,9 +75,9 @@ (composite-immediate-instruction add block cfp-tn (* (tn-offset tn) n-word-bytes)) (load-symbol-value temp *current-unwind-protect-block*) - (storew temp block unwind-block-current-uwp-slot) - (storew cfp-tn block unwind-block-current-cont-slot) - (storew code-tn block unwind-block-current-code-slot) + (storew temp block unwind-block-uwp-slot) + (storew cfp-tn block unwind-block-cfp-slot) + (storew code-tn block unwind-block-code-slot) (inst compute-lra temp lip entry-label) (storew temp block catch-block-entry-pc-slot))) @@ -95,9 +95,9 @@ (composite-immediate-instruction add result cfp-tn (* (tn-offset tn) n-word-bytes)) (load-symbol-value temp *current-unwind-protect-block*) - (storew temp result catch-block-current-uwp-slot) - (storew cfp-tn result catch-block-current-cont-slot) - (storew code-tn result catch-block-current-code-slot) + (storew temp result catch-block-uwp-slot) + (storew cfp-tn result catch-block-cfp-slot) + (storew code-tn result catch-block-code-slot) (inst compute-lra temp lip entry-label) (storew temp result catch-block-entry-pc-slot) @@ -133,7 +133,7 @@ (:translate %unwind-protect-breakup) (:generator 17 (load-symbol-value block *current-unwind-protect-block*) - (loadw block block unwind-block-current-uwp-slot) + (loadw block block unwind-block-uwp-slot) (store-symbol-value block *current-unwind-protect-block*))) ;;;; NLX entry VOPs: @@ -252,10 +252,10 @@ ;; Set up magic catch / UWP block. (loadw temp uwp sap-pointer-slot other-pointer-lowtag) - (storew temp block unwind-block-current-uwp-slot) + (storew temp block unwind-block-uwp-slot) (loadw temp ofp sap-pointer-slot other-pointer-lowtag) - (storew temp block unwind-block-current-cont-slot) - ;; Don't need to save code at unwind-block-current-code-slot since + (storew temp block unwind-block-cfp-slot) + ;; Don't need to save code at unwind-block-code-slot since ;; it's not going to be used and will be overwritten after the ;; function call diff --git a/src/compiler/arm64/nlx.lisp b/src/compiler/arm64/nlx.lisp index 3c90d72a8..c56e0be2c 100644 --- a/src/compiler/arm64/nlx.lisp +++ b/src/compiler/arm64/nlx.lisp @@ -74,11 +74,11 @@ (:generator 22 (inst add block cfp-tn (add-sub-immediate (* (tn-offset tn) n-word-bytes))) (load-tl-symbol-value temp *current-unwind-protect-block*) - #.(assert (and (= unwind-block-current-uwp-slot 0) - (= unwind-block-current-cont-slot 1))) + #.(assert (and (= unwind-block-uwp-slot 0) + (= unwind-block-cfp-slot 1))) (inst stp temp cfp-tn (@ block)) (inst compute-lra temp lip entry-label) - #.(assert (and (= unwind-block-current-code-slot 2) + #.(assert (and (= unwind-block-code-slot 2) (= unwind-block-entry-pc-slot 3))) (inst stp code-tn temp (@ block (* n-word-bytes 2))))) @@ -95,10 +95,10 @@ (:generator 44 (inst add result cfp-tn (add-sub-immediate (* (tn-offset tn) n-word-bytes))) (load-tl-symbol-value temp *current-unwind-protect-block*) - #.(assert (and (= catch-block-current-uwp-slot 0) - (= catch-block-current-cont-slot 1))) + #.(assert (and (= catch-block-uwp-slot 0) + (= catch-block-cfp-slot 1))) (inst stp temp cfp-tn (@ result)) - #.(assert (and (= catch-block-current-code-slot 2) + #.(assert (and (= catch-block-code-slot 2) (= catch-block-entry-pc-slot 3))) (inst compute-lra temp lip entry-label) (inst stp code-tn temp (@ result (* n-word-bytes 2))) @@ -134,7 +134,7 @@ (:translate %unwind-protect-breakup) (:generator 17 (load-tl-symbol-value block *current-unwind-protect-block*) - (loadw block block unwind-block-current-uwp-slot) + (loadw block block unwind-block-uwp-slot) (store-tl-symbol-value block *current-unwind-protect-block*))) ;;;; NLX entry VOPs: @@ -262,10 +262,10 @@ ;; Set up magic catch / UWP block. (loadw temp uwp sap-pointer-slot other-pointer-lowtag) - (storew temp block unwind-block-current-uwp-slot) + (storew temp block unwind-block-uwp-slot) (loadw temp ofp sap-pointer-slot other-pointer-lowtag) - (storew temp block unwind-block-current-cont-slot) - ;; Don't need to save code at unwind-block-current-code-slot since + (storew temp block unwind-block-cfp-slot) + ;; Don't need to save code at unwind-block-code-slot since ;; it's not going to be used and will be overwritten after the ;; function call diff --git a/src/compiler/generic/objdef.lisp b/src/compiler/generic/objdef.lisp index c1ee4d173..5580a298f 100644 --- a/src/compiler/generic/objdef.lisp +++ b/src/compiler/generic/objdef.lisp @@ -294,17 +294,17 @@ symbol) ;; on sb-thread, this is actually a tls-index (!define-primitive-object (unwind-block) - (current-uwp :c-type #!-alpha "struct unwind_block *" #!+alpha "u32") - (current-cont :c-type #!-alpha "lispobj *" #!+alpha "u32") - #!-(or x86 x86-64) current-code + (uwp :c-type #!-alpha "struct unwind_block *" #!+alpha "u32") + (cfp :c-type #!-alpha "lispobj *" #!+alpha "u32") + #!-(or x86 x86-64) code entry-pc #!+win32 next-seh-frame #!+win32 seh-frame-handler) (!define-primitive-object (catch-block) - (current-uwp :c-type #!-alpha "struct unwind_block *" #!+alpha "u32") - (current-cont :c-type #!-alpha "lispobj *" #!+alpha "u32") - #!-(or x86 x86-64) current-code + (uwp :c-type #!-alpha "struct unwind_block *" #!+alpha "u32") + (cfp :c-type #!-alpha "lispobj *" #!+alpha "u32") + #!-(or x86 x86-64) code entry-pc #!+(and win32 x86) next-seh-frame #!+(and win32 x86) seh-frame-handler diff --git a/src/compiler/hppa/nlx.lisp b/src/compiler/hppa/nlx.lisp index e17ea0098..ef9891408 100644 --- a/src/compiler/hppa/nlx.lisp +++ b/src/compiler/hppa/nlx.lisp @@ -63,9 +63,9 @@ (:generator 22 (inst ldo (* (tn-offset tn) n-word-bytes) cfp-tn block) (load-symbol-value temp *current-unwind-protect-block*) - (storew temp block unwind-block-current-uwp-slot) - (storew cfp-tn block unwind-block-current-cont-slot) - (storew code-tn block unwind-block-current-code-slot) + (storew temp block unwind-block-uwp-slot) + (storew cfp-tn block unwind-block-cfp-slot) + (storew code-tn block unwind-block-code-slot) (inst compute-lra-from-code code-tn entry-label ndescr temp) (storew temp block catch-block-entry-pc-slot))) @@ -83,9 +83,9 @@ (:generator 44 (inst ldo (* (tn-offset tn) n-word-bytes) cfp-tn result) (load-symbol-value temp *current-unwind-protect-block*) - (storew temp result catch-block-current-uwp-slot) - (storew cfp-tn result catch-block-current-cont-slot) - (storew code-tn result catch-block-current-code-slot) + (storew temp result catch-block-uwp-slot) + (storew cfp-tn result catch-block-cfp-slot) + (storew code-tn result catch-block-code-slot) (inst compute-lra-from-code code-tn entry-label ndescr temp) (storew temp result catch-block-entry-pc-slot) @@ -121,7 +121,7 @@ (:translate %unwind-protect-breakup) (:generator 17 (load-symbol-value block *current-unwind-protect-block*) - (loadw block block unwind-block-current-uwp-slot) + (loadw block block unwind-block-uwp-slot) (store-symbol-value block *current-unwind-protect-block*))) diff --git a/src/compiler/mips/nlx.lisp b/src/compiler/mips/nlx.lisp index 370a6f8ab..7652dde44 100644 --- a/src/compiler/mips/nlx.lisp +++ b/src/compiler/mips/nlx.lisp @@ -65,9 +65,9 @@ (:generator 22 (inst addu block cfp-tn (* (tn-offset tn) n-word-bytes)) (load-symbol-value temp *current-unwind-protect-block*) - (storew temp block unwind-block-current-uwp-slot) - (storew cfp-tn block unwind-block-current-cont-slot) - (storew code-tn block unwind-block-current-code-slot) + (storew temp block unwind-block-uwp-slot) + (storew cfp-tn block unwind-block-cfp-slot) + (storew code-tn block unwind-block-code-slot) (inst compute-lra-from-code temp code-tn entry-label ndescr) (storew temp block catch-block-entry-pc-slot))) @@ -86,9 +86,9 @@ (:generator 44 (inst addu result cfp-tn (* (tn-offset tn) n-word-bytes)) (load-symbol-value temp *current-unwind-protect-block*) - (storew temp result catch-block-current-uwp-slot) - (storew cfp-tn result catch-block-current-cont-slot) - (storew code-tn result catch-block-current-code-slot) + (storew temp result catch-block-uwp-slot) + (storew cfp-tn result catch-block-cfp-slot) + (storew code-tn result catch-block-code-slot) (inst compute-lra-from-code temp code-tn entry-label ndescr) (storew temp result catch-block-entry-pc-slot) @@ -126,7 +126,7 @@ (:translate %unwind-protect-breakup) (:generator 17 (load-symbol-value block *current-unwind-protect-block*) - (loadw block block unwind-block-current-uwp-slot) + (loadw block block unwind-block-uwp-slot) (store-symbol-value block *current-unwind-protect-block*))) diff --git a/src/compiler/ppc/nlx.lisp b/src/compiler/ppc/nlx.lisp index bf0d679ab..e84e66d7b 100644 --- a/src/compiler/ppc/nlx.lisp +++ b/src/compiler/ppc/nlx.lisp @@ -77,9 +77,9 @@ (:generator 22 (inst addi block cfp-tn (* (tn-offset tn) n-word-bytes)) (load-tl-symbol-value temp *current-unwind-protect-block*) - (storew temp block unwind-block-current-uwp-slot) - (storew cfp-tn block unwind-block-current-cont-slot) - (storew code-tn block unwind-block-current-code-slot) + (storew temp block unwind-block-uwp-slot) + (storew cfp-tn block unwind-block-cfp-slot) + (storew code-tn block unwind-block-code-slot) (inst compute-lra-from-code temp code-tn entry-label ndescr) (storew temp block catch-block-entry-pc-slot))) @@ -98,9 +98,9 @@ (:generator 44 (inst addi result cfp-tn (* (tn-offset tn) n-word-bytes)) (load-tl-symbol-value temp *current-unwind-protect-block*) - (storew temp result catch-block-current-uwp-slot) - (storew cfp-tn result catch-block-current-cont-slot) - (storew code-tn result catch-block-current-code-slot) + (storew temp result catch-block-uwp-slot) + (storew cfp-tn result catch-block-cfp-slot) + (storew code-tn result catch-block-code-slot) (inst compute-lra-from-code temp code-tn entry-label ndescr) (storew temp result catch-block-entry-pc-slot) @@ -141,7 +141,7 @@ (:translate %unwind-protect-breakup) (:generator 17 (load-tl-symbol-value block *current-unwind-protect-block*) - (loadw block block unwind-block-current-uwp-slot) + (loadw block block unwind-block-uwp-slot) (store-tl-symbol-value block *current-unwind-protect-block* temp))) diff --git a/src/compiler/sparc/nlx.lisp b/src/compiler/sparc/nlx.lisp index 18a784074..6bb01ac51 100644 --- a/src/compiler/sparc/nlx.lisp +++ b/src/compiler/sparc/nlx.lisp @@ -76,9 +76,9 @@ (:generator 22 (inst add block cfp-tn (* (tn-offset tn) n-word-bytes)) (load-symbol-value temp *current-unwind-protect-block*) - (storew temp block unwind-block-current-uwp-slot) - (storew cfp-tn block unwind-block-current-cont-slot) - (storew code-tn block unwind-block-current-code-slot) + (storew temp block unwind-block-uwp-slot) + (storew cfp-tn block unwind-block-cfp-slot) + (storew code-tn block unwind-block-code-slot) (inst compute-lra-from-code temp code-tn entry-label ndescr) (storew temp block catch-block-entry-pc-slot))) @@ -96,9 +96,9 @@ (:generator 44 (inst add result cfp-tn (* (tn-offset tn) n-word-bytes)) (load-symbol-value temp *current-unwind-protect-block*) - (storew temp result catch-block-current-uwp-slot) - (storew cfp-tn result catch-block-current-cont-slot) - (storew code-tn result catch-block-current-code-slot) + (storew temp result catch-block-uwp-slot) + (storew cfp-tn result catch-block-cfp-slot) + (storew code-tn result catch-block-code-slot) (inst compute-lra-from-code temp code-tn entry-label ndescr) (storew temp result catch-block-entry-pc-slot) @@ -135,7 +135,7 @@ (:translate %unwind-protect-breakup) (:generator 17 (load-symbol-value block *current-unwind-protect-block*) - (loadw block block unwind-block-current-uwp-slot) + (loadw block block unwind-block-uwp-slot) (store-symbol-value block *current-unwind-protect-block*))) diff --git a/src/compiler/x86-64/nlx.lisp b/src/compiler/x86-64/nlx.lisp index 20f3608f5..a5fdc6836 100644 --- a/src/compiler/x86-64/nlx.lisp +++ b/src/compiler/x86-64/nlx.lisp @@ -66,8 +66,8 @@ (:generator 22 (inst lea block (catch-block-ea tn)) (load-tl-symbol-value temp *current-unwind-protect-block*) - (storew temp block unwind-block-current-uwp-slot) - (storew rbp-tn block unwind-block-current-cont-slot) + (storew temp block unwind-block-uwp-slot) + (storew rbp-tn block unwind-block-cfp-slot) (inst lea temp (make-fixup nil :code-object entry-label)) (storew temp block unwind-block-entry-pc-slot))) @@ -82,8 +82,8 @@ (:generator 44 (inst lea block (catch-block-ea tn)) (load-tl-symbol-value temp *current-unwind-protect-block*) - (storew temp block catch-block-current-uwp-slot) - (storew rbp-tn block catch-block-current-cont-slot) + (storew temp block catch-block-uwp-slot) + (storew rbp-tn block catch-block-cfp-slot) (inst lea temp (make-fixup nil :code-object entry-label)) (storew temp block catch-block-entry-pc-slot) (storew tag block catch-block-tag-slot) @@ -115,7 +115,7 @@ (:translate %unwind-protect-breakup) (:generator 17 (load-tl-symbol-value block *current-unwind-protect-block*) - (loadw block block unwind-block-current-uwp-slot) + (loadw block block unwind-block-uwp-slot) (store-tl-symbol-value block *current-unwind-protect-block*))) ;;;; NLX entry VOPs @@ -245,9 +245,9 @@ ;; Set up magic catch / UWP block. (move block rsp-tn) (loadw temp uwp sap-pointer-slot other-pointer-lowtag) - (storew temp block unwind-block-current-uwp-slot) + (storew temp block unwind-block-uwp-slot) (loadw temp ofp sap-pointer-slot other-pointer-lowtag) - (storew temp block unwind-block-current-cont-slot) + (storew temp block unwind-block-cfp-slot) (inst lea temp-reg-tn (make-fixup nil :code-object entry-label)) (storew temp-reg-tn block unwind-block-entry-pc-slot) diff --git a/src/compiler/x86/nlx.lisp b/src/compiler/x86/nlx.lisp index b6914aedd..a29e81d65 100644 --- a/src/compiler/x86/nlx.lisp +++ b/src/compiler/x86/nlx.lisp @@ -67,8 +67,8 @@ (:generator 22 (inst lea block (catch-block-ea tn)) (load-tl-symbol-value temp *current-unwind-protect-block*) - (storew temp block unwind-block-current-uwp-slot) - (storew ebp-tn block unwind-block-current-cont-slot) + (storew temp block unwind-block-uwp-slot) + (storew ebp-tn block unwind-block-cfp-slot) (storew (make-fixup nil :code-object entry-label) block catch-block-entry-pc-slot) #!+win32 @@ -87,8 +87,8 @@ (:generator 44 (inst lea block (catch-block-ea tn)) (load-tl-symbol-value temp *current-unwind-protect-block*) - (storew temp block unwind-block-current-uwp-slot) - (storew ebp-tn block unwind-block-current-cont-slot) + (storew temp block unwind-block-uwp-slot) + (storew ebp-tn block unwind-block-cfp-slot) (storew (make-fixup nil :code-object entry-label) block catch-block-entry-pc-slot) #!+win32 @@ -137,7 +137,7 @@ (progn (loadw seh-frame block unwind-block-next-seh-frame-slot) (inst mov (make-ea :dword :disp 0) seh-frame :fs)) - (loadw block block unwind-block-current-uwp-slot) + (loadw block block unwind-block-uwp-slot) (store-tl-symbol-value block *current-unwind-protect-block* tls))) ;;;; NLX entry VOPs @@ -267,9 +267,9 @@ ;; Set up magic catch / UWP block. (move block esp-tn) (loadw temp uwp sap-pointer-slot other-pointer-lowtag) - (storew temp block unwind-block-current-uwp-slot) + (storew temp block unwind-block-uwp-slot) (loadw temp ofp sap-pointer-slot other-pointer-lowtag) - (storew temp block unwind-block-current-cont-slot) + (storew temp block unwind-block-cfp-slot) (storew (make-fixup nil :code-object entry-label) block diff --git a/src/runtime/monitor.c b/src/runtime/monitor.c index 9045cbe7e..f345bda8a 100644 --- a/src/runtime/monitor.c +++ b/src/runtime/monitor.c @@ -429,13 +429,13 @@ catchers_cmd(char **ptr) printf("0x%08lX:\n\tuwp: 0x%08lX\n\tfp: 0x%08lX\n\t" "code: 0x%08lX\n\tentry: 0x%08lX\n\ttag: ", (uword_t)catch, - (uword_t)(catch->current_uwp), - (uword_t)(catch->current_cont), + (uword_t)(catch->uwp), + (uword_t)(catch->cfp), #if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64) (uword_t)component_ptr_from_pc((void*)catch->entry_pc) + OTHER_POINTER_LOWTAG, #else - (uword_t)(catch->current_code), + (uword_t)(catch->code), #endif (uword_t)(catch->entry_pc)); brief_print((lispobj)catch->tag); -- 2.11.4.GIT