| Message ID | 1454683067-16001-3-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 05.02.2016 17:37, Peter Maydell wrote: > All Thumb coprocessor instructions are 32 bits, so the IL > bit in the syndrome register should be set. Pass false to the > syn_* function's is_16bit argument rather than s->thumb > so we report the correct IL bit. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Sergey Fedorov <serge.fdrv@gmail.com> > --- > target-arm/translate.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/target-arm/translate.c b/target-arm/translate.c > index 3ec758a..10792e8 100644 > --- a/target-arm/translate.c > +++ b/target-arm/translate.c > @@ -7184,19 +7184,19 @@ static int disas_coproc_insn(DisasContext *s, uint32_t insn) > case 14: > if (is64) { > syndrome = syn_cp14_rrt_trap(1, 0xe, opc1, crm, rt, rt2, > - isread, s->thumb); > + isread, false); > } else { > syndrome = syn_cp14_rt_trap(1, 0xe, opc1, opc2, crn, crm, > - rt, isread, s->thumb); > + rt, isread, false); > } > break; > case 15: > if (is64) { > syndrome = syn_cp15_rrt_trap(1, 0xe, opc1, crm, rt, rt2, > - isread, s->thumb); > + isread, false); > } else { > syndrome = syn_cp15_rt_trap(1, 0xe, opc1, opc2, crn, crm, > - rt, isread, s->thumb); > + rt, isread, false); > } > break; > default:
diff --git a/target-arm/translate.c b/target-arm/translate.c index 3ec758a..10792e8 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -7184,19 +7184,19 @@ static int disas_coproc_insn(DisasContext *s, uint32_t insn) case 14: if (is64) { syndrome = syn_cp14_rrt_trap(1, 0xe, opc1, crm, rt, rt2, - isread, s->thumb); + isread, false); } else { syndrome = syn_cp14_rt_trap(1, 0xe, opc1, opc2, crn, crm, - rt, isread, s->thumb); + rt, isread, false); } break; case 15: if (is64) { syndrome = syn_cp15_rrt_trap(1, 0xe, opc1, crm, rt, rt2, - isread, s->thumb); + isread, false); } else { syndrome = syn_cp15_rt_trap(1, 0xe, opc1, opc2, crn, crm, - rt, isread, s->thumb); + rt, isread, false); } break; default:
All Thumb coprocessor instructions are 32 bits, so the IL bit in the syndrome register should be set. Pass false to the syn_* function's is_16bit argument rather than s->thumb so we report the correct IL bit. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- target-arm/translate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)