From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9bnX-0008Ol-Fi for qemu-devel@nongnu.org; Thu, 17 Dec 2015 11:53:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9bnT-00082Z-C2 for qemu-devel@nongnu.org; Thu, 17 Dec 2015 11:52:59 -0500 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]:34155) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9bnS-00082N-Ob for qemu-devel@nongnu.org; Thu, 17 Dec 2015 11:52:55 -0500 Received: by mail-wm0-x22e.google.com with SMTP id l126so31981502wml.1 for ; Thu, 17 Dec 2015 08:52:54 -0800 (PST) References: <1450082498-27109-1-git-send-email-a.rigo@virtualopensystems.com> <1450082498-27109-13-git-send-email-a.rigo@virtualopensystems.com> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <1450082498-27109-13-git-send-email-a.rigo@virtualopensystems.com> Date: Thu, 17 Dec 2015 16:52:52 +0000 Message-ID: <87poy5f257.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [RFC v6 12/14] softmmu: Simplify helper_*_st_name, wrap RAM code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alvise Rigo Cc: mttcg@listserver.greensocs.com, claudio.fontana@huawei.com, qemu-devel@nongnu.org, pbonzini@redhat.com, jani.kokkonen@huawei.com, tech@virtualopensystems.com, rth@twiddle.net Alvise Rigo writes: > Attempting to simplify the helper_*_st_name, wrap the code relative to a > RAM access into an inline function. This commit breaks a default x86_64-softmmu build: CC x86_64-softmmu/../hw/audio/pcspk.o In file included from /home/alex/lsrc/qemu/qemu.git/cputlb.c:527:0: /home/alex/lsrc/qemu/qemu.git/softmmu_template.h: In function ‘helper_ret_stb_mmu’: /home/alex/lsrc/qemu/qemu.git/softmmu_template.h:503:13: error: ‘haddr’ undeclared (first use in this function) haddr = addr + env->tlb_table[mmu_idx][index].addend; ^ /home/alex/lsrc/qemu/qemu.git/softmmu_template.h:503:13: note: each undeclared identifier is reported only once for each function it appears in In file included from /home/alex/lsrc/qemu/qemu.git/cputlb.c:530:0: /home/alex/lsrc/qemu/qemu.git/softmmu_template.h: In function ‘helper_le_stw_mmu’: /home/alex/lsrc/qemu/qemu.git/softmmu_template.h:503:13: error: ‘haddr’ undeclared (first use in this function) haddr = addr + env->tlb_table[mmu_idx][index].addend; ^ /home/alex/lsrc/qemu/qemu.git/softmmu_template.h: In function ‘helper_be_stw_mmu’: /home/alex/lsrc/qemu/qemu.git/softmmu_template.h:651:13: error: ‘haddr’ undeclared (first use in this function) haddr = addr + env->tlb_table[mmu_idx][index].addend; ^ In file included from /home/alex/lsrc/qemu/qemu.git/cputlb.c:533:0: /home/alex/lsrc/qemu/qemu.git/softmmu_template.h: In function ‘helper_le_stl_mmu’: /home/alex/lsrc/qemu/qemu.git/softmmu_template.h:503:13: error: ‘haddr’ undeclared (first use in this function) haddr = addr + env->tlb_table[mmu_idx][index].addend; ^ /home/alex/lsrc/qemu/qemu.git/softmmu_template.h: In function ‘helper_be_stl_mmu’: /home/alex/lsrc/qemu/qemu.git/softmmu_template.h:651:13: error: ‘haddr’ undeclared (first use in this function) haddr = addr + env->tlb_table[mmu_idx][index].addend; ^ In file included from /home/alex/lsrc/qemu/qemu.git/cputlb.c:536:0: /home/alex/lsrc/qemu/qemu.git/softmmu_template.h: In function ‘helper_le_stq_mmu’: /home/alex/lsrc/qemu/qemu.git/softmmu_template.h:503:13: error: ‘haddr’ undeclared (first use in this function) haddr = addr + env->tlb_table[mmu_idx][index].addend; ^ /home/alex/lsrc/qemu/qemu.git/softmmu_template.h: In function ‘helper_be_stq_mmu’: /home/alex/lsrc/qemu/qemu.git/softmmu_template.h:651:13: error: ‘haddr’ undeclared (first use in this function) haddr = addr + env->tlb_table[mmu_idx][index].addend; ^ make[1]: *** [cputlb.o] Error 1 make[1]: *** Waiting for unfinished jobs.... CC x86_64-softmmu/../hw/block/fdc.o make: *** [subdir-x86_64-softmmu] Error 2 ERROR: commit 3a371deaf11ce944127a00eadbc7e811b6798de1 failed to build! commit 3a371deaf11ce944127a00eadbc7e811b6798de1 Author: Alvise Rigo Date: Thu Dec 10 17:26:54 2015 +0100 softmmu: Simplify helper_*_st_name, wrap RAM code Found while checking with Jeff's compile-check script: https://github.com/codyprime/git-scripts git compile-check -r c3626ca7df027dabf0568284360a23faf18f0884..HEAD > > Suggested-by: Jani Kokkonen > Suggested-by: Claudio Fontana > Signed-off-by: Alvise Rigo > --- > softmmu_template.h | 110 +++++++++++++++++++++++++++++++++-------------------- > 1 file changed, 68 insertions(+), 42 deletions(-) > > diff --git a/softmmu_template.h b/softmmu_template.h > index 2ebf527..262c95f 100644 > --- a/softmmu_template.h > +++ b/softmmu_template.h > @@ -416,13 +416,46 @@ static inline void glue(helper_le_st_name, _do_mmio_access)(CPUArchState *env, > glue(io_write, SUFFIX)(env, iotlbentry, val, addr, retaddr); > } > > +static inline void glue(helper_le_st_name, _do_ram_access)(CPUArchState *env, > + DATA_TYPE val, > + target_ulong addr, > + TCGMemOpIdx oi, > + unsigned mmu_idx, > + int index, > + uintptr_t retaddr) > +{ > + uintptr_t haddr; > + > + /* Handle slow unaligned access (it spans two pages or IO). */ > + if (DATA_SIZE > 1 > + && unlikely((addr & ~TARGET_PAGE_MASK) + DATA_SIZE - 1 > + >= TARGET_PAGE_SIZE)) { > + glue(helper_le_st_name, _do_unl_access)(env, val, addr, oi, mmu_idx, > + retaddr); > + return; > + } > + > + /* Handle aligned access or unaligned access in the same page. */ > + if ((addr & (DATA_SIZE - 1)) != 0 > + && (get_memop(oi) & MO_AMASK) == MO_ALIGN) { > + cpu_unaligned_access(ENV_GET_CPU(env), addr, MMU_DATA_STORE, > + mmu_idx, retaddr); > + } > + > + haddr = addr + env->tlb_table[mmu_idx][index].addend; > +#if DATA_SIZE == 1 > + glue(glue(st, SUFFIX), _p)((uint8_t *)haddr, val); > +#else > + glue(glue(st, SUFFIX), _le_p)((uint8_t *)haddr, val); > +#endif > +} > + > void helper_le_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val, > TCGMemOpIdx oi, uintptr_t retaddr) > { > unsigned mmu_idx = get_mmuidx(oi); > int index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1); > target_ulong tlb_addr = env->tlb_table[mmu_idx][index].addr_write; > - uintptr_t haddr; > > /* Adjust the given return address. */ > retaddr -= GETPC_ADJ; > @@ -484,28 +517,8 @@ void helper_le_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val, > } > } > > - /* Handle slow unaligned access (it spans two pages or IO). */ > - if (DATA_SIZE > 1 > - && unlikely((addr & ~TARGET_PAGE_MASK) + DATA_SIZE - 1 > - >= TARGET_PAGE_SIZE)) { > - glue(helper_le_st_name, _do_unl_access)(env, val, addr, oi, mmu_idx, > - retaddr); > - return; > - } > - > - /* Handle aligned access or unaligned access in the same page. */ > - if ((addr & (DATA_SIZE - 1)) != 0 > - && (get_memop(oi) & MO_AMASK) == MO_ALIGN) { > - cpu_unaligned_access(ENV_GET_CPU(env), addr, MMU_DATA_STORE, > - mmu_idx, retaddr); > - } > - > - haddr = addr + env->tlb_table[mmu_idx][index].addend; > -#if DATA_SIZE == 1 > - glue(glue(st, SUFFIX), _p)((uint8_t *)haddr, val); > -#else > - glue(glue(st, SUFFIX), _le_p)((uint8_t *)haddr, val); > -#endif > + glue(helper_le_st_name, _do_ram_access)(env, val, addr, oi, mmu_idx, index, > + retaddr); > } > > #if DATA_SIZE > 1 > @@ -555,13 +568,42 @@ static inline void glue(helper_be_st_name, _do_mmio_access)(CPUArchState *env, > glue(io_write, SUFFIX)(env, iotlbentry, val, addr, retaddr); > } > > +static inline void glue(helper_be_st_name, _do_ram_access)(CPUArchState *env, > + DATA_TYPE val, > + target_ulong addr, > + TCGMemOpIdx oi, > + unsigned mmu_idx, > + int index, > + uintptr_t retaddr) > +{ > + uintptr_t haddr; > + > + /* Handle slow unaligned access (it spans two pages or IO). */ > + if (DATA_SIZE > 1 > + && unlikely((addr & ~TARGET_PAGE_MASK) + DATA_SIZE - 1 > + >= TARGET_PAGE_SIZE)) { > + glue(helper_be_st_name, _do_unl_access)(env, val, addr, oi, mmu_idx, > + retaddr); > + return; > + } > + > + /* Handle aligned access or unaligned access in the same page. */ > + if ((addr & (DATA_SIZE - 1)) != 0 > + && (get_memop(oi) & MO_AMASK) == MO_ALIGN) { > + cpu_unaligned_access(ENV_GET_CPU(env), addr, MMU_DATA_STORE, > + mmu_idx, retaddr); > + } > + > + haddr = addr + env->tlb_table[mmu_idx][index].addend; > + glue(glue(st, SUFFIX), _be_p)((uint8_t *)haddr, val); > +} > + > void helper_be_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val, > TCGMemOpIdx oi, uintptr_t retaddr) > { > unsigned mmu_idx = get_mmuidx(oi); > int index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1); > target_ulong tlb_addr = env->tlb_table[mmu_idx][index].addr_write; > - uintptr_t haddr; > > /* Adjust the given return address. */ > retaddr -= GETPC_ADJ; > @@ -623,24 +665,8 @@ void helper_be_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val, > } > } > > - /* Handle slow unaligned access (it spans two pages or IO). */ > - if (DATA_SIZE > 1 > - && unlikely((addr & ~TARGET_PAGE_MASK) + DATA_SIZE - 1 > - >= TARGET_PAGE_SIZE)) { > - glue(helper_be_st_name, _do_unl_access)(env, val, addr, oi, mmu_idx, > - retaddr); > - return; > - } > - > - /* Handle aligned access or unaligned access in the same page. */ > - if ((addr & (DATA_SIZE - 1)) != 0 > - && (get_memop(oi) & MO_AMASK) == MO_ALIGN) { > - cpu_unaligned_access(ENV_GET_CPU(env), addr, MMU_DATA_STORE, > - mmu_idx, retaddr); > - } > - > - haddr = addr + env->tlb_table[mmu_idx][index].addend; > - glue(glue(st, SUFFIX), _be_p)((uint8_t *)haddr, val); > + glue(helper_be_st_name, _do_ram_access)(env, val, addr, oi, mmu_idx, index, > + retaddr); > } > #endif /* DATA_SIZE > 1 */ -- Alex Bennée