| Message ID | 161700373035.1135822.16451510827008616793.stgit@pasha-ThinkPad-X280 |
|---|---|
| State | New |
| Headers | show |
| Series | target/alpha: fix icount handling for timer instructions | expand |
On 3/29/21 1:42 AM, Pavel Dovgalyuk wrote: > 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> Queued for 6.0. r~
Ping. On 29.03.2021 10:42, Pavel Dovgalyuk wrote: > 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> > --- > target/alpha/translate.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/target/alpha/translate.c b/target/alpha/translate.c > index a02b4e70b7..f454adea5e 100644 > --- a/target/alpha/translate.c > +++ b/target/alpha/translate.c > @@ -1330,7 +1330,7 @@ static DisasJumpType gen_mfpr(DisasContext *ctx, TCGv va, int regno) > case 249: /* VMTIME */ > helper = gen_helper_get_vmtime; > do_helper: > - if (icount_enabled()) { > + if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { > gen_io_start(); > helper(va); > 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) > { > int data; > + DisasJumpType ret = DISAS_NEXT; > > switch (regno) { > case 255: > @@ -1395,6 +1396,10 @@ static DisasJumpType gen_mtpr(DisasContext *ctx, TCGv vb, int regno) > > case 251: > /* ALARM */ > + if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { > + gen_io_start(); > + ret = DISAS_PC_STALE; > + } > gen_helper_set_alarm(cpu_env, vb); > break; > > @@ -1434,7 +1439,7 @@ static DisasJumpType gen_mtpr(DisasContext *ctx, TCGv vb, int regno) > break; > } > > - return DISAS_NEXT; > + return ret; > } > #endif /* !USER_ONLY*/ > >
diff --git a/target/alpha/translate.c b/target/alpha/translate.c index a02b4e70b7..f454adea5e 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -1330,7 +1330,7 @@ static DisasJumpType gen_mfpr(DisasContext *ctx, TCGv va, int regno) case 249: /* VMTIME */ helper = gen_helper_get_vmtime; do_helper: - if (icount_enabled()) { + if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { gen_io_start(); helper(va); 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) { int data; + DisasJumpType ret = DISAS_NEXT; switch (regno) { case 255: @@ -1395,6 +1396,10 @@ static DisasJumpType gen_mtpr(DisasContext *ctx, TCGv vb, int regno) case 251: /* ALARM */ + if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { + gen_io_start(); + ret = DISAS_PC_STALE; + } gen_helper_set_alarm(cpu_env, vb); break; @@ -1434,7 +1439,7 @@ static DisasJumpType gen_mtpr(DisasContext *ctx, TCGv vb, int regno) break; } - return DISAS_NEXT; + return ret; } #endif /* !USER_ONLY*/