From patchwork Sun Jun 3 14:31:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 162552 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 10EA9B6FA1 for ; Mon, 4 Jun 2012 01:23:14 +1000 (EST) Received: from localhost ([::1]:39129 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbBsN-0001q8-I0 for incoming@patchwork.ozlabs.org; Sun, 03 Jun 2012 10:33:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36007) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbBqA-0007S6-78 for qemu-devel@nongnu.org; Sun, 03 Jun 2012 10:31:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SbBq7-000366-HT for qemu-devel@nongnu.org; Sun, 03 Jun 2012 10:31:33 -0400 Received: from mail-ob0-f173.google.com ([209.85.214.173]:48261) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbBq7-00035a-7q for qemu-devel@nongnu.org; Sun, 03 Jun 2012 10:31:31 -0400 Received: by obbwd20 with SMTP id wd20so6543165obb.4 for ; Sun, 03 Jun 2012 07:31:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to:content-type; bh=O7+wym+R8jj8+58qx60DLetq9eSBlMbkGO14kkLi1sg=; b=rMzhLX7fbEuNqbCCITmxRCwSij3muckfLLACWQ0TwELMQParirNnrXddFppC6GxrqE 4Ki7vdTCieLNJfU9q1MVsAF3FvdeFhtnDUu0flKYqIe4AInnLAYRgF3y679aOTZ7fs3R 2Dl0UsKwzA2lynVZuO8xrCgH0Li7J6s8Kj4+CMMeCgQNBt5mf7RWkmcrJNnDGcrOkO59 CRparJqPq0A2s9ibPijdOVZoeaDFgETeLKIsfuNztwIJZGsfi5HPsE5opOoVkW779yjA jRHHrLp2cJdGlJ2vD1KkNNDTiwX1is4E0usqGYME14W15gP9zDne6orqQeWnWnsaOVMJ mCdw== Received: by 10.50.149.198 with SMTP id uc6mr5813788igb.2.1338733889427; Sun, 03 Jun 2012 07:31:29 -0700 (PDT) MIME-Version: 1.0 Received: by 10.64.38.68 with HTTP; Sun, 3 Jun 2012 07:31:09 -0700 (PDT) From: Blue Swirl Date: Sun, 3 Jun 2012 14:31:09 +0000 Message-ID: To: qemu-devel X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.173 Subject: [Qemu-devel] [PATCH 09/25] x86: fix coding style in helper_template.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Fix coding style in helper_template.h before next commit. Signed-off-by: Blue Swirl --- target-i386/helper_template.h | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (lshift(src ^ t0, 11 - (DATA_BITS - 1)) & CC_O) | @@ -311,9 +328,11 @@ target_ulong glue(helper_rcr, SUFFIX)(target_ulong t0, target_ulong t1) eflags = helper_cc_compute_all(CC_OP); t0 &= DATA_MASK; src = t0; - res = (t0 >> count) | ((target_ulong)(eflags & CC_C) << (DATA_BITS - count)); - if (count > 1) + res = (t0 >> count) | + ((target_ulong)(eflags & CC_C) << (DATA_BITS - count)); + if (count > 1) { res |= t0 << (DATA_BITS + 1 - count); + } t0 = res; env->cc_tmp = (eflags & ~(CC_C | CC_O)) | (lshift(src ^ t0, 11 - (DATA_BITS - 1)) & CC_O) | diff --git a/target-i386/helper_template.h b/target-i386/helper_template.h index afc41fb..8b2d4f0 100644 --- a/target-i386/helper_template.h +++ b/target-i386/helper_template.h @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ + #define DATA_BITS (1 << (3 + SHIFT)) #define SHIFT_MASK (DATA_BITS - 1) #define SIGN_MASK (((target_ulong)1) << (DATA_BITS - 1)) @@ -55,6 +56,7 @@ static int glue(compute_all_add, SUFFIX)(void) { int cf, pf, af, zf, sf, of; target_long src1, src2; + src1 = CC_SRC; src2 = CC_DST - CC_SRC; cf = (DATA_TYPE)CC_DST < (DATA_TYPE)src1; @@ -70,6 +72,7 @@ static int glue(compute_c_add, SUFFIX)(void) { int cf; target_long src1; + src1 = CC_SRC; cf = (DATA_TYPE)CC_DST < (DATA_TYPE)src1; return cf; @@ -79,6 +82,7 @@ static int glue(compute_all_adc, SUFFIX)(void) { int cf, pf, af, zf, sf, of; target_long src1, src2; + src1 = CC_SRC; src2 = CC_DST - CC_SRC - 1; cf = (DATA_TYPE)CC_DST <= (DATA_TYPE)src1; @@ -94,6 +98,7 @@ static int glue(compute_c_adc, SUFFIX)(void) { int cf; target_long src1; + src1 = CC_SRC; cf = (DATA_TYPE)CC_DST <= (DATA_TYPE)src1; return cf; @@ -103,6 +108,7 @@ static int glue(compute_all_sub, SUFFIX)(void) { int cf, pf, af, zf, sf, of; target_long src1, src2; + src1 = CC_DST + CC_SRC; src2 = CC_SRC; cf = (DATA_TYPE)src1 < (DATA_TYPE)src2; @@ -118,6 +124,7 @@ static int glue(compute_c_sub, SUFFIX)(void) { int cf; target_long src1, src2; + src1 = CC_DST + CC_SRC; src2 = CC_SRC; cf = (DATA_TYPE)src1 < (DATA_TYPE)src2; @@ -128,6 +135,7 @@ static int glue(compute_all_sbb, SUFFIX)(void) { int cf, pf, af, zf, sf, of; target_long src1, src2; + src1 = CC_DST + CC_SRC + 1; src2 = CC_SRC; cf = (DATA_TYPE)src1 <= (DATA_TYPE)src2; @@ -143,6 +151,7 @@ static int glue(compute_c_sbb, SUFFIX)(void) { int cf; target_long src1, src2; + src1 = CC_DST + CC_SRC + 1; src2 = CC_SRC; cf = (DATA_TYPE)src1 <= (DATA_TYPE)src2; @@ -152,6 +161,7 @@ static int glue(compute_c_sbb, SUFFIX)(void) static int glue(compute_all_logic, SUFFIX)(void) { int cf, pf, af, zf, sf, of; + cf = 0; pf = parity_table[(uint8_t)CC_DST]; af = 0; @@ -170,6 +180,7 @@ static int glue(compute_all_inc, SUFFIX)(void) { int cf, pf, af, zf, sf, of; target_long src1, src2; + src1 = CC_DST - 1; src2 = 1; cf = CC_SRC; @@ -192,6 +203,7 @@ static int glue(compute_all_dec, SUFFIX)(void) { int cf, pf, af, zf, sf, of; target_long src1, src2; + src1 = CC_DST + 1; src2 = 1; cf = CC_SRC; @@ -206,6 +218,7 @@ static int glue(compute_all_dec, SUFFIX)(void) static int glue(compute_all_shl, SUFFIX)(void) { int cf, pf, af, zf, sf, of; + cf = (CC_SRC >> (DATA_BITS - 1)) & CC_C; pf = parity_table[(uint8_t)CC_DST]; af = 0; /* undefined */ @@ -231,6 +244,7 @@ static int glue(compute_c_sar, SUFFIX)(void) static int glue(compute_all_sar, SUFFIX)(void) { int cf, pf, af, zf, sf, of; + cf = CC_SRC & 1; pf = parity_table[(uint8_t)CC_DST]; af = 0; /* undefined */ @@ -245,6 +259,7 @@ static int glue(compute_all_sar, SUFFIX)(void) static int glue(compute_c_mul, SUFFIX)(void) { int cf; + cf = (CC_SRC != 0); return cf; } @@ -255,6 +270,7 @@ static int glue(compute_c_mul, SUFFIX)(void) static int glue(compute_all_mul, SUFFIX)(void) { int cf, pf, af, zf, sf, of; + cf = (CC_SRC != 0); pf = parity_table[(uint8_t)CC_DST]; af = 0; /* undefined */ @@ -283,8 +299,9 @@ target_ulong glue(helper_rcl, SUFFIX)(target_ulong t0, target_ulong t1) t0 &= DATA_MASK; src = t0; res = (t0 << count) | ((target_ulong)(eflags & CC_C) << (count - 1)); - if (count > 1) + if (count > 1) { res |= t0 >> (DATA_BITS + 1 - count); + } t0 = res; env->cc_tmp = (eflags & ~(CC_C | CC_O)) |