From 857670698d7c0162f245dcf7a86f8a885dfab9d5 Mon Sep 17 00:00:00 2001 From: Konstantin Kondrashov Date: Mon, 9 Mar 2026 16:54:52 +0200 Subject: [PATCH] fix(xtensa): use LBEG/LCOUNT names in zol macros --- components/xtensa/include/xtensa/xtensa_zol_macros.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/components/xtensa/include/xtensa/xtensa_zol_macros.h b/components/xtensa/include/xtensa/xtensa_zol_macros.h index 424a7e4ecd2..40fcf1d3f8c 100644 --- a/components/xtensa/include/xtensa/xtensa_zol_macros.h +++ b/components/xtensa/include/xtensa/xtensa_zol_macros.h @@ -16,7 +16,6 @@ #if __XTENSA__ #include "xtensa/config/core-isa.h" -#include "xtensa/config/xt_specreg.h" /** * Adjust loop counter and return address for exceptions at LEND. @@ -37,13 +36,13 @@ */ .macro XT_ZOL_EPC_LCOUNT_RESTORE epc_reg tmp_reg #if XCHAL_HAVE_LOOPS - rsr \tmp_reg, XT_REG_LEND + rsr \tmp_reg, LEND bne \epc_reg, \tmp_reg, 1f - rsr \tmp_reg, XT_REG_LCOUNT + rsr \tmp_reg, LCOUNT beqz \tmp_reg, 1f addi \tmp_reg, \tmp_reg, -1 - wsr \tmp_reg, XT_REG_LCOUNT - rsr \epc_reg, XT_REG_LBEG + wsr \tmp_reg, LCOUNT + rsr \epc_reg, LBEG 1: #endif .endm