Instead of explicitely checking for register 15 to detect the use
of PC as a destination register, use a predicate. This has no
impact on ARM, but makes things easier for ARM64 whose PC is not
a GP register.
Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx>
---
arch/arm/include/asm/kvm_emulate.h | 5 +++++
arch/arm/kvm/emulate.c | 2 +-
arch/arm/kvm/mmu.c | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/arch/arm/include/asm/kvm_emulate.h b/arch/arm/include/asm/kvm_emulate.h
index 74fc9ef..304b5c7 100644
--- a/arch/arm/include/asm/kvm_emulate.h
+++ b/arch/arm/include/asm/kvm_emulate.h
@@ -76,4 +76,9 @@ static inline bool vcpu_mode_priv(struct kvm_vcpu *vcpu)
return cpsr_mode > USR_MODE;;
}
+static inline bool kvm_vcpu_reg_is_pc(struct kvm_vcpu *vcpu, int reg)
+{
+ return reg == 15;
+}
+
#endif /* __ARM_KVM_EMULATE_H__ */
diff --git a/arch/arm/kvm/emulate.c b/arch/arm/kvm/emulate.c
index abfefdd..dff98a3 100644
--- a/arch/arm/kvm/emulate.c
+++ b/arch/arm/kvm/emulate.c
@@ -444,7 +444,7 @@ static bool decode_thumb_wb(struct kvm_vcpu *vcpu, struct kvm_exit_mmio *mmio,
vcpu->arch.mmio.rd = (instr >> 12) & 0xf;
- if (Rn == 15)
+ if (kvm_vcpu_reg_is_pc(vcpu, Rn))
return false;
/* Handle Writeback */
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index bfd57b3..59c24e3 100644
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -789,7 +789,7 @@ static int decode_hsr(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
sign_extend = vcpu->arch.hsr & HSR_SSE;
rd = (vcpu->arch.hsr & HSR_SRT_MASK) >> HSR_SRT_SHIFT;
- if (rd == 15) {
+ if (kvm_vcpu_reg_is_pc(vcpu, rd)) {
/* IO memory trying to read/write pc */
kvm_inject_pabt(vcpu, vcpu->arch.hxfar);
return 1;
--
1.7.12
_______________________________________________
kvmarm mailing list
kvmarm@xxxxxxxxxxxxxxxxxxxxx
https://lists.cs.columbia.edu/cucslists/listinfo/kvmarm
