From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60354) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brLNT-00044d-TK for qemu-devel@nongnu.org; Tue, 04 Oct 2016 04:47:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brLNP-0004WK-SV for qemu-devel@nongnu.org; Tue, 04 Oct 2016 04:47:07 -0400 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]:35385) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brLNP-0004Vy-Mu for qemu-devel@nongnu.org; Tue, 04 Oct 2016 04:47:03 -0400 Received: by mail-wm0-x232.google.com with SMTP id f193so153771175wmg.0 for ; Tue, 04 Oct 2016 01:47:03 -0700 (PDT) References: <1474048017-26696-1-git-send-email-rth@twiddle.net> <1474048017-26696-9-git-send-email-rth@twiddle.net> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <1474048017-26696-9-git-send-email-rth@twiddle.net> Date: Tue, 04 Oct 2016 09:47:01 +0100 Message-ID: <87wphosdq2.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v4 08/35] cputlb: Replace SHIFT with DATA_SIZE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Richard Henderson Cc: qemu-devel@nongnu.org Richard Henderson writes: > Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée > --- > 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 -- Alex Bennée