From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48356) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7EB-0000xQ-Em for qemu-devel@nongnu.org; Mon, 05 Sep 2016 23:39:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bh7E4-00078h-LP for qemu-devel@nongnu.org; Mon, 05 Sep 2016 23:39:14 -0400 From: David Gibson Date: Tue, 6 Sep 2016 13:40:32 +1000 Message-Id: <1473133253-17598-46-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1473133253-17598-1-git-send-email-david@gibson.dropbear.id.au> References: <1473133253-17598-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PULL 45/66] ppc: Speed up load/store multiple List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linearo.org Cc: agraf@suse.de, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, Benjamin Herrenschmidt , David Gibson From: Benjamin Herrenschmidt Use a single translate when not crossing a page boundary and avoid going through layers of helpers. MacOS uses those instructions a lot, so does OpenBIOS. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: David Gibson --- target-ppc/mem_helper.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/target-ppc/mem_helper.c b/target-ppc/mem_helper.c index 6548715..bf6c44a 100644 --- a/target-ppc/mem_helper.c +++ b/target-ppc/mem_helper.c @@ -53,8 +53,48 @@ static inline target_ulong addr_add(CPUPPCState *env, target_ulong addr, } } +/* Reduce the length so that addr + len doesn't cross a page boundary. */ +static inline uint64_t adj_len_to_page(uint64_t len, uint64_t addr) +{ +#ifndef CONFIG_USER_ONLY + if ((addr & ~TARGET_PAGE_MASK) + len - 1 >= TARGET_PAGE_SIZE) { + return -addr & ~TARGET_PAGE_MASK; + } +#endif + return len; +} + void helper_lmw(CPUPPCState *env, target_ulong addr, uint32_t reg) { + uint32_t *src; + uint64_t len, adjlen; + + if ((addr & 3)) { + goto fallback; + } + len = (32 - reg) << 2; + while (len) { + src = tlb_vaddr_to_host(env, addr, MMU_DATA_LOAD, env->dmmu_idx); + if (!src) { + goto fallback; + } + adjlen = adj_len_to_page(len, addr); + len -= adjlen; +#if defined(HOST_WORDS_BIGENDIAN) + memcpy(&env->gpr[reg], src, adjlen); + reg += (adjlen >> 2); + addr = addr_add(env, addr, adjlen); +#else + while(adjlen) { + env->gpr[reg++] = bswap32(*(src++)); + adjlen -= 4; + addr = addr_add(env, addr, 4); + } +#endif + } + return; + + fallback: for (; reg < 32; reg++) { if (needs_byteswap(env)) { env->gpr[reg] = bswap32(cpu_ldl_data_ra(env, addr, GETPC())); @@ -67,6 +107,35 @@ void helper_lmw(CPUPPCState *env, target_ulong addr, uint32_t reg) void helper_stmw(CPUPPCState *env, target_ulong addr, uint32_t reg) { + uint32_t *dst; + uint64_t len, adjlen; + + if ((addr & 3)) { + goto fallback; + } + len = (32 - reg) << 2; + while (len) { + dst = tlb_vaddr_to_host(env, addr, MMU_DATA_STORE, env->dmmu_idx); + if (!dst) { + goto fallback; + } + adjlen = adj_len_to_page(len, addr); + len -= adjlen; +#if defined(HOST_WORDS_BIGENDIAN) + memcpy(dst, &env->gpr[reg], adjlen); + reg += (adjlen >> 2); + addr = addr_add(env, addr, adjlen); +#else + while(adjlen) { + *(dst++) = bswap32(env->gpr[reg++]); + adjlen -= 4; + addr = addr_add(env, addr, 4); + } +#endif + } + return; + + fallback: for (; reg < 32; reg++) { if (needs_byteswap(env)) { cpu_stl_data_ra(env, addr, bswap32((uint32_t)env->gpr[reg]), -- 2.7.4