On 2/3/21 10:19 AM, Richard Henderson wrote:
On 2/2/21 6:58 PM, Rebecca Cran wrote:
@@ -9433,8 +9448,9 @@ static void take_aarch32_exception(CPUARMState *env, int
new_mode,
* For exceptions taken to AArch32 we must clear the SS bit in both
* PSTATE and in the old-state value we save to SPSR_<mode>, so zero it
now.
*/
- env->uncached_cpsr &= ~PSTATE_SS;
- env->spsr = cpsr_read(env);
+ env->pstate &= ~PSTATE_SS;
+ env->spsr = cpsr_read_for_spsr_elx(env);
+
Again, this is the aarch32 exception path, and should not use
cpsr_read_for_spsr_elx.
Yeah, sorry I'm not sure why/how that got in.
I'm hoping the v5 series that I'm sending out in a few minutes fixes
these issues.
--
Rebecca Cran
