Patchwork Handle icount for powerpc tbl/tbu/decr load and store.

login
register
mail settings
Submitter Tristan Gingold
Date Feb. 8, 2011, 9:59 a.m.
Message ID <1297159190-29092-1-git-send-email-gingold@adacore.com>
Download mbox | patch
Permalink /patch/82276/
State New
Headers show

Comments

Tristan Gingold - Feb. 8, 2011, 9:59 a.m.
Handle option '-icount X' on powerpc targets.

Signed-off-by: Tristan Gingold <gingold@adacore.com>
---
 target-ppc/translate_init.c |   36 ++++++++++++++++++++++++++++++++++++
 1 files changed, 36 insertions(+), 0 deletions(-)
Tristan Gingold - Feb. 14, 2011, 10:07 a.m.
Potential reviewers CC:

On Feb 8, 2011, at 10:59 AM, Tristan Gingold wrote:

> Handle option '-icount X' on powerpc targets.
> 
> Signed-off-by: Tristan Gingold <gingold@adacore.com>
> ---
> target-ppc/translate_init.c |   36 ++++++++++++++++++++++++++++++++++++
> 1 files changed, 36 insertions(+), 0 deletions(-)
> 
> diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
> index 907535e..7ef86ad 100644
> --- a/target-ppc/translate_init.c
> +++ b/target-ppc/translate_init.c
> @@ -154,12 +154,24 @@ 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 +179,24 @@ 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 +214,24 @@ 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
> 
>
Alexander Graf - Feb. 14, 2011, 11:34 a.m.
Tristan Gingold wrote:
> Potential reviewers CC:
>
> On Feb 8, 2011, at 10:59 AM, Tristan Gingold wrote:
>
>   
>> Handle option '-icount X' on powerpc targets.
>>
>> Signed-off-by: Tristan Gingold <gingold@adacore.com>
>>     

Braces are broken. Edgar knows his way around icount a lot better than
me - I've never actually used it. Edgar, any comments?


Alex
Edgar Iglesias - Feb. 14, 2011, 11:46 a.m.
On Mon, Feb 14, 2011 at 12:34:05PM +0100, Alexander Graf wrote:
> Tristan Gingold wrote:
> > Potential reviewers CC:
> >
> > On Feb 8, 2011, at 10:59 AM, Tristan Gingold wrote:
> >
> >   
> >> Handle option '-icount X' on powerpc targets.
> >>
> >> Signed-off-by: Tristan Gingold <gingold@adacore.com>
> >>     
> 
> Braces are broken. Edgar knows his way around icount a lot better than
> me - I've never actually used it. Edgar, any comments?

AFAICS, the patch looks OK (except for the indentation).

Cheers
Tristan Gingold - Feb. 14, 2011, 11:55 a.m.
On Feb 14, 2011, at 12:46 PM, Edgar E. Iglesias wrote:

> On Mon, Feb 14, 2011 at 12:34:05PM +0100, Alexander Graf wrote:
>> Tristan Gingold wrote:
>>> Potential reviewers CC:
>>> 
>>> On Feb 8, 2011, at 10:59 AM, Tristan Gingold wrote:
>>> 
>>> 
>>>> Handle option '-icount X' on powerpc targets.
>>>> 
>>>> Signed-off-by: Tristan Gingold <gingold@adacore.com>
>>>> 
>> 
>> Braces are broken. Edgar knows his way around icount a lot better than
>> me - I've never actually used it. Edgar, any comments?
> 
> AFAICS, the patch looks OK (except for the indentation).

Thanks.  New version soon.

Patch

diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index 907535e..7ef86ad 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -154,12 +154,24 @@  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 +179,24 @@  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 +214,24 @@  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 ))