* [PATCH] target/alpha: fix icount handling for timer instructions
@ 2020-11-05 9:04 Pavel Dovgalyuk
2020-11-05 21:35 ` Richard Henderson
0 siblings, 1 reply; 5+ messages in thread
From: Pavel Dovgalyuk @ 2020-11-05 9:04 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, pavel.dovgalyuk
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>
---
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 36be602179..b534b0579d 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*/
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH] target/alpha: fix icount handling for timer instructions
@ 2021-03-29 7:42 Pavel Dovgalyuk
2021-03-29 16:34 ` Richard Henderson
2021-04-05 5:50 ` Pavel Dovgalyuk
0 siblings, 2 replies; 5+ messages in thread
From: Pavel Dovgalyuk @ 2021-03-29 7:42 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, pavel.dovgalyuk
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*/
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] target/alpha: fix icount handling for timer instructions
2021-03-29 7:42 Pavel Dovgalyuk
@ 2021-03-29 16:34 ` Richard Henderson
2021-04-05 5:50 ` Pavel Dovgalyuk
1 sibling, 0 replies; 5+ messages in thread
From: Richard Henderson @ 2021-03-29 16:34 UTC (permalink / raw)
To: Pavel Dovgalyuk, qemu-devel
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~
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] target/alpha: fix icount handling for timer instructions
2021-03-29 7:42 Pavel Dovgalyuk
2021-03-29 16:34 ` Richard Henderson
@ 2021-04-05 5:50 ` Pavel Dovgalyuk
1 sibling, 0 replies; 5+ messages in thread
From: Pavel Dovgalyuk @ 2021-04-05 5:50 UTC (permalink / raw)
To: qemu-devel, Paolo Bonzini; +Cc: richard.henderson
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*/
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-04-05 5:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-05 9:04 [PATCH] target/alpha: fix icount handling for timer instructions Pavel Dovgalyuk
2020-11-05 21:35 ` Richard Henderson
2021-03-29 7:42 Pavel Dovgalyuk
2021-03-29 16:34 ` Richard Henderson
2021-04-05 5:50 ` Pavel Dovgalyuk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.