[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 3/4] target/xtensa: Make sure that tb->size != 0
From: |
Ilya Leoshkevich |
Subject: |
[PATCH v5 3/4] target/xtensa: Make sure that tb->size != 0 |
Date: |
Fri, 16 Apr 2021 17:49:38 +0200 |
tb_gen_code() assumes that tb->size must never be zero, otherwise it
may produce spurious exceptions. For xtensa this may happen when
decoding an unknown instruction, when handling a write into the
CCOUNT or CCOMPARE special register and when single-stepping the first
instruction of an exception handler.
Fix by pretending that the size of the respective translation block is
1 in all these cases.
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Tested-by: Max Filippov <jcmvbkbc@gmail.com>
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
---
target/xtensa/translate.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c
index 0ae4efc48a..73584d9d60 100644
--- a/target/xtensa/translate.c
+++ b/target/xtensa/translate.c
@@ -917,6 +917,7 @@ static void disas_xtensa_insn(CPUXtensaState *env,
DisasContext *dc)
"unknown instruction length (pc = %08x)\n",
dc->pc);
gen_exception_cause(dc, ILLEGAL_INSTRUCTION_CAUSE);
+ dc->base.pc_next = dc->pc + 1;
return;
}
@@ -1274,11 +1275,13 @@ static void xtensa_tr_translate_insn(DisasContextBase
*dcbase, CPUState *cpu)
if ((tb_cflags(dc->base.tb) & CF_USE_ICOUNT)
&& (dc->base.tb->flags & XTENSA_TBFLAG_YIELD)) {
gen_exception(dc, EXCP_YIELD);
+ dc->base.pc_next = dc->pc + 1;
dc->base.is_jmp = DISAS_NORETURN;
return;
}
if (dc->base.tb->flags & XTENSA_TBFLAG_EXCEPTION) {
gen_exception(dc, EXCP_DEBUG);
+ dc->base.pc_next = dc->pc + 1;
dc->base.is_jmp = DISAS_NORETURN;
return;
}
--
2.29.2
- [PATCH v5 0/4] accel/tcg: Make sure that tb->size != 0 after translation, Ilya Leoshkevich, 2021/04/16
- [PATCH v5 2/4] target/arm: Make sure that commpage's tb->size != 0, Ilya Leoshkevich, 2021/04/16
- [PATCH v5 3/4] target/xtensa: Make sure that tb->size != 0,
Ilya Leoshkevich <=
- [PATCH v5 1/4] target/s390x: Fix translation exception on illegal instruction, Ilya Leoshkevich, 2021/04/16
- [PATCH v5 4/4] accel/tcg: Assert that tb->size != 0 after translation, Ilya Leoshkevich, 2021/04/16
- Re: [PATCH v5 0/4] accel/tcg: Make sure that tb->size != 0 after translation, Cornelia Huck, 2021/04/23
- Re: [PATCH v5 0/4] accel/tcg: Make sure that tb->size != 0 after translation, Cornelia Huck, 2021/04/26