From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51408) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsYZ5-0006lI-Kk for qemu-devel@nongnu.org; Thu, 05 Jun 2014 10:22:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsYYv-0008RO-FM for qemu-devel@nongnu.org; Thu, 05 Jun 2014 10:22:47 -0400 Received: from mail-wi0-x22d.google.com ([2a00:1450:400c:c05::22d]:34110) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsYYv-0008R5-93 for qemu-devel@nongnu.org; Thu, 05 Jun 2014 10:22:37 -0400 Received: by mail-wi0-f173.google.com with SMTP id bs8so10556913wib.12 for ; Thu, 05 Jun 2014 07:22:35 -0700 (PDT) Received: from playground.station (net-37-117-132-7.cust.vodafonedsl.it. [37.117.132.7]) by mx.google.com with ESMTPSA id p9sm14884136eeg.32.2014.06.05.07.22.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jun 2014 07:22:35 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 5 Jun 2014 16:21:55 +0200 Message-Id: <1401978143-11896-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1401978143-11896-1-git-send-email-pbonzini@redhat.com> References: <1401978143-11896-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 05/33] softmmu: move MMUSUFFIX under SOFTMMU_CODE_ACCESS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- include/exec/softmmu_header.h | 11 ++--------- 1 file 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.8.3.1