This patch implements emulation for the addis instruction which is also used
to implement lis.
Signed-off-by: Alexander Graf <agraf@xxxxxxx>
---
arch/powerpc/include/asm/ppc-opcode.h | 1 +
arch/powerpc/kvm/emulate.c | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h
index ce135be..2302a8e 100644
--- a/arch/powerpc/include/asm/ppc-opcode.h
+++ b/arch/powerpc/include/asm/ppc-opcode.h
@@ -112,6 +112,7 @@
#define OP_31_XOP_LHBRX 790
#define OP_31_XOP_STHBRX 918
+#define OP_ADDIS 15
#define OP_LWZ 32
#define OP_LD 58
#define OP_LWZU 33
diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c
index 33a34c3..40f21bb 100644
--- a/arch/powerpc/kvm/emulate.c
+++ b/arch/powerpc/kvm/emulate.c
@@ -473,6 +473,13 @@ int kvmppc_emulate_any_instruction(struct kvm_vcpu *vcpu)
emulated = kvmppc_emulate_load(vcpu, addr, &value, 4);
kvmppc_set_gpr(vcpu, get_rt(inst), value);
break;
+ case OP_ADDIS:
+ value = 0;
+ if (get_ra(inst))
+ value = kvmppc_get_gpr(vcpu, get_ra(inst));
+ value += ((s16)get_d(inst)) << 16;
+ kvmppc_set_gpr(vcpu, get_rt(inst), value);
+ break;
case 31:
switch (get_xop(inst)) {
case OP_31_XOP_MFCR:
--
1.8.1.4
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
