Received: from eggs.gnu.org ([2001:4830:134:3::10]:53784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqmY5-0007bY-4c for qemu-devel@nongnu.org; Wed, 11 Dec 2013 11:22:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VqmY0-0002BZ-NQ for qemu-devel@nongnu.org; Wed, 11 Dec 2013 11:22:09 -0500 Received: from hall.aurel32.net ([2001:bc8:30d7:101::1]:47972) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqmY0-0002BN-HB for qemu-devel@nongnu.org; Wed, 11 Dec 2013 11:22:04 -0500 From: Aurelien Jarno Date: Wed, 11 Dec 2013 15:13:03 +0100 Message-Id: <1386771186-7442-2-git-send-email-aurelien@aurel32.net> In-Reply-To: <1386771186-7442-1-git-send-email-aurelien@aurel32.net> References: <1386771186-7442-1-git-send-email-aurelien@aurel32.net> Subject: [Qemu-devel] [PATCH v3 1/4] tcg/optimize: fix known-zero bits for right shift ops List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-stable@nongnu.org, Aurelien Jarno 32-bit versions of sar and shr ops should not propagate known-zero bits from the unused 32 high bits. For sar it could even lead to wrong code being generated. Cc: Paolo Bonzini Cc: qemu-stable@nongnu.org Reviewed-by: Richard Henderson Signed-off-by: Aurelien Jarno --- tcg/optimize.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/tcg/optimize.c b/tcg/optimize.c index 89e2d6a..c03d2f0 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -726,16 +726,29 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr, mask = temps[args[1]].mask & mask; break; - CASE_OP_32_64(sar): + case INDEX_op_sar_i32: + if (temps[args[2]].state == TCG_TEMP_CONST) { + mask = ((int32_t)temps[args[1]].mask + >> temps[args[2]].val); + } + break; + case INDEX_op_sar_i64: if (temps[args[2]].state == TCG_TEMP_CONST) { - mask = ((tcg_target_long)temps[args[1]].mask + mask = ((int64_t)temps[args[1]].mask >> temps[args[2]].val); } break; - CASE_OP_32_64(shr): + case INDEX_op_shr_i32: if (temps[args[2]].state == TCG_TEMP_CONST) { - mask = temps[args[1]].mask >> temps[args[2]].val; + mask = ((uint32_t)temps[args[1]].mask + >> temps[args[2]].val); + } + break; + case INDEX_op_shr_i64: + if (temps[args[2]].state == TCG_TEMP_CONST) { + mask = ((uint64_t)temps[args[1]].mask + >> temps[args[2]].val); } break; -- 1.7.10.4