[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 3/9] target/xtensa: Make sure that tb->size != 0
From: |
Cornelia Huck |
Subject: |
[PULL v2 3/9] target/xtensa: Make sure that tb->size != 0 |
Date: |
Thu, 20 May 2021 19:05:13 +0200 |
From: Ilya Leoshkevich <iii@linux.ibm.com>
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>
Message-Id: <20210416154939.32404-4-iii@linux.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
target/xtensa/translate.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c
index 0ae4efc48a17..73584d9d605b 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.31.1
- [PULL v2 0/9] s390x update, Cornelia Huck, 2021/05/20
- [PULL v2 1/9] target/s390x: Fix translation exception on illegal instruction, Cornelia Huck, 2021/05/20
- [PULL v2 2/9] target/arm: Make sure that commpage's tb->size != 0, Cornelia Huck, 2021/05/20
- [PULL v2 3/9] target/xtensa: Make sure that tb->size != 0,
Cornelia Huck <=
- [PULL v2 4/9] accel/tcg: Assert that tb->size != 0 after translation, Cornelia Huck, 2021/05/20
- [PULL v2 5/9] vfio-ccw: Permit missing IRQs, Cornelia Huck, 2021/05/20
- [PULL v2 6/9] hw/s390x/ccw: Register qbus type in abstract TYPE_CCW_DEVICE parent, Cornelia Huck, 2021/05/20
- [PULL v2 7/9] vfio-ccw: Attempt to clean up all IRQs on error, Cornelia Huck, 2021/05/20
- [PULL v2 8/9] target/i386: Make sure that vsyscall's tb->size != 0, Cornelia Huck, 2021/05/20
- [PULL v2 9/9] tests/tcg/x86_64: add vsyscall smoke test, Cornelia Huck, 2021/05/20
- Re: [PULL v2 0/9] s390x update, Peter Maydell, 2021/05/20