Am 05.03.2012 18:06, schrieb Meador Inge: > On 02/23/2012 07:44 AM, Meador Inge wrote: > >> '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: Meador Inge <mead...@codesourcery.com> > > Ping.
Cc'ing qemu-ppc. What's the test case (command line) that breaks? Don't all machines use different default CPUs? I would rather drop these ..._DEFAULT defines in favor of using a real CPU model - but maybe I'm misunderstanding something? Andreas > >> --- >> target-ppc/translate_init.c | 4 ++-- >> 1 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c >> index 6253076..6cb5fad 100644 >> --- a/target-ppc/translate_init.c >> +++ b/target-ppc/translate_init.c >> @@ -6713,7 +6713,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 >> @@ -6725,7 +6725,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 -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
