[Qemu-devel] [7075] target-alpha: remove amask helper

[Qemu-devel] [7075] target-alpha: remove amask helper

[Aurelien Jarno]

Revision: 7075
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7075
Author:   aurel32
Date:     2009-04-10 21:27:48 +0000 (Fri, 10 Apr 2009)
Log Message:
-----------
target-alpha: remove amask helper

The direct use of helper_amask in translate.c was bogus (as env is not
assigned).  Directly code amask in tcg and remove the helper.

Signed-off-by: Tristan Gingold <gingold@adacore.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

Modified Paths:
--------------
    trunk/target-alpha/helper.h
    trunk/target-alpha/op_helper.c
    trunk/target-alpha/translate.c

Modified: trunk/target-alpha/helper.h
===================================================================
--- trunk/target-alpha/helper.h	2009-04-10 21:27:31 UTC (rev 7074)
+++ trunk/target-alpha/helper.h	2009-04-10 21:27:48 UTC (rev 7075)
@@ -3,7 +3,6 @@
 DEF_HELPER_0(tb_flush, void)
 
 DEF_HELPER_2(excp, void, int, int)
-DEF_HELPER_1(amask, i64, i64)
 DEF_HELPER_0(load_pcc, i64)
 DEF_HELPER_0(rc, i64)
 DEF_HELPER_0(rs, i64)

Modified: trunk/target-alpha/op_helper.c
===================================================================
--- trunk/target-alpha/op_helper.c	2009-04-10 21:27:31 UTC (rev 7074)
+++ trunk/target-alpha/op_helper.c	2009-04-10 21:27:48 UTC (rev 7075)
@@ -37,21 +37,6 @@
     cpu_loop_exit();
 }
 
-uint64_t helper_amask (uint64_t arg)
-{
-    switch (env->implver) {
-    case IMPLVER_2106x:
-        /* EV4, EV45, LCA, LCA45 & EV5 */
-        break;
-    case IMPLVER_21164:
-    case IMPLVER_21264:
-    case IMPLVER_21364:
-        arg &= ~env->amask;
-        break;
-    }
-    return arg;
-}
-
 uint64_t helper_load_pcc (void)
 {
     /* XXX: TODO */

Modified: trunk/target-alpha/translate.c
===================================================================
--- trunk/target-alpha/translate.c	2009-04-10 21:27:31 UTC (rev 7074)
+++ trunk/target-alpha/translate.c	2009-04-10 21:27:48 UTC (rev 7075)
@@ -1160,9 +1160,20 @@
             /* AMASK */
             if (likely(rc != 31)) {
                 if (islit)
-                    tcg_gen_movi_i64(cpu_ir[rc], helper_amask(lit));
+                    tcg_gen_movi_i64(cpu_ir[rc], lit);
                 else
-                    gen_helper_amask(cpu_ir[rc], cpu_ir[rb]);
+                    tcg_gen_mov_i64(cpu_ir[rc], cpu_ir[rb]);
+                switch (ctx->env->implver) {
+                case IMPLVER_2106x:
+                    /* EV4, EV45, LCA, LCA45 & EV5 */
+                    break;
+                case IMPLVER_21164:
+                case IMPLVER_21264:
+                case IMPLVER_21364:
+                    tcg_gen_andi_i64(cpu_ir[rc], cpu_ir[rc],
+                                     ~(uint64_t)ctx->amask);
+                    break;
+                }
             }
             break;
         case 0x64: