From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40362) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1by3Ty-00052j-A7 for qemu-devel@nongnu.org; Sat, 22 Oct 2016 17:05:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1by3Tx-0001qs-5l for qemu-devel@nongnu.org; Sat, 22 Oct 2016 17:05:34 -0400 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:36185) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1by3Tw-0001qA-Pg for qemu-devel@nongnu.org; Sat, 22 Oct 2016 17:05:33 -0400 Received: by mail-pf0-x241.google.com with SMTP id r16so12062899pfg.3 for ; Sat, 22 Oct 2016 14:05:32 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Sat, 22 Oct 2016 14:04:57 -0700 Message-Id: <1477170324-17783-9-git-send-email-rth@twiddle.net> In-Reply-To: <1477170324-17783-1-git-send-email-rth@twiddle.net> References: <1477170324-17783-1-git-send-email-rth@twiddle.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL 08/35] cputlb: Replace SHIFT with DATA_SIZE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Reviewed-by: Emilio G. Cota Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- cputlb.c | 16 ++++++++-------- softmmu_template.h | 7 ++----- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/cputlb.c b/cputlb.c index 3c99c34..5575b73 100644 --- a/cputlb.c +++ b/cputlb.c @@ -529,16 +529,16 @@ static bool victim_tlb_hit(CPUArchState *env, size_t mmu_idx, size_t index, #define MMUSUFFIX _mmu -#define SHIFT 0 +#define DATA_SIZE 1 #include "softmmu_template.h" -#define SHIFT 1 +#define DATA_SIZE 2 #include "softmmu_template.h" -#define SHIFT 2 +#define DATA_SIZE 4 #include "softmmu_template.h" -#define SHIFT 3 +#define DATA_SIZE 8 #include "softmmu_template.h" #undef MMUSUFFIX @@ -547,14 +547,14 @@ static bool victim_tlb_hit(CPUArchState *env, size_t mmu_idx, size_t index, #define GETPC() ((uintptr_t)0) #define SOFTMMU_CODE_ACCESS -#define SHIFT 0 +#define DATA_SIZE 1 #include "softmmu_template.h" -#define SHIFT 1 +#define DATA_SIZE 2 #include "softmmu_template.h" -#define SHIFT 2 +#define DATA_SIZE 4 #include "softmmu_template.h" -#define SHIFT 3 +#define DATA_SIZE 8 #include "softmmu_template.h" diff --git a/softmmu_template.h b/softmmu_template.h index 27ed269..f9c51fe 100644 --- a/softmmu_template.h +++ b/softmmu_template.h @@ -25,8 +25,6 @@ #include "exec/address-spaces.h" #include "exec/memory.h" -#define DATA_SIZE (1 << SHIFT) - #if DATA_SIZE == 8 #define SUFFIX q #define LSUFFIX q @@ -134,7 +132,7 @@ static inline DATA_TYPE glue(io_read, SUFFIX)(CPUArchState *env, } cpu->mem_io_vaddr = addr; - memory_region_dispatch_read(mr, physaddr, &val, 1 << SHIFT, + memory_region_dispatch_read(mr, physaddr, &val, DATA_SIZE, iotlbentry->attrs); return val; } @@ -311,7 +309,7 @@ static inline void glue(io_write, SUFFIX)(CPUArchState *env, cpu->mem_io_vaddr = addr; cpu->mem_io_pc = retaddr; - memory_region_dispatch_write(mr, physaddr, val, 1 << SHIFT, + memory_region_dispatch_write(mr, physaddr, val, DATA_SIZE, iotlbentry->attrs); } @@ -492,7 +490,6 @@ void probe_write(CPUArchState *env, target_ulong addr, int mmu_idx, #endif /* !defined(SOFTMMU_CODE_ACCESS) */ #undef READ_ACCESS_TYPE -#undef SHIFT #undef DATA_TYPE #undef SUFFIX #undef LSUFFIX -- 2.7.4