From patchwork Sat Sep 3 20:39:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 665452 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sRSbG2htVz9sXx for ; Sun, 4 Sep 2016 06:42:02 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=yTqsxoAx; dkim-atps=neutral Received: from localhost ([::1]:47667 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgHlH-0000r3-AC for incoming@patchwork.ozlabs.org; Sat, 03 Sep 2016 16:41:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51362) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgHji-0007uq-1X for qemu-devel@nongnu.org; Sat, 03 Sep 2016 16:40:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bgHjf-00030r-Uf for qemu-devel@nongnu.org; Sat, 03 Sep 2016 16:40:21 -0400 Received: from mail-pa0-x243.google.com ([2607:f8b0:400e:c03::243]:36476) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgHjf-00030l-Nl for qemu-devel@nongnu.org; Sat, 03 Sep 2016 16:40:19 -0400 Received: by mail-pa0-x243.google.com with SMTP id ez1so7097403pab.3 for ; Sat, 03 Sep 2016 13:40:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=zPQ5fk8BOphiLy0gM/1IwFZ2Ngc6SRZu2rPTJmdBYI8=; b=yTqsxoAxMgRrhHu+6ofOY0n50HSAnnkADb9JXIButeJseN0nAbqAdyz7dY157tNn6I 77IS57TGorBuEbvUSSNcpjZRGnLsu1hDfvHxCIQJ8NhQI5XzHj773vsf/A1SfWN25tqV r8W1Xmgq2qTE3F0UF39JYR9zSV1BgIbbPxRTNFjbF6oYLZdG8FTvSFUDSQV7xqOTKVu/ tGA514NYnojfv9/C2NeY/bm5TdhDQSCLerwG/5t5U4Bmp6jdl7Ot1ja2sw/VnJSc0lgK j8u8ItW7lkbavDrkFeMX2Mi7qr2jdafMe+hbg29rclL9KCB6whp8n2x4scpPUQlXFJWa KMOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=zPQ5fk8BOphiLy0gM/1IwFZ2Ngc6SRZu2rPTJmdBYI8=; b=ToqHFJr/hvXTZ4nyUzOqRQlut/0m1hrw0bfc9Li95yh3LWmeI3cDvkTPVXBPP+yQmM Asb5nb1k+UcqXy/fa55Sthmbs06nqR+ivSZJn8xdKzOWIgbypd2lkm+0/BbkJnpZ953D SvcgfQaAu5yKJYXOK0lMl/1kbjE1Cf2t6xNQ1AWzHjqcEsC4tYK84Oa+YbgDeSyPbXVe vm/3e+4MJVbnueq55qfUbBWpcnpm4bhU+mLTEEcInt0NTPQFQibkj9MR5O29nNzCv160 v2rFp5qYYveESjRZv4NcI/bCMqLgfx0Djy0qaTfIEtUHon+zj49sgi3QukgeQIBJ4uyN Ic+w== X-Gm-Message-State: AE9vXwNYrbIU/gjy12i94LBoz00JNI3stFDYM8y+GYcT2qUptoQshnj1JQT3vhqZFuBtYA== X-Received: by 10.66.14.161 with SMTP id q1mr48892171pac.103.1472935218934; Sat, 03 Sep 2016 13:40:18 -0700 (PDT) Received: from bigtime.twiddle.net (174-24-157-40.tukw.qwest.net. [174.24.157.40]) by smtp.gmail.com with ESMTPSA id cp11sm23739651pac.28.2016.09.03.13.40.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 03 Sep 2016 13:40:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 3 Sep 2016 13:39:40 -0700 Message-Id: <1472935202-3342-13-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1472935202-3342-1-git-send-email-rth@twiddle.net> References: <1472935202-3342-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c03::243 Subject: [Qemu-devel] [PATCH v3 12/34] cputlb: Tidy some macros X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" TGT_LE and TGT_BE are not size dependent and do not need to be redefined. The others are no longer used at all. Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée --- cputlb.c | 8 ++++++++ softmmu_template.h | 22 ---------------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/cputlb.c b/cputlb.c index eba78a9..d710cc1 100644 --- a/cputlb.c +++ b/cputlb.c @@ -585,6 +585,14 @@ void probe_write(CPUArchState *env, target_ulong addr, int mmu_idx, } } +#ifdef TARGET_WORDS_BIGENDIAN +# define TGT_BE(X) (X) +# define TGT_LE(X) BSWAP(X) +#else +# define TGT_BE(X) BSWAP(X) +# define TGT_LE(X) (X) +#endif + #define MMUSUFFIX _mmu #define DATA_SIZE 1 diff --git a/softmmu_template.h b/softmmu_template.h index c513813..efcfcd8 100644 --- a/softmmu_template.h +++ b/softmmu_template.h @@ -78,14 +78,6 @@ # define BSWAP(X) (X) #endif -#ifdef TARGET_WORDS_BIGENDIAN -# define TGT_BE(X) (X) -# define TGT_LE(X) BSWAP(X) -#else -# define TGT_BE(X) BSWAP(X) -# define TGT_LE(X) (X) -#endif - #if DATA_SIZE == 1 # define helper_le_ld_name glue(glue(helper_ret_ld, USUFFIX), MMUSUFFIX) # define helper_be_ld_name helper_le_ld_name @@ -102,14 +94,6 @@ # define helper_be_st_name glue(glue(helper_be_st, SUFFIX), MMUSUFFIX) #endif -#ifdef TARGET_WORDS_BIGENDIAN -# define helper_te_ld_name helper_be_ld_name -# define helper_te_st_name helper_be_st_name -#else -# define helper_te_ld_name helper_le_ld_name -# define helper_te_st_name helper_le_st_name -#endif - #ifndef SOFTMMU_CODE_ACCESS static inline DATA_TYPE glue(io_read, SUFFIX)(CPUArchState *env, size_t mmu_idx, size_t index, @@ -461,15 +445,9 @@ void helper_be_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val, #undef USUFFIX #undef SSUFFIX #undef BSWAP -#undef TGT_BE -#undef TGT_LE -#undef CPU_BE -#undef CPU_LE #undef helper_le_ld_name #undef helper_be_ld_name #undef helper_le_lds_name #undef helper_be_lds_name #undef helper_le_st_name #undef helper_be_st_name -#undef helper_te_ld_name -#undef helper_te_st_name