[Qemu-devel] [PULL for-2.3] tcg optimization fix

[Qemu-devel] [PULL for-2.3] tcg optimization fix

[Richard Henderson]

This is the fix for the recently reported abort while
booting a powerpc iso.


r~


The following changes since commit dcf848c478dd8765bd4f746fc4e80eaad44cf87d:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150316' into staging (2015-03-16 13:56:10 +0000)

are available in the git repository at:

  git://github.com/rth7680/qemu.git tags/tcg-pull-20150316

for you to fetch changes up to 2374c4b8375072da1f401c6daccc68ae76c73e63:

  tcg/optimize: Handle or r,a,a with constant a (2015-03-16 08:46:13 -0700)

----------------------------------------------------------------
tcg opt fix for or x,a,a

----------------------------------------------------------------
Richard Henderson (1):
      tcg/optimize: Handle or r,a,a with constant a

 tcg/optimize.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

[Qemu-devel] [PULL] tcg/optimize: Handle or r,a,a with constant a

[Richard Henderson]

As seen with ubuntu-5.10-live-powerpc.iso.

Reported-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Signed-off-by: Richard Henderson <rth@twiddle.net>
---
 tcg/optimize.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tcg/optimize.c b/tcg/optimize.c
index 067917c..37c1110 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -980,8 +980,11 @@ static void tcg_constant_folding(TCGContext *s)
             if (temps_are_copies(args[1], args[2])) {
                 if (temps_are_copies(args[0], args[1])) {
                     tcg_op_remove(s, op);
-                } else {
+                } else if (temps[args[1]].state != TCG_TEMP_CONST) {
                     tcg_opt_gen_mov(s, op, args, opc, args[0], args[1]);
+                } else {
+                    tcg_opt_gen_movi(s, op, args, opc,
+                                     args[0], temps[args[1]].val);
                 }
                 continue;
             }
-- 
2.1.0

Re: [Qemu-devel] [PULL for-2.3] tcg optimization fix

[Peter Maydell]

On 16 March 2015 at 15:50, Richard Henderson <rth@twiddle.net> wrote:
> This is the fix for the recently reported abort while
> booting a powerpc iso.
>
>
> r~
>
>
> The following changes since commit dcf848c478dd8765bd4f746fc4e80eaad44cf87d:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150316' into staging (2015-03-16 13:56:10 +0000)
>
> are available in the git repository at:
>
>   git://github.com/rth7680/qemu.git tags/tcg-pull-20150316
>
> for you to fetch changes up to 2374c4b8375072da1f401c6daccc68ae76c73e63:
>
>   tcg/optimize: Handle or r,a,a with constant a (2015-03-16 08:46:13 -0700)
>
> ----------------------------------------------------------------
> tcg opt fix for or x,a,a
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM