From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MoMfA-0000Kb-8h
	for qemu-devel@nongnu.org; Thu, 17 Sep 2009 15:29:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MoMf4-0000KL-Qb
	for qemu-devel@nongnu.org; Thu, 17 Sep 2009 15:29:02 -0400
Received: from [199.232.76.173] (port=46363 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MoMf4-0000KI-Kl
	for qemu-devel@nongnu.org; Thu, 17 Sep 2009 15:28:58 -0400
Received: from csl.cornell.edu ([128.84.224.10]:4028 helo=vlsi.csl.cornell.edu)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <vince@stanley.csl.cornell.edu>) id 1MoMf3-0007ep-R2
	for qemu-devel@nongnu.org; Thu, 17 Sep 2009 15:28:58 -0400
Received: from stanley.csl.cornell.edu (stanley.csl.cornell.edu
	[128.84.224.15])
	by vlsi.csl.cornell.edu (8.13.4/8.13.4) with ESMTP id n8HJSq4c053669
	for <qemu-devel@nongnu.org>; Thu, 17 Sep 2009 15:28:57 -0400 (EDT)
Date: Thu, 17 Sep 2009 15:28:52 -0400 (EDT)
From: Vince Weaver <vince@csl.cornell.edu>
Message-ID: <20090917152502.G54732@stanley.csl.cornell.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Subject: [Qemu-devel] [PATCH] Fix extlh instruction on Alpha
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org


The extlh instruction on Alpha currently doesn't work properly.
It's a combination of a cut/paste bug (16 where it should be 32) as well 
as a "shift by 64" bug.

This improves on an earlier patch that used labels, conditional jumps, 
and local variables.  Thanks go especially to Aurelien Jarno and Andreas 
Schwab who have a much better eye for bit-wise TCG optimization than I do.

Vince

Signed-off-by: Vince Weaver <vince@csl.cornell.edu>

diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index 9d2bc45..9e7e9b2 100644
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -524,14 +524,15 @@ static inline void gen_ext_h(void(*tcg_gen_ext_i64)(TCGv t0, TCGv t1),
             else
                 tcg_gen_mov_i64(cpu_ir[rc], cpu_ir[ra]);
         } else {
-            TCGv tmp1, tmp2;
+            TCGv tmp1;
             tmp1 = tcg_temp_new();
+
             tcg_gen_andi_i64(tmp1, cpu_ir[rb], 7);
             tcg_gen_shli_i64(tmp1, tmp1, 3);
-            tmp2 = tcg_const_i64(64);
-            tcg_gen_sub_i64(tmp1, tmp2, tmp1);
-            tcg_temp_free(tmp2);
+            tcg_gen_neg_i64(tmp1, tmp1);
+            tcg_gen_andi_i64(tmp1, tmp1, 0x3f);
             tcg_gen_shl_i64(cpu_ir[rc], cpu_ir[ra], tmp1);
+
             tcg_temp_free(tmp1);
         }
         if (tcg_gen_ext_i64)
@@ -1316,7 +1317,7 @@ static inline int translate_one(DisasContext *ctx, uint32_t insn)
             break;
         case 0x6A:
             /* EXTLH */
-            gen_ext_h(&tcg_gen_ext16u_i64, ra, rb, rc, islit, lit);
+            gen_ext_h(&tcg_gen_ext32u_i64, ra, rb, rc, islit, lit);
             break;
         case 0x72:
             /* MSKQH */