From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asVsX-0003CL-FT for qemu-devel@nongnu.org; Tue, 19 Apr 2016 09:39:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1asVsV-0000fJ-Ui for qemu-devel@nongnu.org; Tue, 19 Apr 2016 09:39:45 -0400 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:37889) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asVsV-0000f5-L7 for qemu-devel@nongnu.org; Tue, 19 Apr 2016 09:39:43 -0400 Received: by mail-wm0-x22c.google.com with SMTP id u206so30243859wme.1 for ; Tue, 19 Apr 2016 06:39:43 -0700 (PDT) From: Alvise Rigo Date: Tue, 19 Apr 2016 15:39:20 +0200 Message-Id: <1461073171-22953-4-git-send-email-a.rigo@virtualopensystems.com> In-Reply-To: <1461073171-22953-1-git-send-email-a.rigo@virtualopensystems.com> References: <1461073171-22953-1-git-send-email-a.rigo@virtualopensystems.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [RFC v8 03/14] softmmu: Simplify helper_*_st_name, wrap MMIO code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, mttcg@listserver.greensocs.com Cc: jani.kokkonen@huawei.com, claudio.fontana@huawei.com, tech@virtualopensystems.com, alex.bennee@linaro.org, pbonzini@redhat.com, rth@twiddle.net, serge.fdrv@gmail.com, Alvise Rigo , Peter Crosthwaite Attempting to simplify the helper_*_st_name, wrap the MMIO code into an inline function. The function covers both BE and LE cases and it is expanded twice in each helper (TODO: check this last statement). Suggested-by: Jani Kokkonen Suggested-by: Claudio Fontana CC: Alex Bennée Signed-off-by: Alvise Rigo --- softmmu_template.h | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/softmmu_template.h b/softmmu_template.h index 3eb54f8..9185486 100644 --- a/softmmu_template.h +++ b/softmmu_template.h @@ -410,6 +410,29 @@ static inline void smmu_helper(do_unl_store)(CPUArchState *env, } } +static inline void smmu_helper(do_mmio_store)(CPUArchState *env, + bool little_endian, + DATA_TYPE val, + target_ulong addr, + TCGMemOpIdx oi, unsigned mmu_idx, + int index, uintptr_t retaddr) +{ + CPUIOTLBEntry *iotlbentry = &env->iotlb[mmu_idx][index]; + + if ((addr & (DATA_SIZE - 1)) != 0) { + smmu_helper(do_unl_store)(env, little_endian, val, addr, mmu_idx, oi, + retaddr); + } + /* ??? Note that the io helpers always read data in the target + byte ordering. We should push the LE/BE request down into io. */ + if (little_endian) { + val = TGT_LE(val); + } else { + val = TGT_BE(val); + } + glue(io_write, SUFFIX)(env, iotlbentry, val, addr, retaddr); +} + void helper_le_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val, TCGMemOpIdx oi, uintptr_t retaddr) { @@ -437,17 +460,8 @@ void helper_le_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val, /* Handle an IO access. */ if (unlikely(tlb_addr & ~TARGET_PAGE_MASK)) { - CPUIOTLBEntry *iotlbentry; - if ((addr & (DATA_SIZE - 1)) != 0) { - smmu_helper(do_unl_store)(env, false, val, addr, oi, mmu_idx, retaddr); - return; - } - iotlbentry = &env->iotlb[mmu_idx][index]; - - /* ??? Note that the io helpers always read data in the target - byte ordering. We should push the LE/BE request down into io. */ - val = TGT_LE(val); - glue(io_write, SUFFIX)(env, iotlbentry, val, addr, retaddr); + smmu_helper(do_mmio_store)(env, true, val, addr, oi, mmu_idx, index, + retaddr); return; } @@ -502,17 +516,8 @@ void helper_be_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val, /* Handle an IO access. */ if (unlikely(tlb_addr & ~TARGET_PAGE_MASK)) { - CPUIOTLBEntry *iotlbentry; - if ((addr & (DATA_SIZE - 1)) != 0) { - smmu_helper(do_unl_store)(env, true, val, addr, oi, mmu_idx, retaddr); - return; - } - iotlbentry = &env->iotlb[mmu_idx][index]; - - /* ??? Note that the io helpers always read data in the target - byte ordering. We should push the LE/BE request down into io. */ - val = TGT_BE(val); - glue(io_write, SUFFIX)(env, iotlbentry, val, addr, retaddr); + smmu_helper(do_mmio_store)(env, false, val, addr, oi, mmu_idx, index, + retaddr); return; } -- 2.8.0