From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51849) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnrHf-0003Kv-To for qemu-devel@nongnu.org; Fri, 23 May 2014 11:21:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WnrHY-0005Eb-Ub for qemu-devel@nongnu.org; Fri, 23 May 2014 11:21:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44121) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnrHY-0005EH-JN for qemu-devel@nongnu.org; Fri, 23 May 2014 11:21:16 -0400 From: Paolo Bonzini Date: Fri, 23 May 2014 17:20:49 +0200 Message-Id: <1400858457-20391-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1400858457-20391-1-git-send-email-pbonzini@redhat.com> References: <1400858457-20391-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 05/13] softmmu: move MMUSUFFIX under SOFTMMU_CODE_ACCESS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, afaerber@suse.de Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- include/exec/softmmu_header.h | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/include/exec/softmmu_header.h b/include/exec/softmmu_header.h index 087b2d4..cc85a43 100644 --- a/include/exec/softmmu_header.h +++ b/include/exec/softmmu_header.h @@ -48,20 +48,11 @@ #endif #if ACCESS_TYPE < (NB_MMU_MODES) - #define CPU_MMU_INDEX ACCESS_TYPE -#define MMUSUFFIX _mmu - #elif ACCESS_TYPE == (NB_MMU_MODES) - #define CPU_MMU_INDEX (cpu_mmu_index(env)) -#define MMUSUFFIX _mmu - #elif ACCESS_TYPE == (NB_MMU_MODES + 1) - #define CPU_MMU_INDEX (cpu_mmu_index(env)) -#define MMUSUFFIX _cmmu - #else #error invalid ACCESS_TYPE #endif @@ -74,8 +65,10 @@ #ifdef SOFTMMU_CODE_ACCESS #define ADDR_READ addr_code +#define MMUSUFFIX _cmmu #else #define ADDR_READ addr_read +#define MMUSUFFIX _mmu #endif /* generic load/store macros */ -- 1.7.1