target/alpha: fix icount handling for timer instructions
This patch handles icount mode for timer read/write instructions, because it is required to call gen_io_start in such cases. Signed-off-by: Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <161700373035.1135822.16451510827008616793.stgit@pasha-ThinkPad-X280> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
4e655e3cd8
commit
ef951ee33f
|
@ -1330,7 +1330,7 @@ static DisasJumpType gen_mfpr(DisasContext *ctx, TCGv va, int regno)
|
||||||
case 249: /* VMTIME */
|
case 249: /* VMTIME */
|
||||||
helper = gen_helper_get_vmtime;
|
helper = gen_helper_get_vmtime;
|
||||||
do_helper:
|
do_helper:
|
||||||
if (icount_enabled()) {
|
if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
|
||||||
gen_io_start();
|
gen_io_start();
|
||||||
helper(va);
|
helper(va);
|
||||||
return DISAS_PC_STALE;
|
return DISAS_PC_STALE;
|
||||||
|
@ -1366,6 +1366,7 @@ static DisasJumpType gen_mfpr(DisasContext *ctx, TCGv va, int regno)
|
||||||
static DisasJumpType gen_mtpr(DisasContext *ctx, TCGv vb, int regno)
|
static DisasJumpType gen_mtpr(DisasContext *ctx, TCGv vb, int regno)
|
||||||
{
|
{
|
||||||
int data;
|
int data;
|
||||||
|
DisasJumpType ret = DISAS_NEXT;
|
||||||
|
|
||||||
switch (regno) {
|
switch (regno) {
|
||||||
case 255:
|
case 255:
|
||||||
|
@ -1395,6 +1396,10 @@ static DisasJumpType gen_mtpr(DisasContext *ctx, TCGv vb, int regno)
|
||||||
|
|
||||||
case 251:
|
case 251:
|
||||||
/* ALARM */
|
/* ALARM */
|
||||||
|
if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
|
||||||
|
gen_io_start();
|
||||||
|
ret = DISAS_PC_STALE;
|
||||||
|
}
|
||||||
gen_helper_set_alarm(cpu_env, vb);
|
gen_helper_set_alarm(cpu_env, vb);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -1434,7 +1439,7 @@ static DisasJumpType gen_mtpr(DisasContext *ctx, TCGv vb, int regno)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return DISAS_NEXT;
|
return ret;
|
||||||
}
|
}
|
||||||
#endif /* !USER_ONLY*/
|
#endif /* !USER_ONLY*/
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue