| Message ID | 20110215083954.GA34339@ulanbator.act-europe.fr |
|---|---|
| State | New |
| Headers | show |
On Tue, Feb 15, 2011 at 09:39:54AM +0100, Tristan Gingold wrote: > Handle option '-icount X' on powerpc targets. I've applied this one, thanks. > > Signed-off-by: Tristan Gingold <gingold@adacore.com> > --- > target-ppc/translate_init.c | 42 ++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 42 insertions(+), 0 deletions(-) > > diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c > index 907535e..27aff74 100644 > --- a/target-ppc/translate_init.c > +++ b/target-ppc/translate_init.c > @@ -154,12 +154,26 @@ static void spr_read_ureg (void *opaque, int gprn, int sprn) > #if !defined(CONFIG_USER_ONLY) > static void spr_read_decr (void *opaque, int gprn, int sprn) > { > + if (use_icount) { > + gen_io_start(); > + } > gen_helper_load_decr(cpu_gpr[gprn]); > + if (use_icount) { > + gen_io_end(); > + gen_stop_exception(opaque); > + } > } > > static void spr_write_decr (void *opaque, int sprn, int gprn) > { > + if (use_icount) { > + gen_io_start(); > + } > gen_helper_store_decr(cpu_gpr[gprn]); > + if (use_icount) { > + gen_io_end(); > + gen_stop_exception(opaque); > + } > } > #endif > > @@ -167,12 +181,26 @@ static void spr_write_decr (void *opaque, int sprn, int gprn) > /* Time base */ > static void spr_read_tbl (void *opaque, int gprn, int sprn) > { > + if (use_icount) { > + gen_io_start(); > + } > gen_helper_load_tbl(cpu_gpr[gprn]); > + if (use_icount) { > + gen_io_end(); > + gen_stop_exception(opaque); > + } > } > > static void spr_read_tbu (void *opaque, int gprn, int sprn) > { > + if (use_icount) { > + gen_io_start(); > + } > gen_helper_load_tbu(cpu_gpr[gprn]); > + if (use_icount) { > + gen_io_end(); > + gen_stop_exception(opaque); > + } > } > > __attribute__ (( unused )) > @@ -190,12 +218,26 @@ static void spr_read_atbu (void *opaque, int gprn, int sprn) > #if !defined(CONFIG_USER_ONLY) > static void spr_write_tbl (void *opaque, int sprn, int gprn) > { > + if (use_icount) { > + gen_io_start(); > + } > gen_helper_store_tbl(cpu_gpr[gprn]); > + if (use_icount) { > + gen_io_end(); > + gen_stop_exception(opaque); > + } > } > > static void spr_write_tbu (void *opaque, int sprn, int gprn) > { > + if (use_icount) { > + gen_io_start(); > + } > gen_helper_store_tbu(cpu_gpr[gprn]); > + if (use_icount) { > + gen_io_end(); > + gen_stop_exception(opaque); > + } > } > > __attribute__ (( unused )) > -- > 1.7.3.GIT >
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 907535e..27aff74 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -154,12 +154,26 @@ static void spr_read_ureg (void *opaque, int gprn, int sprn) #if !defined(CONFIG_USER_ONLY) static void spr_read_decr (void *opaque, int gprn, int sprn) { + if (use_icount) { + gen_io_start(); + } gen_helper_load_decr(cpu_gpr[gprn]); + if (use_icount) { + gen_io_end(); + gen_stop_exception(opaque); + } } static void spr_write_decr (void *opaque, int sprn, int gprn) { + if (use_icount) { + gen_io_start(); + } gen_helper_store_decr(cpu_gpr[gprn]); + if (use_icount) { + gen_io_end(); + gen_stop_exception(opaque); + } } #endif @@ -167,12 +181,26 @@ static void spr_write_decr (void *opaque, int sprn, int gprn) /* Time base */ static void spr_read_tbl (void *opaque, int gprn, int sprn) { + if (use_icount) { + gen_io_start(); + } gen_helper_load_tbl(cpu_gpr[gprn]); + if (use_icount) { + gen_io_end(); + gen_stop_exception(opaque); + } } static void spr_read_tbu (void *opaque, int gprn, int sprn) { + if (use_icount) { + gen_io_start(); + } gen_helper_load_tbu(cpu_gpr[gprn]); + if (use_icount) { + gen_io_end(); + gen_stop_exception(opaque); + } } __attribute__ (( unused )) @@ -190,12 +218,26 @@ static void spr_read_atbu (void *opaque, int gprn, int sprn) #if !defined(CONFIG_USER_ONLY) static void spr_write_tbl (void *opaque, int sprn, int gprn) { + if (use_icount) { + gen_io_start(); + } gen_helper_store_tbl(cpu_gpr[gprn]); + if (use_icount) { + gen_io_end(); + gen_stop_exception(opaque); + } } static void spr_write_tbu (void *opaque, int sprn, int gprn) { + if (use_icount) { + gen_io_start(); + } gen_helper_store_tbu(cpu_gpr[gprn]); + if (use_icount) { + gen_io_end(); + gen_stop_exception(opaque); + } } __attribute__ (( unused ))
Handle option '-icount X' on powerpc targets. Signed-off-by: Tristan Gingold <gingold@adacore.com> --- target-ppc/translate_init.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-)