From patchwork Tue Oct 9 12:37:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: YeongKyoon Lee X-Patchwork-Id: 190291 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 1A2EB2C00D7 for ; Tue, 9 Oct 2012 23:38:02 +1100 (EST) Received: from localhost ([::1]:40256 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLZ4R-0000ir-VN for incoming@patchwork.ozlabs.org; Tue, 09 Oct 2012 08:37:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47062) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLZ49-0000i9-9C for qemu-devel@nongnu.org; Tue, 09 Oct 2012 08:37:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TLZ47-0001rn-9h for qemu-devel@nongnu.org; Tue, 09 Oct 2012 08:37:41 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:31969) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLZ46-0001qe-OH for qemu-devel@nongnu.org; Tue, 09 Oct 2012 08:37:39 -0400 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MBM00FL9LQO65O0@mailout4.samsung.com> for qemu-devel@nongnu.org; Tue, 09 Oct 2012 21:37:36 +0900 (KST) X-AuditID: cbfee61b-b7f2b6d000000f14-bb-50741a907951 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 19.14.03860.09A14705; Tue, 09 Oct 2012 21:37:36 +0900 (KST) Received: from localhost.localdomain ([182.198.1.3]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MBM00HC1LQDYV60@mmp2.samsung.com> for qemu-devel@nongnu.org; Tue, 09 Oct 2012 21:37:36 +0900 (KST) From: Yeongkyoon Lee To: qemu-devel@nongnu.org Date: Tue, 09 Oct 2012 21:37:31 +0900 Message-id: <1349786252-12343-3-git-send-email-yeongkyoon.lee@samsung.com> X-Mailer: git-send-email 1.7.5.4 In-reply-to: <1349786252-12343-1-git-send-email-yeongkyoon.lee@samsung.com> References: <1349786252-12343-1-git-send-email-yeongkyoon.lee@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrIJMWRmVeSWpSXmKPExsVy+t9jQd0JUiUBBvf+qVoc793B4sDo8eTa ZqYAxigum5TUnMyy1CJ9uwSujH3PfQquhFfcuvaCqYFxu20XIyeHhICJxPt5v1ghbDGJC/fW s3UxcnEICUxnlHi66j8jSEJIYB6TxNx3uSA2m4ChxMzzT5hAbBEBSYnfXaeZQWxmAX2JOc9W sYDYwgKJEr/X/ALrZRFQlZg8aQ87iM0r4CXRvvglC8QyBYlfR1aBLeYU8Ja48LufCWKXl8T8 HV/ZJzDyLmBkWMUomlqQXFCclJ5rpFecmFtcmpeul5yfu4kR7PFn0jsYVzVYHGIU4GBU4uH9 EFUcIMSaWFZcmXuIUYKDWUmEV/MuUIg3JbGyKrUoP76oNCe1+BCjNAeLkjhvs0dKgJBAemJJ anZqakFqEUyWiYNTqoExisFsco1lUynbryyBX5fiVkiJePzs1jnc5WVW/qr5boJlAe86W4mV cdsfR9Tpu0R8ZZv7hq9mDsttubnh/s1+UzV3zpvErJwYuLc1aspP0ZrpnRt+eekfunL7e9/8 1Aomi+nWTZYzshvvcjAbfn6vwaVtbs+ZF5W5+tCGP5wtl/RWfVofJKbEUpyRaKjFXFScCAAa 0Uoh9AEAAA== X-detected-operating-system: by eggs.gnu.org: Solaris 10 (1203?) X-Received-From: 203.254.224.34 Cc: Yeongkyoon Lee Subject: [Qemu-devel] [PATCH v5 2/3] tcg: Add declarations and templates of extended MMU helpers 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 Add declarations and templates of extended MMU helpers. An extended helper takes an additional argument of the host address accessing a guest memory which differs from the address of the call site to the helper because helper call sites locate at the end of a generated code block. Signed-off-by: Yeongkyoon Lee --- softmmu_defs.h | 39 +++++++++++++++++++++++++++++++++++++++ softmmu_header.h | 15 +++++++++++++++ softmmu_template.h | 41 +++++++++++++++++++++++++++++++++-------- 3 files changed, 87 insertions(+), 8 deletions(-) -- 1.7.5.4 diff --git a/softmmu_defs.h b/softmmu_defs.h index 1f25e33..a93adf0 100644 --- a/softmmu_defs.h +++ b/softmmu_defs.h @@ -9,6 +9,7 @@ #ifndef SOFTMMU_DEFS_H #define SOFTMMU_DEFS_H +#ifndef CONFIG_QEMU_LDST_OPTIMIZATION uint8_t helper_ldb_mmu(CPUArchState *env, target_ulong addr, int mmu_idx); void helper_stb_mmu(CPUArchState *env, target_ulong addr, uint8_t val, int mmu_idx); @@ -34,4 +35,42 @@ void helper_stl_cmmu(CPUArchState *env, target_ulong addr, uint32_t val, uint64_t helper_ldq_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx); void helper_stq_cmmu(CPUArchState *env, target_ulong addr, uint64_t val, int mmu_idx); +#else +/* Extended versions of MMU helpers for qemu_ld/st optimization. + The additional argument is a host code address accessing guest memory */ +uint8_t ext_helper_ldb_mmu(CPUArchState *env, target_ulong addr, int mmu_idx, + uintptr_t ra); +void ext_helper_stb_mmu(CPUArchState *env, target_ulong addr, uint8_t val, + int mmu_idx, uintptr_t ra); +uint16_t ext_helper_ldw_mmu(CPUArchState *env, target_ulong addr, int mmu_idx, + uintptr_t ra); +void ext_helper_stw_mmu(CPUArchState *env, target_ulong addr, uint16_t val, + int mmu_idx, uintptr_t ra); +uint32_t ext_helper_ldl_mmu(CPUArchState *env, target_ulong addr, int mmu_idx, + uintptr_t ra); +void ext_helper_stl_mmu(CPUArchState *env, target_ulong addr, uint32_t val, + int mmu_idx, uintptr_t ra); +uint64_t ext_helper_ldq_mmu(CPUArchState *env, target_ulong addr, int mmu_idx, + uintptr_t ra); +void ext_helper_stq_mmu(CPUArchState *env, target_ulong addr, uint64_t val, + int mmu_idx, uintptr_t ra); + +uint8_t ext_helper_ldb_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx, + uintptr_t ra); +void ext_helper_stb_cmmu(CPUArchState *env, target_ulong addr, uint8_t val, + int mmu_idx, uintptr_t ra); +uint16_t ext_helper_ldw_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx, + uintptr_t ra); +void ext_helper_stw_cmmu(CPUArchState *env, target_ulong addr, uint16_t val, + int mmu_idx, uintptr_t ra); +uint32_t ext_helper_ldl_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx, + uintptr_t ra); +void ext_helper_stl_cmmu(CPUArchState *env, target_ulong addr, uint32_t val, + int mmu_idx, uintptr_t ra); +uint64_t ext_helper_ldq_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx, + uintptr_t ra); +void ext_helper_stq_cmmu(CPUArchState *env, target_ulong addr, uint64_t val, + int mmu_idx, uintptr_t ra); +#endif /* CONFIG_QEMU_LDST_OPTIMIZATION */ + #endif diff --git a/softmmu_header.h b/softmmu_header.h index d8d9c81..d18c8f8 100644 --- a/softmmu_header.h +++ b/softmmu_header.h @@ -93,7 +93,12 @@ glue(glue(cpu_ld, USUFFIX), MEMSUFFIX)(CPUArchState *env, target_ulong ptr) mmu_idx = CPU_MMU_INDEX; if (unlikely(env->tlb_table[mmu_idx][page_index].ADDR_READ != (addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))))) { +#ifdef CONFIG_QEMU_LDST_OPTIMIZATION + res = glue(glue(ext_helper_ld, SUFFIX), MMUSUFFIX)(env, addr, mmu_idx, + (uintptr_t)NULL); +#else res = glue(glue(helper_ld, SUFFIX), MMUSUFFIX)(env, addr, mmu_idx); +#endif } else { uintptr_t hostaddr = addr + env->tlb_table[mmu_idx][page_index].addend; res = glue(glue(ld, USUFFIX), _raw)(hostaddr); @@ -114,8 +119,13 @@ glue(glue(cpu_lds, SUFFIX), MEMSUFFIX)(CPUArchState *env, target_ulong ptr) mmu_idx = CPU_MMU_INDEX; if (unlikely(env->tlb_table[mmu_idx][page_index].ADDR_READ != (addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))))) { +#ifdef CONFIG_QEMU_LDST_OPTIMIZATION + res = (DATA_STYPE)glue(glue(ext_helper_ld, SUFFIX), + MMUSUFFIX)(env, addr, mmu_idx, (uintptr_t)NULL); +#else res = (DATA_STYPE)glue(glue(helper_ld, SUFFIX), MMUSUFFIX)(env, addr, mmu_idx); +#endif } else { uintptr_t hostaddr = addr + env->tlb_table[mmu_idx][page_index].addend; res = glue(glue(lds, SUFFIX), _raw)(hostaddr); @@ -141,7 +151,12 @@ glue(glue(cpu_st, SUFFIX), MEMSUFFIX)(CPUArchState *env, target_ulong ptr, mmu_idx = CPU_MMU_INDEX; if (unlikely(env->tlb_table[mmu_idx][page_index].addr_write != (addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))))) { +#ifdef CONFIG_QEMU_LDST_OPTIMIZATION + glue(glue(ext_helper_st, SUFFIX), MMUSUFFIX)(env, addr, v, mmu_idx, + (uintptr_t)NULL); +#else glue(glue(helper_st, SUFFIX), MMUSUFFIX)(env, addr, v, mmu_idx); +#endif } else { uintptr_t hostaddr = addr + env->tlb_table[mmu_idx][page_index].addend; glue(glue(st, SUFFIX), _raw)(hostaddr, v); diff --git a/softmmu_template.h b/softmmu_template.h index e2490f0..e40c060 100644 --- a/softmmu_template.h +++ b/softmmu_template.h @@ -54,6 +54,14 @@ #define ADDR_READ addr_read #endif +#ifdef CONFIG_QEMU_LDST_OPTIMIZATION +/* An extended MMU helper takes one more argument which is + a host address of generated code accessing guest memory */ +#define GET_RET_ADDR() ra +#else +#define GET_RET_ADDR() GETPC() +#endif /* CONFIG_QEMU_LDST_OPTIMIZATION */ + static DATA_TYPE glue(glue(slow_ld, SUFFIX), MMUSUFFIX)(CPUArchState *env, target_ulong addr, int mmu_idx, @@ -91,9 +99,17 @@ static inline DATA_TYPE glue(io_read, SUFFIX)(CPUArchState *env, } /* handle all cases except unaligned access which span two pages */ +#ifdef CONFIG_QEMU_LDST_OPTIMIZATION +DATA_TYPE +glue(glue(ext_helper_ld, SUFFIX), MMUSUFFIX)(CPUArchState *env, + target_ulong addr, + int mmu_idx, + uintptr_t ra) +#else DATA_TYPE glue(glue(helper_ld, SUFFIX), MMUSUFFIX)(CPUArchState *env, target_ulong addr, int mmu_idx) +#endif { DATA_TYPE res; int index; @@ -111,13 +127,13 @@ glue(glue(helper_ld, SUFFIX), MMUSUFFIX)(CPUArchState *env, target_ulong addr, /* IO access */ if ((addr & (DATA_SIZE - 1)) != 0) goto do_unaligned_access; - retaddr = GETPC(); + retaddr = GET_RET_ADDR(); ioaddr = env->iotlb[mmu_idx][index]; res = glue(io_read, SUFFIX)(env, ioaddr, addr, retaddr); } else if (((addr & ~TARGET_PAGE_MASK) + DATA_SIZE - 1) >= TARGET_PAGE_SIZE) { /* slow unaligned access (it spans two pages or IO) */ do_unaligned_access: - retaddr = GETPC(); + retaddr = GET_RET_ADDR(); #ifdef ALIGNED_ONLY do_unaligned_access(env, addr, READ_ACCESS_TYPE, mmu_idx, retaddr); #endif @@ -128,7 +144,7 @@ glue(glue(helper_ld, SUFFIX), MMUSUFFIX)(CPUArchState *env, target_ulong addr, uintptr_t addend; #ifdef ALIGNED_ONLY if ((addr & (DATA_SIZE - 1)) != 0) { - retaddr = GETPC(); + retaddr = GET_RET_ADDR(); do_unaligned_access(env, addr, READ_ACCESS_TYPE, mmu_idx, retaddr); } #endif @@ -138,7 +154,7 @@ glue(glue(helper_ld, SUFFIX), MMUSUFFIX)(CPUArchState *env, target_ulong addr, } } else { /* the page is not in the TLB : fill it */ - retaddr = GETPC(); + retaddr = GET_RET_ADDR(); #ifdef ALIGNED_ONLY if ((addr & (DATA_SIZE - 1)) != 0) do_unaligned_access(env, addr, READ_ACCESS_TYPE, mmu_idx, retaddr); @@ -240,9 +256,17 @@ static inline void glue(io_write, SUFFIX)(CPUArchState *env, #endif /* SHIFT > 2 */ } +#ifdef CONFIG_QEMU_LDST_OPTIMIZATION +void glue(glue(ext_helper_st, SUFFIX), MMUSUFFIX)(CPUArchState *env, + target_ulong addr, + DATA_TYPE val, + int mmu_idx, + uintptr_t ra) +#else void glue(glue(helper_st, SUFFIX), MMUSUFFIX)(CPUArchState *env, target_ulong addr, DATA_TYPE val, int mmu_idx) +#endif { target_phys_addr_t ioaddr; target_ulong tlb_addr; @@ -257,12 +281,12 @@ void glue(glue(helper_st, SUFFIX), MMUSUFFIX)(CPUArchState *env, /* IO access */ if ((addr & (DATA_SIZE - 1)) != 0) goto do_unaligned_access; - retaddr = GETPC(); + retaddr = GET_RET_ADDR(); ioaddr = env->iotlb[mmu_idx][index]; glue(io_write, SUFFIX)(env, ioaddr, val, addr, retaddr); } else if (((addr & ~TARGET_PAGE_MASK) + DATA_SIZE - 1) >= TARGET_PAGE_SIZE) { do_unaligned_access: - retaddr = GETPC(); + retaddr = GET_RET_ADDR(); #ifdef ALIGNED_ONLY do_unaligned_access(env, addr, 1, mmu_idx, retaddr); #endif @@ -273,7 +297,7 @@ void glue(glue(helper_st, SUFFIX), MMUSUFFIX)(CPUArchState *env, uintptr_t addend; #ifdef ALIGNED_ONLY if ((addr & (DATA_SIZE - 1)) != 0) { - retaddr = GETPC(); + retaddr = GET_RET_ADDR(); do_unaligned_access(env, addr, 1, mmu_idx, retaddr); } #endif @@ -283,7 +307,7 @@ void glue(glue(helper_st, SUFFIX), MMUSUFFIX)(CPUArchState *env, } } else { /* the page is not in the TLB : fill it */ - retaddr = GETPC(); + retaddr = GET_RET_ADDR(); #ifdef ALIGNED_ONLY if ((addr & (DATA_SIZE - 1)) != 0) do_unaligned_access(env, addr, 1, mmu_idx, retaddr); @@ -352,3 +376,4 @@ static void glue(glue(slow_st, SUFFIX), MMUSUFFIX)(CPUArchState *env, #undef USUFFIX #undef DATA_SIZE #undef ADDR_READ +#undef GET_RET_ADDR