| Message ID | 20181108121646.26173-21-david@gibson.dropbear.id.au |
|---|---|
| State | New |
| Headers | show |
| Series | [PULL,01/22] target/ppc: add external PID support | expand |
On Thu, 8 Nov 2018 23:16:44 +1100 David Gibson <david@gibson.dropbear.id.au> wrote: > From: Maria Klimushenkova <maria.klimushenkova@ispras.ru> > > In this mode writing to interrupt/peripheral state is controlled > by can_do_io flag. This flag must be set explicitly before helper > function invocation. > > Signed-off-by: Maria Klimushenkova <maria.klimushenkova@ispras.ru> > Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru> > Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> > --- The 'This patch fixes ...' wording in the commit title looks weird, and it doesn't even mention the target/ppc subsystem... What about this ? target/ppc: fix processing of rfi instructions in icount mode > target/ppc/translate.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/target/ppc/translate.c b/target/ppc/translate.c > index fb18cedcf0..2b37910248 100644 > --- a/target/ppc/translate.c > +++ b/target/ppc/translate.c > @@ -3919,9 +3919,15 @@ static void gen_rfi(DisasContext *ctx) > } > /* Restore CPU state */ > CHK_SV; > + if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { > + gen_io_start(); > + } > gen_update_cfar(ctx, ctx->base.pc_next - 4); > gen_helper_rfi(cpu_env); > gen_sync_exception(ctx); > + if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { > + gen_io_end(); > + } > #endif > } > > @@ -3933,9 +3939,15 @@ static void gen_rfid(DisasContext *ctx) > #else > /* Restore CPU state */ > CHK_SV; > + if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { > + gen_io_start(); > + } > gen_update_cfar(ctx, ctx->base.pc_next - 4); > gen_helper_rfid(cpu_env); > gen_sync_exception(ctx); > + if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { > + gen_io_end(); > + } > #endif > } >
diff --git a/target/ppc/translate.c b/target/ppc/translate.c index fb18cedcf0..2b37910248 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -3919,9 +3919,15 @@ static void gen_rfi(DisasContext *ctx) } /* Restore CPU state */ CHK_SV; + if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { + gen_io_start(); + } gen_update_cfar(ctx, ctx->base.pc_next - 4); gen_helper_rfi(cpu_env); gen_sync_exception(ctx); + if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { + gen_io_end(); + } #endif } @@ -3933,9 +3939,15 @@ static void gen_rfid(DisasContext *ctx) #else /* Restore CPU state */ CHK_SV; + if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { + gen_io_start(); + } gen_update_cfar(ctx, ctx->base.pc_next - 4); gen_helper_rfid(cpu_env); gen_sync_exception(ctx); + if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { + gen_io_end(); + } #endif }