From fecbacd785c0d4b154417ad853f83e797642e8c9 Mon Sep 17 00:00:00 2001 From: Stas Boukarev Date: Sat, 30 Apr 2016 19:28:21 +0300 Subject: [PATCH] x86-64/nlx: use unwind-block and catch-block consistently. --- src/compiler/x86-64/nlx.lisp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/compiler/x86-64/nlx.lisp b/src/compiler/x86-64/nlx.lisp index bd0c3b0cc..20f3608f5 100644 --- a/src/compiler/x86-64/nlx.lisp +++ b/src/compiler/x86-64/nlx.lisp @@ -69,7 +69,7 @@ (storew temp block unwind-block-current-uwp-slot) (storew rbp-tn block unwind-block-current-cont-slot) (inst lea temp (make-fixup nil :code-object entry-label)) - (storew temp block catch-block-entry-pc-slot))) + (storew temp block unwind-block-entry-pc-slot))) ;;; like MAKE-UNWIND-BLOCK, except that we also store in the specified ;;; tag, and link the block into the CURRENT-CATCH list @@ -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 unwind-block-current-uwp-slot) - (storew rbp-tn block unwind-block-current-cont-slot) + (storew temp block catch-block-current-uwp-slot) + (storew rbp-tn block catch-block-current-cont-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) @@ -250,9 +250,7 @@ (storew temp block unwind-block-current-cont-slot) (inst lea temp-reg-tn (make-fixup nil :code-object entry-label)) - (storew temp-reg-tn - block - catch-block-entry-pc-slot) + (storew temp-reg-tn block unwind-block-entry-pc-slot) ;; Run any required UWPs. (inst mov temp-reg-tn (make-fixup 'unwind :assembly-routine)) -- 2.11.4.GIT