From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A419C43603 for ; Thu, 12 Dec 2019 09:34:23 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E95FF2173E for ; Thu, 12 Dec 2019 09:34:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="vF6dUmOU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E95FF2173E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifKrW-0002NE-6K for qemu-devel@archiver.kernel.org; Thu, 12 Dec 2019 04:34:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39439) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifKqj-0001WX-KA for qemu-devel@nongnu.org; Thu, 12 Dec 2019 04:33:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifKqh-0003iC-Hu for qemu-devel@nongnu.org; Thu, 12 Dec 2019 04:33:33 -0500 Received: from mail-ot1-x341.google.com ([2607:f8b0:4864:20::341]:36231) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifKqh-0003gb-Aa for qemu-devel@nongnu.org; Thu, 12 Dec 2019 04:33:31 -0500 Received: by mail-ot1-x341.google.com with SMTP id i4so1181946otr.3 for ; Thu, 12 Dec 2019 01:33:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=TFs57VAv7d78E+LgqRszt9DyvlEsELvnrXv9GwBCAo0=; b=vF6dUmOUErRniAPdBGf2gWutcQHCXs39HjLx5UZUU5VpelkZdyrXVuqOEONX8bxkfD DMOhAKPNxa66nw9yILM7oPGeKqd7BQRyv/rJuo16XH4rtrZrv3KuBc4v/NTSDmV+rKzH 0L3xis4zePEZkCvyXyJezhl97Jek2vVWOyhAWd7Ot/4UNhRptSpOgDnndVgZUnzoBXOI coGBbm2Z1HlDxzPWO56ga+gnE+3tfazcdd2ZhzwVbP9usTT3qP2OhksFj2D3zNchUDSR 1NmV9Idx2aj0K7qEt+geYmDYvZnQ35ClGp26Nxm3g5xOAu477St8Ii9NKJZ69l0FnLIZ E2gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=TFs57VAv7d78E+LgqRszt9DyvlEsELvnrXv9GwBCAo0=; b=GerSSflcQc04d79jYQGHDSuxLeMSdRMDSEQJSVHcuVIDXHSVMre/r8mwb33gxteBIU oG86hIEhKzp1jUR2iQ+8Az8Zix+x70kqxQcO9oGCYkMCWNFjwPGmQDVbWhqzWxz6N8FK HG714dy5dZ4FD/Sfbdtbf+Wn0ig88GDmCUeUGI+r9Soci2wUGOjWJdy53JWWGiBBOfkE 5W3ZferTUCwRp87XJXX6XeOmCF+sVq0lb9uO7IbNYVCw4ltZ85H54zl8IMaoODpGzPGa 31jvsfh/NbhIumfCSpKxb+EysQ9MBhjNlfYoZS8EiN/PSQSV0We2jhHfzdbqsU8FihhH hzwQ== X-Gm-Message-State: APjAAAV+M7164tSPgqvy0WfwibUcNDqcqO0UxAw2J634PCu1tZUvDdqk WPIyrmvejUm9nHgqXonAgMTiLkHDhi3Im7KzVVw= X-Google-Smtp-Source: APXvYqwR1MC3ZvkKcCXxKeS+bm073fWFBnxlu38y35kgaS4FV5cNrBUPEdSxAdJ48DSCpWImBd8rE4XgdmhV5NEx4YI= X-Received: by 2002:a9d:7305:: with SMTP id e5mr6877457otk.64.1576143210475; Thu, 12 Dec 2019 01:33:30 -0800 (PST) MIME-Version: 1.0 References: <20191212040039.26546-1-richard.henderson@linaro.org> <20191212040039.26546-7-richard.henderson@linaro.org> In-Reply-To: <20191212040039.26546-7-richard.henderson@linaro.org> From: Aleksandar Markovic Date: Thu, 12 Dec 2019 10:33:19 +0100 Message-ID: Subject: Re: [PATCH 06/28] cputlb: Rename helper_ret_ld*_cmmu to cpu_ld*_code To: Richard Henderson Content-Type: text/plain; charset="UTF-8" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::341 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: QEMU Developers Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, Dec 12, 2019 at 5:07 AM Richard Henderson wrote: > > There are no uses of the *_cmmu names other than the bare wrapping > within the *_code inlines. Therefore rename the functions so we > can drop the inlines. > > Use abi_ptr instead of target_ulong in preparation for user-only; > the two types are identical for softmmu. > > Signed-off-by: Richard Henderson > --- Reviewed-by: Aleksandar Markovic > include/exec/cpu_ldst.h | 29 ++++------ > include/exec/cpu_ldst_template.h | 21 ------- > tcg/tcg.h | 29 ---------- > accel/tcg/cputlb.c | 94 ++++++++------------------------ > docs/devel/loads-stores.rst | 4 +- > 5 files changed, 36 insertions(+), 141 deletions(-) > > diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h > index 399ff6c3da..ef59ed61e4 100644 > --- a/include/exec/cpu_ldst.h > +++ b/include/exec/cpu_ldst.h > @@ -450,25 +450,20 @@ void cpu_stq_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint64_t val, > #undef CPU_MMU_INDEX > #undef MEMSUFFIX > > -#define CPU_MMU_INDEX (cpu_mmu_index(env, true)) > -#define MEMSUFFIX _code > -#define SOFTMMU_CODE_ACCESS > +uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr); > +uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr addr); > +uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr addr); > +uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr addr); > > -#define DATA_SIZE 1 > -#include "exec/cpu_ldst_template.h" > +static inline int cpu_ldsb_code(CPUArchState *env, abi_ptr addr) > +{ > + return (int8_t)cpu_ldub_code(env, addr); > +} > > -#define DATA_SIZE 2 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 4 > -#include "exec/cpu_ldst_template.h" > - > -#define DATA_SIZE 8 > -#include "exec/cpu_ldst_template.h" > - > -#undef CPU_MMU_INDEX > -#undef MEMSUFFIX > -#undef SOFTMMU_CODE_ACCESS > +static inline int cpu_ldsw_code(CPUArchState *env, abi_ptr addr) > +{ > + return (int16_t)cpu_lduw_code(env, addr); > +} > > #endif /* defined(CONFIG_USER_ONLY) */ > > diff --git a/include/exec/cpu_ldst_template.h b/include/exec/cpu_ldst_template.h > index ea39e29c19..e400979f23 100644 > --- a/include/exec/cpu_ldst_template.h > +++ b/include/exec/cpu_ldst_template.h > @@ -58,25 +58,6 @@ > > /* generic load/store macros */ > > -#ifdef SOFTMMU_CODE_ACCESS > - > -static inline RES_TYPE > -glue(glue(cpu_ld, USUFFIX), _code)(CPUArchState *env, target_ulong ptr) > -{ > - TCGMemOpIdx oi = make_memop_idx(MO_TE | SHIFT, CPU_MMU_INDEX); > - return glue(glue(helper_ret_ld, USUFFIX), _cmmu)(env, ptr, oi, 0); > -} > - > -#if DATA_SIZE <= 2 > -static inline int > -glue(glue(cpu_lds, SUFFIX), _code)(CPUArchState *env, target_ulong ptr) > -{ > - return (DATA_STYPE)glue(glue(cpu_ld, USUFFIX), _code)(env, ptr); > -} > -#endif > - > -#else > - > static inline RES_TYPE > glue(glue(glue(cpu_ld, USUFFIX), MEMSUFFIX), _ra)(CPUArchState *env, > target_ulong ptr, > @@ -127,8 +108,6 @@ glue(glue(cpu_st, SUFFIX), MEMSUFFIX)(CPUArchState *env, target_ulong ptr, > glue(glue(cpu_st, SUFFIX), _mmuidx_ra)(env, ptr, v, CPU_MMU_INDEX, 0); > } > > -#endif /* !SOFTMMU_CODE_ACCESS */ > - > #undef RES_TYPE > #undef DATA_TYPE > #undef DATA_STYPE > diff --git a/tcg/tcg.h b/tcg/tcg.h > index 92ca10dffc..3b4f79301c 100644 > --- a/tcg/tcg.h > +++ b/tcg/tcg.h > @@ -1290,27 +1290,6 @@ void helper_be_stl_mmu(CPUArchState *env, target_ulong addr, uint32_t val, > void helper_be_stq_mmu(CPUArchState *env, target_ulong addr, uint64_t val, > TCGMemOpIdx oi, uintptr_t retaddr); > > -uint8_t helper_ret_ldub_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr); > -int8_t helper_ret_ldsb_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr); > -uint16_t helper_le_lduw_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr); > -int16_t helper_le_ldsw_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr); > -uint32_t helper_le_ldl_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr); > -uint64_t helper_le_ldq_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr); > -uint16_t helper_be_lduw_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr); > -int16_t helper_be_ldsw_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr); > -uint32_t helper_be_ldl_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr); > -uint64_t helper_be_ldq_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr); > - > /* Temporary aliases until backends are converted. */ > #ifdef TARGET_WORDS_BIGENDIAN > # define helper_ret_ldsw_mmu helper_be_ldsw_mmu > @@ -1322,10 +1301,6 @@ uint64_t helper_be_ldq_cmmu(CPUArchState *env, target_ulong addr, > # define helper_ret_stw_mmu helper_be_stw_mmu > # define helper_ret_stl_mmu helper_be_stl_mmu > # define helper_ret_stq_mmu helper_be_stq_mmu > -# define helper_ret_lduw_cmmu helper_be_lduw_cmmu > -# define helper_ret_ldsw_cmmu helper_be_ldsw_cmmu > -# define helper_ret_ldl_cmmu helper_be_ldl_cmmu > -# define helper_ret_ldq_cmmu helper_be_ldq_cmmu > #else > # define helper_ret_ldsw_mmu helper_le_ldsw_mmu > # define helper_ret_lduw_mmu helper_le_lduw_mmu > @@ -1336,10 +1311,6 @@ uint64_t helper_be_ldq_cmmu(CPUArchState *env, target_ulong addr, > # define helper_ret_stw_mmu helper_le_stw_mmu > # define helper_ret_stl_mmu helper_le_stl_mmu > # define helper_ret_stq_mmu helper_le_stq_mmu > -# define helper_ret_lduw_cmmu helper_le_lduw_cmmu > -# define helper_ret_ldsw_cmmu helper_le_ldsw_cmmu > -# define helper_ret_ldl_cmmu helper_le_ldl_cmmu > -# define helper_ret_ldq_cmmu helper_le_ldq_cmmu > #endif > > uint32_t helper_atomic_cmpxchgb_mmu(CPUArchState *env, target_ulong addr, > diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c > index 4d3ec1d35a..7d519738bb 100644 > --- a/accel/tcg/cputlb.c > +++ b/accel/tcg/cputlb.c > @@ -2028,98 +2028,50 @@ void cpu_stq_mmuidx_ra(CPUArchState *env, target_ulong addr, uint64_t val, > > /* Code access functions. */ > > -static uint64_t full_ldub_cmmu(CPUArchState *env, target_ulong addr, > +static uint64_t full_ldub_code(CPUArchState *env, target_ulong addr, > TCGMemOpIdx oi, uintptr_t retaddr) > { > - return load_helper(env, addr, oi, retaddr, MO_8, true, full_ldub_cmmu); > + return load_helper(env, addr, oi, retaddr, MO_8, true, full_ldub_code); > } > > -uint8_t helper_ret_ldub_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr) > +uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr) > { > - return full_ldub_cmmu(env, addr, oi, retaddr); > + TCGMemOpIdx oi = make_memop_idx(MO_UB, cpu_mmu_index(env, true)); > + return full_ldub_code(env, addr, oi, 0); > } > > -int8_t helper_ret_ldsb_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr) > +static uint64_t full_lduw_code(CPUArchState *env, target_ulong addr, > + TCGMemOpIdx oi, uintptr_t retaddr) > { > - return (int8_t) full_ldub_cmmu(env, addr, oi, retaddr); > + return load_helper(env, addr, oi, retaddr, MO_TEUW, true, full_lduw_code); > } > > -static uint64_t full_le_lduw_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr) > +uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr addr) > { > - return load_helper(env, addr, oi, retaddr, MO_LEUW, true, > - full_le_lduw_cmmu); > + TCGMemOpIdx oi = make_memop_idx(MO_TEUW, cpu_mmu_index(env, true)); > + return full_lduw_code(env, addr, oi, 0); > } > > -uint16_t helper_le_lduw_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr) > +static uint64_t full_ldl_code(CPUArchState *env, target_ulong addr, > + TCGMemOpIdx oi, uintptr_t retaddr) > { > - return full_le_lduw_cmmu(env, addr, oi, retaddr); > + return load_helper(env, addr, oi, retaddr, MO_TEUL, true, full_ldl_code); > } > > -int16_t helper_le_ldsw_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr) > +uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr addr) > { > - return (int16_t) full_le_lduw_cmmu(env, addr, oi, retaddr); > + TCGMemOpIdx oi = make_memop_idx(MO_TEUL, cpu_mmu_index(env, true)); > + return full_ldl_code(env, addr, oi, 0); > } > > -static uint64_t full_be_lduw_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr) > +static uint64_t full_ldq_code(CPUArchState *env, target_ulong addr, > + TCGMemOpIdx oi, uintptr_t retaddr) > { > - return load_helper(env, addr, oi, retaddr, MO_BEUW, true, > - full_be_lduw_cmmu); > + return load_helper(env, addr, oi, retaddr, MO_TEQ, true, full_ldq_code); > } > > -uint16_t helper_be_lduw_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr) > +uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr addr) > { > - return full_be_lduw_cmmu(env, addr, oi, retaddr); > -} > - > -int16_t helper_be_ldsw_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr) > -{ > - return (int16_t) full_be_lduw_cmmu(env, addr, oi, retaddr); > -} > - > -static uint64_t full_le_ldul_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr) > -{ > - return load_helper(env, addr, oi, retaddr, MO_LEUL, true, > - full_le_ldul_cmmu); > -} > - > -uint32_t helper_le_ldl_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr) > -{ > - return full_le_ldul_cmmu(env, addr, oi, retaddr); > -} > - > -static uint64_t full_be_ldul_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr) > -{ > - return load_helper(env, addr, oi, retaddr, MO_BEUL, true, > - full_be_ldul_cmmu); > -} > - > -uint32_t helper_be_ldl_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr) > -{ > - return full_be_ldul_cmmu(env, addr, oi, retaddr); > -} > - > -uint64_t helper_le_ldq_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr) > -{ > - return load_helper(env, addr, oi, retaddr, MO_LEQ, true, > - helper_le_ldq_cmmu); > -} > - > -uint64_t helper_be_ldq_cmmu(CPUArchState *env, target_ulong addr, > - TCGMemOpIdx oi, uintptr_t retaddr) > -{ > - return load_helper(env, addr, oi, retaddr, MO_BEQ, true, > - helper_be_ldq_cmmu); > + TCGMemOpIdx oi = make_memop_idx(MO_TEQ, cpu_mmu_index(env, true)); > + return full_ldq_code(env, addr, oi, 0); > } > diff --git a/docs/devel/loads-stores.rst b/docs/devel/loads-stores.rst > index c74cd090e6..8a5bc912a5 100644 > --- a/docs/devel/loads-stores.rst > +++ b/docs/devel/loads-stores.rst > @@ -171,8 +171,6 @@ more in line with the other memory access functions. > > load: ``helper_{endian}_ld{sign}{size}_mmu(env, addr, opindex, retaddr)`` > > -load (code): ``helper_{endian}_ld{sign}{size}_cmmu(env, addr, opindex, retaddr)`` > - > store: ``helper_{endian}_st{size}_mmu(env, addr, val, opindex, retaddr)`` > > ``sign`` > @@ -192,7 +190,7 @@ store: ``helper_{endian}_st{size}_mmu(env, addr, val, opindex, retaddr)`` > - ``ret`` : target endianness > > Regexes for git grep > - - ``\`` > + - ``\`` > - ``\`` > > ``address_space_*`` > -- > 2.20.1 > >