Commit 06a7e647 authored by Edgar E. Iglesias's avatar Edgar E. Iglesias Committed by Peter Maydell
Browse files

target-arm: Break out mpidr_read_val() 



Break out mpidr_read_val() to allow future sharing of the
code that conditionally sets the M and U bits of MPIDR.

No functional changes.

Signed-off-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 1442135278-25281-8-git-send-email-edgar.iglesias@gmail.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 731de9e6

target-arm/helper.c

+6 −1
Original line number Diff line number Diff line
@@ -2457,7 +2457,7 @@ static uint64_t midr_read(CPUARMState *env, const ARMCPRegInfo *ri) 
    return raw_read(env, ri);

}



static uint64_t mpidr_read(CPUARMState *env, const ARMCPRegInfo *ri)

static uint64_t mpidr_read_val(CPUARMState *env)

{

    ARMCPU *cpu = ARM_CPU(arm_env_get_cpu(env));

    uint64_t mpidr = cpu->mp_affinity;
@@ -2475,6 +2475,11 @@ static uint64_t mpidr_read(CPUARMState *env, const ARMCPRegInfo *ri) 
    return mpidr;

}



static uint64_t mpidr_read(CPUARMState *env, const ARMCPRegInfo *ri)

{

    return mpidr_read_val(env);

}



static const ARMCPRegInfo mpidr_cp_reginfo[] = {

    { .name = "MPIDR", .state = ARM_CP_STATE_BOTH,

      .opc0 = 3, .crn = 0, .crm = 0, .opc1 = 0, .opc2 = 5,