mirror of https://github.com/xemu-project/xemu.git
target-arm: Implement ARMv8 MVFR registers
For ARMv8 there are two changes to the MVFR media feature registers: * there is a new MVFR2 which is accessible from 32 bit code * 64 bit code accesses these via the usual sysreg instructions rather than with a floating-point specific instruction Implement this. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
This commit is contained in:
parent
52e60cdd34
commit
a50c0f5133
|
@ -116,6 +116,7 @@ typedef struct ARMCPU {
|
||||||
uint32_t reset_fpsid;
|
uint32_t reset_fpsid;
|
||||||
uint32_t mvfr0;
|
uint32_t mvfr0;
|
||||||
uint32_t mvfr1;
|
uint32_t mvfr1;
|
||||||
|
uint32_t mvfr2;
|
||||||
uint32_t ctr;
|
uint32_t ctr;
|
||||||
uint32_t reset_sctlr;
|
uint32_t reset_sctlr;
|
||||||
uint32_t id_pfr0;
|
uint32_t id_pfr0;
|
||||||
|
|
|
@ -88,6 +88,7 @@ static void arm_cpu_reset(CPUState *s)
|
||||||
env->vfp.xregs[ARM_VFP_FPSID] = cpu->reset_fpsid;
|
env->vfp.xregs[ARM_VFP_FPSID] = cpu->reset_fpsid;
|
||||||
env->vfp.xregs[ARM_VFP_MVFR0] = cpu->mvfr0;
|
env->vfp.xregs[ARM_VFP_MVFR0] = cpu->mvfr0;
|
||||||
env->vfp.xregs[ARM_VFP_MVFR1] = cpu->mvfr1;
|
env->vfp.xregs[ARM_VFP_MVFR1] = cpu->mvfr1;
|
||||||
|
env->vfp.xregs[ARM_VFP_MVFR2] = cpu->mvfr2;
|
||||||
|
|
||||||
if (arm_feature(env, ARM_FEATURE_IWMMXT)) {
|
if (arm_feature(env, ARM_FEATURE_IWMMXT)) {
|
||||||
env->iwmmxt.cregs[ARM_IWMMXT_wCID] = 0x69051000 | 'Q';
|
env->iwmmxt.cregs[ARM_IWMMXT_wCID] = 0x69051000 | 'Q';
|
||||||
|
|
|
@ -572,6 +572,7 @@ enum arm_cpu_mode {
|
||||||
/* VFP system registers. */
|
/* VFP system registers. */
|
||||||
#define ARM_VFP_FPSID 0
|
#define ARM_VFP_FPSID 0
|
||||||
#define ARM_VFP_FPSCR 1
|
#define ARM_VFP_FPSCR 1
|
||||||
|
#define ARM_VFP_MVFR2 5
|
||||||
#define ARM_VFP_MVFR1 6
|
#define ARM_VFP_MVFR1 6
|
||||||
#define ARM_VFP_MVFR0 7
|
#define ARM_VFP_MVFR0 7
|
||||||
#define ARM_VFP_FPEXC 8
|
#define ARM_VFP_FPEXC 8
|
||||||
|
|
|
@ -2155,6 +2155,18 @@ void register_cp_regs_for_features(ARMCPU *cpu)
|
||||||
.opc0 = 3, .opc1 = 0, .crn = 0, .crm = 7, .opc2 = 1,
|
.opc0 = 3, .opc1 = 0, .crn = 0, .crm = 7, .opc2 = 1,
|
||||||
.access = PL1_R, .type = ARM_CP_CONST,
|
.access = PL1_R, .type = ARM_CP_CONST,
|
||||||
.resetvalue = cpu->id_aa64mmfr1 },
|
.resetvalue = cpu->id_aa64mmfr1 },
|
||||||
|
{ .name = "MVFR0_EL1", .state = ARM_CP_STATE_AA64,
|
||||||
|
.opc0 = 3, .opc1 = 0, .crn = 0, .crm = 3, .opc2 = 0,
|
||||||
|
.access = PL1_R, .type = ARM_CP_CONST,
|
||||||
|
.resetvalue = cpu->mvfr0 },
|
||||||
|
{ .name = "MVFR1_EL1", .state = ARM_CP_STATE_AA64,
|
||||||
|
.opc0 = 3, .opc1 = 0, .crn = 0, .crm = 3, .opc2 = 1,
|
||||||
|
.access = PL1_R, .type = ARM_CP_CONST,
|
||||||
|
.resetvalue = cpu->mvfr1 },
|
||||||
|
{ .name = "MVFR2_EL1", .state = ARM_CP_STATE_AA64,
|
||||||
|
.opc0 = 3, .opc1 = 0, .crn = 0, .crm = 3, .opc2 = 2,
|
||||||
|
.access = PL1_R, .type = ARM_CP_CONST,
|
||||||
|
.resetvalue = cpu->mvfr2 },
|
||||||
REGINFO_SENTINEL
|
REGINFO_SENTINEL
|
||||||
};
|
};
|
||||||
define_arm_cp_regs(cpu, v8_idregs);
|
define_arm_cp_regs(cpu, v8_idregs);
|
||||||
|
|
|
@ -2967,9 +2967,10 @@ static int disas_vfp_insn(CPUARMState * env, DisasContext *s, uint32_t insn)
|
||||||
if ((insn & 0x0fe00fff) != 0x0ee00a10)
|
if ((insn & 0x0fe00fff) != 0x0ee00a10)
|
||||||
return 1;
|
return 1;
|
||||||
rn = (insn >> 16) & 0xf;
|
rn = (insn >> 16) & 0xf;
|
||||||
if (rn != ARM_VFP_FPSID && rn != ARM_VFP_FPEXC
|
if (rn != ARM_VFP_FPSID && rn != ARM_VFP_FPEXC && rn != ARM_VFP_MVFR2
|
||||||
&& rn != ARM_VFP_MVFR1 && rn != ARM_VFP_MVFR0)
|
&& rn != ARM_VFP_MVFR1 && rn != ARM_VFP_MVFR0) {
|
||||||
return 1;
|
return 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (extract32(insn, 28, 4) == 0xf) {
|
if (extract32(insn, 28, 4) == 0xf) {
|
||||||
|
@ -3115,6 +3116,11 @@ static int disas_vfp_insn(CPUARMState * env, DisasContext *s, uint32_t insn)
|
||||||
gen_helper_vfp_get_fpscr(tmp, cpu_env);
|
gen_helper_vfp_get_fpscr(tmp, cpu_env);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case ARM_VFP_MVFR2:
|
||||||
|
if (!arm_feature(env, ARM_FEATURE_V8)) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
/* fall through */
|
||||||
case ARM_VFP_MVFR0:
|
case ARM_VFP_MVFR0:
|
||||||
case ARM_VFP_MVFR1:
|
case ARM_VFP_MVFR1:
|
||||||
if (IS_USER(s)
|
if (IS_USER(s)
|
||||||
|
|
Loading…
Reference in New Issue