diff options
Diffstat (limited to 'src/arch/arm/kvm')
| -rw-r--r-- | src/arch/arm/kvm/arm_cpu.cc | 8 | ||||
| -rw-r--r-- | src/arch/arm/kvm/armv8_cpu.cc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/arch/arm/kvm/arm_cpu.cc b/src/arch/arm/kvm/arm_cpu.cc index 69d6f8c2e..4d6b9a1b3 100644 --- a/src/arch/arm/kvm/arm_cpu.cc +++ b/src/arch/arm/kvm/arm_cpu.cc @@ -697,8 +697,8 @@ ArmKvmCPU::updateKvmStateVFP(uint64_t id, bool show_warnings) const unsigned idx_hi(idx_base + 1); const unsigned idx_lo(idx_base + 0); uint64_t value( - ((uint64_t)tc->readFloatRegBitsFlat(idx_hi) << 32) | - tc->readFloatRegBitsFlat(idx_lo)); + ((uint64_t)tc->readFloatRegFlat(idx_hi) << 32) | + tc->readFloatRegFlat(idx_lo)); setOneReg(id, value); } else if (REG_IS_VFP_CTRL(id)) { @@ -839,8 +839,8 @@ ArmKvmCPU::updateTCStateVFP(uint64_t id, bool show_warnings) const unsigned idx_lo(idx_base + 0); uint64_t value(getOneRegU64(id)); - tc->setFloatRegBitsFlat(idx_hi, (value >> 32) & 0xFFFFFFFF); - tc->setFloatRegBitsFlat(idx_lo, value & 0xFFFFFFFF); + tc->setFloatRegFlat(idx_hi, (value >> 32) & 0xFFFFFFFF); + tc->setFloatRegFlat(idx_lo, value & 0xFFFFFFFF); } else if (REG_IS_VFP_CTRL(id)) { MiscRegIndex idx(decodeVFPCtrlReg(id)); if (idx == NUM_MISCREGS) { diff --git a/src/arch/arm/kvm/armv8_cpu.cc b/src/arch/arm/kvm/armv8_cpu.cc index bfd447a19..3757e2602 100644 --- a/src/arch/arm/kvm/armv8_cpu.cc +++ b/src/arch/arm/kvm/armv8_cpu.cc @@ -252,7 +252,7 @@ ArmV8KvmCPU::updateKvmState() const RegIndex reg_base(i * FP_REGS_PER_VFP_REG); KvmFPReg reg; for (int j = 0; j < FP_REGS_PER_VFP_REG; j++) - reg.s[j].i = tc->readFloatRegBits(reg_base + j); + reg.s[j].i = tc->readFloatReg(reg_base + j); setOneReg(kvmFPReg(i), reg.data); DPRINTF(KvmContext, " Q%i: %s\n", i, getAndFormatOneReg(kvmFPReg(i))); @@ -326,7 +326,7 @@ ArmV8KvmCPU::updateThreadContext() DPRINTF(KvmContext, " Q%i: %s\n", i, getAndFormatOneReg(kvmFPReg(i))); getOneReg(kvmFPReg(i), reg.data); for (int j = 0; j < FP_REGS_PER_VFP_REG; j++) - tc->setFloatRegBits(reg_base + j, reg.s[j].i); + tc->setFloatReg(reg_base + j, reg.s[j].i); } for (const auto &ri : getSysRegMap()) { |