[Qemu-devel] [5638] target-alpha: Fix ret instruction

[Aurelien Jarno]

Revision: 5638
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5638
Author:   aurel32
Date:     2008-11-06 09:16:57 +0000 (Thu, 06 Nov 2008)

Log Message:
-----------
target-alpha: Fix ret instruction

Hopefully pine doesn't corrupt this patch, I've had problems recently.

For an alpha "ret" instruction, of the type
     ret $26

The return was being ignored.  This is because in translate.c
register $26 (the return address) was being over-written with the current
PC before it could be jumped to.  Thus the ret was ignored.

This patch just re-orders things so the return address is processed before
it is over-written with the current PC.

(Vince Weaver)

Modified Paths:
--------------
    trunk/target-alpha/translate.c

Modified: trunk/target-alpha/translate.c
===================================================================
--- trunk/target-alpha/translate.c      2008-11-05 21:22:34 UTC (rev 5637)
+++ trunk/target-alpha/translate.c      2008-11-06 09:16:57 UTC (rev 5638)
@@ -1634,12 +1634,12 @@
         break;
 #endif
     case 0x1A:
-        if (ra != 31)
-            tcg_gen_movi_i64(cpu_ir[ra], ctx->pc);
         if (rb != 31)
             tcg_gen_andi_i64(cpu_pc, cpu_ir[rb], ~3);
         else
             tcg_gen_movi_i64(cpu_pc, 0);
+        if (ra != 31)
+            tcg_gen_movi_i64(cpu_ir[ra], ctx->pc);
         /* Those four jumps only differ by the branch prediction hint */
         switch (fn2) {
         case 0x0: