From: Alexey Kardashevskiy Date: Fri, 20 Dec 2013 06:41:30 +0000 (+1100) Subject: target-ppc: fix LPCR SPR number X-Git-Tag: v2.0.0-rc0~37^2~128 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6475c9f05ca89d76635108dca64a11759838e03c;p=thirdparty%2Fqemu.git target-ppc: fix LPCR SPR number PowerISA defines LPCR SPR number as 318=0x13E but QEMU uses the value of 316. This fixes the definition of LPCR SPR. Signed-off-by: Alexey Kardashevskiy Signed-off-by: Alexander Graf --- diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index bb847676a52..4369e7cc387 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -1322,12 +1322,12 @@ static inline int cpu_mmu_index (CPUPPCState *env) #define SPR_BOOKE_IAC3 (0x13A) #define SPR_HSRR1 (0x13B) #define SPR_BOOKE_IAC4 (0x13B) -#define SPR_LPCR (0x13C) #define SPR_BOOKE_DAC1 (0x13C) #define SPR_LPIDR (0x13D) #define SPR_DABR2 (0x13D) #define SPR_BOOKE_DAC2 (0x13D) #define SPR_BOOKE_DVC1 (0x13E) +#define SPR_LPCR (0x13E) #define SPR_BOOKE_DVC2 (0x13F) #define SPR_BOOKE_TSR (0x150) #define SPR_BOOKE_TCR (0x154) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 7bbda13faa0..ed7008795ee 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -2578,8 +2578,8 @@ static void gen_spr_8xx (CPUPPCState *env) * HRMOR => SPR 313 (Power 2.04 hypv) * HSRR0 => SPR 314 (Power 2.04 hypv) * HSRR1 => SPR 315 (Power 2.04 hypv) - * LPCR => SPR 316 (970) * LPIDR => SPR 317 (970) + * LPCR => SPR 318 (970) * EPR => SPR 702 (Power 2.04 emb) * perf => 768-783 (Power 2.04) * perf => 784-799 (Power 2.04)