From patchwork Mon Dec 14 08:41:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alvise Rigo X-Patchwork-Id: 556326 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 78386140216 for ; Mon, 14 Dec 2015 19:44:38 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=virtualopensystems-com.20150623.gappssmtp.com header.i=@virtualopensystems-com.20150623.gappssmtp.com header.b=fVajmzrw; dkim-atps=neutral Received: from localhost ([::1]:58492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8OkG-0001jc-Cv for incoming@patchwork.ozlabs.org; Mon, 14 Dec 2015 03:44:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55673) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8Ohm-0005iA-1n for qemu-devel@nongnu.org; Mon, 14 Dec 2015 03:42:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a8Ohj-0001vX-1H for qemu-devel@nongnu.org; Mon, 14 Dec 2015 03:42:01 -0500 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:38309) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8Ohi-0001vG-PY for qemu-devel@nongnu.org; Mon, 14 Dec 2015 03:41:58 -0500 Received: by wmpp66 with SMTP id p66so50474386wmp.1 for ; Mon, 14 Dec 2015 00:41:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtualopensystems-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GN2cl6xxccExpLiSiFM3ux0s/s7D6IeorzPssKNT1TY=; b=fVajmzrw7wJlTrzoo56XOrXEL7EE1FvgJUwPyQNN16a58W5ZgwpsW9VZzb9Oa6Y7vN mXi0BhJS98lb47/uMydd+tS1oVDxi0ZHgUR4WFiTMTyCBPMMahyETSSzt3gpUvbGInQJ uYvWyj1J/nv8kSCWOdr+y45y9d8CpbU3R4+r+rgnDcIcu6grXVIZ9H7NqY+tozYJXXbm BIO9klpyYvc5TMDKuPbOI4rNcdUCi96V1vbXYtq+8+v+NfFo2F6R+532vNdYx8KATkEq 1vkKtqVn/Xoo4ifPlYH10b4t7bbP9RhBxdrnjzB2YtOS94oVzW/5YXd1Dyvx6Jj4L9f0 y38Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GN2cl6xxccExpLiSiFM3ux0s/s7D6IeorzPssKNT1TY=; b=YEAMhILlVldi9Oz99ayi0KCcbl9DEz3Fxns5HPj83FVY/xxedMIxIufthEIMVM/7Ly Dr1mFw3Ynhb8YV2nbVE97WvSZUcKJR/LSZJZvG4PGarnG9zg4jECNXudJoSC/5cLs8Be OAYvtOhWRkIhPK0x6HqhXHKtaXHlfGx2BVtseQe76kHDb8tR7O139Q75CZtuMKlELbWM ea5knmzntPS2FsTKDf4WHybTonFvEXAToqkReBlE/zn357RjoPrBBgo8exCP9lH6/TDW ZtunT5LJo39o0nb0S/PcRdUCI/YB/MkluILYRBGH/di5/XtcOdeSSTTdKXy2cRrPxj6M HxvA== X-Gm-Message-State: ALoCoQkxR9eNPwYpILjyyszGnuJdI0PvtAyLTVC3J32xfsldSFSQKx2DnoVFmn/P17Bb7N2ZKh+CZKGzRaaMnxgp8x69nJPtEw== X-Received: by 10.195.11.233 with SMTP id el9mr36063008wjd.145.1450082518117; Mon, 14 Dec 2015 00:41:58 -0800 (PST) Received: from localhost.localdomain (LPuteaux-656-1-278-113.w80-15.abo.wanadoo.fr. [80.15.154.113]) by smtp.googlemail.com with ESMTPSA id xs9sm1100526wjc.43.2015.12.14.00.41.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Dec 2015 00:41:57 -0800 (PST) From: Alvise Rigo To: qemu-devel@nongnu.org, mttcg@listserver.greensocs.com Date: Mon, 14 Dec 2015 09:41:34 +0100 Message-Id: <1450082498-27109-11-git-send-email-a.rigo@virtualopensystems.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1450082498-27109-1-git-send-email-a.rigo@virtualopensystems.com> References: <1450082498-27109-1-git-send-email-a.rigo@virtualopensystems.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::235 Cc: claudio.fontana@huawei.com, pbonzini@redhat.com, jani.kokkonen@huawei.com, tech@virtualopensystems.com, alex.bennee@linaro.org, rth@twiddle.net Subject: [Qemu-devel] [RFC v6 10/14] softmmu: Simplify helper_*_st_name, wrap unaligned code 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 Attempting to simplify the helper_*_st_name, wrap the do_unaligned_access code into an inline function. Remove also the goto statement. Suggested-by: Jani Kokkonen Suggested-by: Claudio Fontana Signed-off-by: Alvise Rigo --- softmmu_template.h | 96 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 36 deletions(-) diff --git a/softmmu_template.h b/softmmu_template.h index d3d5902..92f92b1 100644 --- a/softmmu_template.h +++ b/softmmu_template.h @@ -370,6 +370,32 @@ static inline void glue(io_write, SUFFIX)(CPUArchState *env, iotlbentry->attrs); } +static inline void glue(helper_le_st_name, _do_unl_access)(CPUArchState *env, + DATA_TYPE val, + target_ulong addr, + TCGMemOpIdx oi, + unsigned mmu_idx, + uintptr_t retaddr) +{ + int i; + + if ((get_memop(oi) & MO_AMASK) == MO_ALIGN) { + cpu_unaligned_access(ENV_GET_CPU(env), addr, MMU_DATA_STORE, + mmu_idx, retaddr); + } + /* XXX: not efficient, but simple */ + /* Note: relies on the fact that tlb_fill() does not remove the + * previous page from the TLB cache. */ + for (i = DATA_SIZE - 1; i >= 0; i--) { + /* Little-endian extract. */ + uint8_t val8 = val >> (i * 8); + /* Note the adjustment at the beginning of the function. + Undo that for the recursion. */ + glue(helper_ret_stb, MMUSUFFIX)(env, addr + i, val8, + oi, retaddr + GETPC_ADJ); + } +} + void helper_le_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val, TCGMemOpIdx oi, uintptr_t retaddr) { @@ -433,7 +459,8 @@ void helper_le_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val, return; } else { if ((addr & (DATA_SIZE - 1)) != 0) { - goto do_unaligned_access; + glue(helper_le_st_name, _do_unl_access)(env, val, addr, mmu_idx, + oi, retaddr); } iotlbentry = &env->iotlb[mmu_idx][index]; @@ -449,23 +476,8 @@ void helper_le_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val, if (DATA_SIZE > 1 && unlikely((addr & ~TARGET_PAGE_MASK) + DATA_SIZE - 1 >= TARGET_PAGE_SIZE)) { - int i; - do_unaligned_access: - if ((get_memop(oi) & MO_AMASK) == MO_ALIGN) { - cpu_unaligned_access(ENV_GET_CPU(env), addr, MMU_DATA_STORE, - mmu_idx, retaddr); - } - /* XXX: not efficient, but simple */ - /* Note: relies on the fact that tlb_fill() does not remove the - * previous page from the TLB cache. */ - for (i = DATA_SIZE - 1; i >= 0; i--) { - /* Little-endian extract. */ - uint8_t val8 = val >> (i * 8); - /* Note the adjustment at the beginning of the function. - Undo that for the recursion. */ - glue(helper_ret_stb, MMUSUFFIX)(env, addr + i, val8, - oi, retaddr + GETPC_ADJ); - } + glue(helper_le_st_name, _do_unl_access)(env, val, addr, oi, mmu_idx, + retaddr); return; } @@ -485,6 +497,32 @@ void helper_le_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val, } #if DATA_SIZE > 1 +static inline void glue(helper_be_st_name, _do_unl_access)(CPUArchState *env, + DATA_TYPE val, + target_ulong addr, + TCGMemOpIdx oi, + unsigned mmu_idx, + uintptr_t retaddr) +{ + int i; + + if ((get_memop(oi) & MO_AMASK) == MO_ALIGN) { + cpu_unaligned_access(ENV_GET_CPU(env), addr, MMU_DATA_STORE, + mmu_idx, retaddr); + } + /* XXX: not efficient, but simple */ + /* Note: relies on the fact that tlb_fill() does not remove the + * previous page from the TLB cache. */ + for (i = DATA_SIZE - 1; i >= 0; i--) { + /* Big-endian extract. */ + uint8_t val8 = val >> (((DATA_SIZE - 1) * 8) - (i * 8)); + /* Note the adjustment at the beginning of the function. + Undo that for the recursion. */ + glue(helper_ret_stb, MMUSUFFIX)(env, addr + i, val8, + oi, retaddr + GETPC_ADJ); + } +} + void helper_be_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val, TCGMemOpIdx oi, uintptr_t retaddr) { @@ -548,7 +586,8 @@ void helper_be_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val, return; } else { if ((addr & (DATA_SIZE - 1)) != 0) { - goto do_unaligned_access; + glue(helper_be_st_name, _do_unl_access)(env, val, addr, mmu_idx, + oi, retaddr); } iotlbentry = &env->iotlb[mmu_idx][index]; @@ -564,23 +603,8 @@ void helper_be_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val, if (DATA_SIZE > 1 && unlikely((addr & ~TARGET_PAGE_MASK) + DATA_SIZE - 1 >= TARGET_PAGE_SIZE)) { - int i; - do_unaligned_access: - if ((get_memop(oi) & MO_AMASK) == MO_ALIGN) { - cpu_unaligned_access(ENV_GET_CPU(env), addr, MMU_DATA_STORE, - mmu_idx, retaddr); - } - /* XXX: not efficient, but simple */ - /* Note: relies on the fact that tlb_fill() does not remove the - * previous page from the TLB cache. */ - for (i = DATA_SIZE - 1; i >= 0; i--) { - /* Big-endian extract. */ - uint8_t val8 = val >> (((DATA_SIZE - 1) * 8) - (i * 8)); - /* Note the adjustment at the beginning of the function. - Undo that for the recursion. */ - glue(helper_ret_stb, MMUSUFFIX)(env, addr + i, val8, - oi, retaddr + GETPC_ADJ); - } + glue(helper_be_st_name, _do_unl_access)(env, val, addr, oi, mmu_idx, + retaddr); return; }