fixup! Imported source files from QEMU v1.0.0 target-arm/libcpu

weizhou-chaojixx · weizhou-chaojixx · commit 447774bb1092 · 2020-01-20T17:55:07.000-05:00
diff --git a/src/target-arm/helper.c b/src/target-arm/helper.c
@@ -316,7 +316,6 @@ void cpu_state_reset(CPUARMState *env) {
     /* On ARMv7-M the CPSR_I is the value of the PRIMASK register, and is
        clear at reset.  Initial SP and PC are loaded from ROM.  */
     if (IS_M(env)) {
-        uint32_t pc;
         env->uncached_cpsr &= ~CPSR_I;
     }
     env->vfp.xregs[ARM_VFP_FPEXC] = 0;

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,6 @@ void cpu_state_reset(CPUARMState *env) {`
`316`	`316`	`/* On ARMv7-M the CPSR_I is the value of the PRIMASK register, and is`
`317`	`317`	`clear at reset. Initial SP and PC are loaded from ROM. */`
`318`	`318`	`if (IS_M(env)) {`
`319`		`- uint32_t pc;`
`320`	`319`	`env->uncached_cpsr &= ~CPSR_I;`
`321`	`320`	`}`
`322`	`321`	`env->vfp.xregs[ARM_VFP_FPEXC] = 0;`