From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LsOGM-00055h-K1 for qemu-devel@nongnu.org; Fri, 10 Apr 2009 17:27:50 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LsOGL-00054m-Ov for qemu-devel@nongnu.org; Fri, 10 Apr 2009 17:27:50 -0400 Received: from [199.232.76.173] (port=34470 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LsOGL-00054X-Is for qemu-devel@nongnu.org; Fri, 10 Apr 2009 17:27:49 -0400 Received: from savannah.gnu.org ([199.232.41.3]:53682 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LsOGL-0008Li-7V for qemu-devel@nongnu.org; Fri, 10 Apr 2009 17:27:49 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1LsOGK-0005zm-OL for qemu-devel@nongnu.org; Fri, 10 Apr 2009 21:27:48 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1LsOGK-0005zi-Fa for qemu-devel@nongnu.org; Fri, 10 Apr 2009 21:27:48 +0000 MIME-Version: 1.0 Errors-To: aurel32 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Aurelien Jarno Message-Id: Date: Fri, 10 Apr 2009 21:27:48 +0000 Subject: [Qemu-devel] [7075] target-alpha: remove amask helper Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 Signed-off-by: Aurelien Jarno 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: