From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgHji-0007vI-QJ for qemu-devel@nongnu.org; Sat, 03 Sep 2016 16:40:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bgHjb-000304-Se for qemu-devel@nongnu.org; Sat, 03 Sep 2016 16:40:21 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:33263) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgHjb-0002zs-M1 for qemu-devel@nongnu.org; Sat, 03 Sep 2016 16:40:15 -0400 Received: by mail-pf0-x243.google.com with SMTP id i6so7418852pfe.0 for ; Sat, 03 Sep 2016 13:40:15 -0700 (PDT) Received: from bigtime.twiddle.net (174-24-157-40.tukw.qwest.net. [174.24.157.40]) by smtp.gmail.com with ESMTPSA id cp11sm23739651pac.28.2016.09.03.13.40.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 03 Sep 2016 13:40:13 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Sat, 3 Sep 2016 13:39:36 -0700 Message-Id: <1472935202-3342-9-git-send-email-rth@twiddle.net> In-Reply-To: <1472935202-3342-1-git-send-email-rth@twiddle.net> References: <1472935202-3342-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH v3 08/34] cputlb: Replace SHIFT with DATA_SIZE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 d068ee5..cf68211 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 @@ -549,14 +549,14 @@ static bool victim_tlb_hit(CPUArchState *env, size_t mmu_idx, size_t index, #define GETRA() ((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 284ab2c..3c56df1 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; } @@ -321,7 +319,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); } @@ -512,7 +510,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