Commit 6bbc5ed1 authored by Meador Inge's avatar Meador Inge Committed by Alexander Graf
Browse files

ppc: Correctly define POWERPC_INSNS2_DEFAULT 



'POWERPC_INSNS2_DEFAULT' was defined incorrectly which was causing the
opcode table creation code to erroneously register 'eieio' and 'mbar'
for the "default" processor:

   ** ERROR: opcode 1a already assigned in opcode table 16
   *** ERROR: unable to insert opcode [1f-16-1a]
   *** ERROR initializing PowerPC instruction 0x1f 0x16 0x1a

Signed-off-by: default avatarMeador Inge <meadori@codesourcery.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent d07fee7e

target-ppc/translate_init.c

+2 −2
Original line number Diff line number Diff line
@@ -6718,7 +6718,7 @@ static void init_proc_620 (CPUPPCState *env) 
#if defined (TARGET_PPC64) && 0 // XXX: TODO

#define CPU_POWERPC_DEFAULT    CPU_POWERPC_PPC64

#define POWERPC_INSNS_DEFAULT  POWERPC_INSNS_PPC64

#define POWERPC_INSNS2_DEFAULT POWERPC_INSNS_PPC64

#define POWERPC_INSNS2_DEFAULT POWERPC_INSNS2_PPC64

#define POWERPC_MSRM_DEFAULT   POWERPC_MSRM_PPC64

#define POWERPC_MMU_DEFAULT    POWERPC_MMU_PPC64

#define POWERPC_EXCP_DEFAULT   POWERPC_EXCP_PPC64
@@ -6730,7 +6730,7 @@ static void init_proc_620 (CPUPPCState *env) 
#else

#define CPU_POWERPC_DEFAULT    CPU_POWERPC_PPC32

#define POWERPC_INSNS_DEFAULT  POWERPC_INSNS_PPC32

#define POWERPC_INSNS2_DEFAULT POWERPC_INSNS_PPC32

#define POWERPC_INSNS2_DEFAULT POWERPC_INSNS2_PPC32

#define POWERPC_MSRM_DEFAULT   POWERPC_MSRM_PPC32

#define POWERPC_MMU_DEFAULT    POWERPC_MMU_PPC32

#define POWERPC_EXCP_DEFAULT   POWERPC_EXCP_PPC32