From patchwork Mon May 23 21:42:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 97082 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 88EE7B6F74 for ; Tue, 24 May 2011 07:43:28 +1000 (EST) Received: from localhost ([::1]:36223 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOcuL-0005xr-KJ for incoming@patchwork.ozlabs.org; Mon, 23 May 2011 17:43:25 -0400 Received: from eggs.gnu.org ([140.186.70.92]:58414) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOcts-0005rO-Eu for qemu-devel@nongnu.org; Mon, 23 May 2011 17:42:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QOctq-0003Ch-Qm for qemu-devel@nongnu.org; Mon, 23 May 2011 17:42:56 -0400 Received: from hall.aurel32.net ([88.191.126.93]:53488) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOctq-0003CP-MD for qemu-devel@nongnu.org; Mon, 23 May 2011 17:42:54 -0400 Received: from [2001:470:d4ed:0:5e26:aff:fe2b:6f5b] (helo=volta.aurel32.net) by hall.aurel32.net with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1QOctp-0000ZW-Ve; Mon, 23 May 2011 23:42:54 +0200 Received: from aurel32 by volta.aurel32.net with local (Exim 4.76) (envelope-from ) id 1QOcto-0002Vy-TF; Mon, 23 May 2011 23:42:52 +0200 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Mon, 23 May 2011 23:42:43 +0200 Message-Id: <1306186971-9528-2-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 1.7.5.1 In-Reply-To: <1306186971-9528-1-git-send-email-aurelien@aurel32.net> References: <1306186971-9528-1-git-send-email-aurelien@aurel32.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 88.191.126.93 Cc: Alexander Graf , Aurelien Jarno Subject: [Qemu-devel] [PATCH v2 1/9] target-ppc: remove old CONFIG_SOFTFLOAT #ifdef 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 target-ppc has been switched to softfloat only long ago, but a few #ifdef CONFIG_SOFTFLOAT have been forgotten. Remove them. Cc: Alexander Graf Reviewed-by: Peter Maydell Signed-off-by: Aurelien Jarno Acked-by: Andreas Färber --- target-ppc/helper.h | 2 -- target-ppc/op_helper.c | 11 ----------- target-ppc/translate.c | 2 -- 3 files changed, 0 insertions(+), 15 deletions(-) diff --git a/target-ppc/helper.h b/target-ppc/helper.h index 51c99c8..470e42f 100644 --- a/target-ppc/helper.h +++ b/target-ppc/helper.h @@ -51,9 +51,7 @@ DEF_HELPER_FLAGS_1(cntlzw32, TCG_CALL_CONST | TCG_CALL_PURE, i32, i32) DEF_HELPER_FLAGS_2(brinc, TCG_CALL_CONST | TCG_CALL_PURE, tl, tl, tl) DEF_HELPER_0(float_check_status, void) -#ifdef CONFIG_SOFTFLOAT DEF_HELPER_0(reset_fpstatus, void) -#endif DEF_HELPER_2(compute_fprf, i32, i64, i32) DEF_HELPER_2(store_fpscr, void, i64, i32) DEF_HELPER_1(fpscr_clrbit, void, i32) diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c index c6cb448..fe66f14 100644 --- a/target-ppc/op_helper.c +++ b/target-ppc/op_helper.c @@ -971,7 +971,6 @@ void helper_store_fpscr (uint64_t arg, uint32_t mask) void helper_float_check_status (void) { -#ifdef CONFIG_SOFTFLOAT if (env->exception_index == POWERPC_EXCP_PROGRAM && (env->error_code & POWERPC_EXCP_FP)) { /* Differred floating-point exception after target FPR update */ @@ -989,22 +988,12 @@ void helper_float_check_status (void) float_inexact_excp(); } } -#else - if (env->exception_index == POWERPC_EXCP_PROGRAM && - (env->error_code & POWERPC_EXCP_FP)) { - /* Differred floating-point exception after target FPR update */ - if (msr_fe0 != 0 || msr_fe1 != 0) - helper_raise_exception_err(env->exception_index, env->error_code); - } -#endif } -#ifdef CONFIG_SOFTFLOAT void helper_reset_fpstatus (void) { set_float_exception_flags(0, &env->fp_status); } -#endif /* fadd - fadd. */ uint64_t helper_fadd (uint64_t arg1, uint64_t arg2) diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 9b3f90c..59aef85 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -215,9 +215,7 @@ struct opc_handler_t { static inline void gen_reset_fpstatus(void) { -#ifdef CONFIG_SOFTFLOAT gen_helper_reset_fpstatus(); -#endif } static inline void gen_compute_fprf(TCGv_i64 arg, int set_fprf, int set_rc)