Patchwork tcg/ppc64: Fix zero extension code generation bug for ppc64 host

login
register
mail settings
Submitter David Gibson
Date Sept. 9, 2011, 5:58 a.m.
Message ID <1315547917-12226-1-git-send-email-david@gibson.dropbear.id.au>
Download mbox | patch
Permalink /patch/114013/
State New
Headers show

Comments

David Gibson - Sept. 9, 2011, 5:58 a.m.
From: Thomas Huth <thuth@de.ibm.com>

The ppc64 code generation backend uses an rldicr (Rotate Left Double
Immediate and Clear Right) instruction to implement zero extension of
a 32 bit quantity to a 64 bit quantity (INDEX_op_ext32u_i64).  However
this is wrong - this instruction clears specified low bits of the
value, instead of high bits as we require for a zero extension.  It
should instead use an rldicl (Rotate Left Double Immediate and Clear
Left) instruction.

Presumably amongst other things, this causes the SLOF firmware image
used with -M pseries to not boot on a ppc64 host.

It appears this bug was exposed by commit
0bf1dbdcc935dfc220a93cd990e947e90706aec6 (tcg/ppc64: fix 16/32 mixup)
which enabled the use of the op_ext32u_i64 operation on the ppc64
backend.

Signed-off-by: Thomas Huth <thuth@de.ibm.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 tcg/ppc64/tcg-target.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Alexander Graf - Sept. 9, 2011, 9:31 a.m.
On 09.09.2011, at 07:58, David Gibson wrote:

> From: Thomas Huth <thuth@de.ibm.com>
> 
> The ppc64 code generation backend uses an rldicr (Rotate Left Double
> Immediate and Clear Right) instruction to implement zero extension of
> a 32 bit quantity to a 64 bit quantity (INDEX_op_ext32u_i64).  However
> this is wrong - this instruction clears specified low bits of the
> value, instead of high bits as we require for a zero extension.  It
> should instead use an rldicl (Rotate Left Double Immediate and Clear
> Left) instruction.
> 
> Presumably amongst other things, this causes the SLOF firmware image
> used with -M pseries to not boot on a ppc64 host.
> 
> It appears this bug was exposed by commit
> 0bf1dbdcc935dfc220a93cd990e947e90706aec6 (tcg/ppc64: fix 16/32 mixup)
> which enabled the use of the op_ext32u_i64 operation on the ppc64
> backend.

Very nice! Let's ask Andreas and/or malc to take care of it though :)


Alex

> 
> Signed-off-by: Thomas Huth <thuth@de.ibm.com>
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> tcg/ppc64/tcg-target.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c
> index d831684..e3c63ad 100644
> --- a/tcg/ppc64/tcg-target.c
> +++ b/tcg/ppc64/tcg-target.c
> @@ -1560,7 +1560,7 @@ static void tcg_out_op (TCGContext *s, TCGOpcode opc, const TCGArg *args,
>         break;
> 
>     case INDEX_op_ext32u_i64:
> -        tcg_out_rld (s, RLDICR, args[0], args[1], 0, 32);
> +        tcg_out_rld (s, RLDICL, args[0], args[1], 0, 32);
>         break;
> 
>     case INDEX_op_setcond_i32:
> -- 
> 1.7.5.4
>
malc - Sept. 9, 2011, 3:09 p.m.
On Fri, 9 Sep 2011, David Gibson wrote:

> From: Thomas Huth <thuth@de.ibm.com>
> 
> The ppc64 code generation backend uses an rldicr (Rotate Left Double
> Immediate and Clear Right) instruction to implement zero extension of
> a 32 bit quantity to a 64 bit quantity (INDEX_op_ext32u_i64).  However
> this is wrong - this instruction clears specified low bits of the
> value, instead of high bits as we require for a zero extension.  It
> should instead use an rldicl (Rotate Left Double Immediate and Clear
> Left) instruction.
> 
> Presumably amongst other things, this causes the SLOF firmware image
> used with -M pseries to not boot on a ppc64 host.
> 
> It appears this bug was exposed by commit
> 0bf1dbdcc935dfc220a93cd990e947e90706aec6 (tcg/ppc64: fix 16/32 mixup)
> which enabled the use of the op_ext32u_i64 operation on the ppc64
> backend.
> 

Bloody ibm blefuscudians... Thanks, applied.

[..snip..]

Patch

diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c
index d831684..e3c63ad 100644
--- a/tcg/ppc64/tcg-target.c
+++ b/tcg/ppc64/tcg-target.c
@@ -1560,7 +1560,7 @@  static void tcg_out_op (TCGContext *s, TCGOpcode opc, const TCGArg *args,
         break;
 
     case INDEX_op_ext32u_i64:
-        tcg_out_rld (s, RLDICR, args[0], args[1], 0, 32);
+        tcg_out_rld (s, RLDICL, args[0], args[1], 0, 32);
         break;
 
     case INDEX_op_setcond_i32: