Commit 1b9e01c1 authored by Peter Maydell's avatar Peter Maydell
Browse files

target-arm: Don't use cpu_single_env in bank_number() 



Avoid using cpu_single_env in bank_number() -- if we were
called via the gdb stub reading or writing the CPSR then
it is NULL and we will segfault if we take the cpu_abort().

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent c47f3223

target-arm/helper.c

+6 −6
Original line number Diff line number Diff line
@@ -642,7 +642,7 @@ uint32_t HELPER(get_r13_banked)(CPUState *env, uint32_t mode) 
extern int semihosting_enabled;



/* Map CPU modes onto saved register banks.  */

static inline int bank_number (int mode)

static inline int bank_number(CPUState *env, int mode)

{

    switch (mode) {

    case ARM_CPU_MODE_USR:
@@ -659,7 +659,7 @@ static inline int bank_number (int mode) 
    case ARM_CPU_MODE_FIQ:

        return 5;

    }

    cpu_abort(cpu_single_env, "Bad mode %x\n", mode);

    cpu_abort(env, "Bad mode %x\n", mode);

    return -1;

}
@@ -680,12 +680,12 @@ void switch_mode(CPUState *env, int mode) 
        memcpy (env->regs + 8, env->fiq_regs, 5 * sizeof(uint32_t));

    }



    i = bank_number(old_mode);

    i = bank_number(env, old_mode);

    env->banked_r13[i] = env->regs[13];

    env->banked_r14[i] = env->regs[14];

    env->banked_spsr[i] = env->spsr;



    i = bank_number(mode);

    i = bank_number(env, mode);

    env->regs[13] = env->banked_r13[i];

    env->regs[14] = env->banked_r14[i];

    env->spsr = env->banked_spsr[i];
@@ -2125,7 +2125,7 @@ void HELPER(set_r13_banked)(CPUState *env, uint32_t mode, uint32_t val) 
    if ((env->uncached_cpsr & CPSR_M) == mode) {

        env->regs[13] = val;

    } else {

        env->banked_r13[bank_number(mode)] = val;

        env->banked_r13[bank_number(env, mode)] = val;

    }

}
@@ -2134,7 +2134,7 @@ uint32_t HELPER(get_r13_banked)(CPUState *env, uint32_t mode) 
    if ((env->uncached_cpsr & CPSR_M) == mode) {

        return env->regs[13];

    } else {

        return env->banked_r13[bank_number(mode)];

        return env->banked_r13[bank_number(env, mode)];

    }

}