Skip to contentSkip to conversation

KVM: PPC: bookehv64: Add support for std/ld emulation.

PATCH New Scott Wood 3 participants 4 messages Jun 18, 2012

Subsystems (2)
lore
Share & tools
lore

Scott Wood

author
#0 lore raw
Quoted 15 lines · Varun Sethi

Add support for std/ld emulation.

---
 arch/powerpc/kvm/emulate.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
arch/powerpc/kvm/emulate.c +0 -0
index f90e86d..a04543a 100644
@@ -59,11 +59,13 @@
 #define OP_31_XOP_STHBRX    918
 
 #define OP_LWZ  32

arch/powerpc/kvm/emulate.c line 71

Quoted 10 lines
arch/powerpc/kvm/emulate.c +2 -0
+#define OP_LD   58
 #define OP_LWZU 33
 #define OP_LBZ  34
 #define OP_LBZU 35
 #define OP_STW  36
 #define OP_STWU 37
+#define OP_STD  62
 #define OP_STB  38
 #define OP_STBU 39
 #define OP_LHZ  40

What about STDU, STDX, LWA, etc? If you're going to add some 64-bit load/store instructions, but not others of the same classes as are implemented for 32-bit, at least leave a comment pointing out what's missing.

-Scott

#1 lore raw

PATCH 1/1 KVM: PPC: bookehv64: Add support for std/ld emulation.

Add support for std/ld emulation.

---
 arch/powerpc/kvm/emulate.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
arch/powerpc/kvm/emulate.c +14 -0
index f90e86d..a04543a 100644
@@ -59,11 +59,13 @@
 #define OP_31_XOP_STHBRX    918
 
 #define OP_LWZ  32
+#define OP_LD   58
 #define OP_LWZU 33
 #define OP_LBZ  34
 #define OP_LBZU 35
 #define OP_STW  36
 #define OP_STWU 37
+#define OP_STD  62
 #define OP_STB  38
 #define OP_STBU 39
 #define OP_LHZ  40
@@ -392,6 +394,11 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
 		emulated = kvmppc_handle_load(run, vcpu, rt, 4, 1);
 		break;
 
+	case OP_LD:
+		rt = get_rt(inst);
+		emulated = kvmppc_handle_load(run, vcpu, rt, 8, 1);
+		break;
+
 	case OP_LWZU:
 		emulated = kvmppc_handle_load(run, vcpu, rt, 4, 1);
 		kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
@@ -412,6 +419,13 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
 		                               4, 1);
 		break;
 
+	case OP_STD:
+		rs = get_rs(inst);
+		emulated = kvmppc_handle_store(run, vcpu,
+					       kvmppc_get_gpr(vcpu, rs),
+		                               8, 1);
+		break;
+
 	case OP_STWU:
 		emulated = kvmppc_handle_store(run, vcpu,
 					       kvmppc_get_gpr(vcpu, rs),
Signature · 1 line
1.7.4.1
#2 lore raw

PATCH 1/1 KVM: PPC: bookehv64: Add support for std/ld emulation.

In reply to Scott Wood

Add support for std/ld emulation.

---
 arch/powerpc/kvm/emulate.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
arch/powerpc/kvm/emulate.c +14 -0
index f90e86d..a04543a 100644
@@ -59,11 +59,13 @@
 #define OP_31_XOP_STHBRX    918
 
 #define OP_LWZ  32
+#define OP_LD   58
 #define OP_LWZU 33
 #define OP_LBZ  34
 #define OP_LBZU 35
 #define OP_STW  36
 #define OP_STWU 37
+#define OP_STD  62
 #define OP_STB  38
 #define OP_STBU 39
 #define OP_LHZ  40
@@ -392,6 +394,11 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
 		emulated = kvmppc_handle_load(run, vcpu, rt, 4, 1);
 		break;
 
+	case OP_LD:
+		rt = get_rt(inst);
+		emulated = kvmppc_handle_load(run, vcpu, rt, 8, 1);
+		break;
+
 	case OP_LWZU:
 		emulated = kvmppc_handle_load(run, vcpu, rt, 4, 1);
 		kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
@@ -412,6 +419,13 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
 		                               4, 1);
 		break;
 
+	case OP_STD:
+		rs = get_rs(inst);
+		emulated = kvmppc_handle_store(run, vcpu,
+					       kvmppc_get_gpr(vcpu, rs),
+		                               8, 1);
+		break;
+
 	case OP_STWU:
 		emulated = kvmppc_handle_store(run, vcpu,
 					       kvmppc_get_gpr(vcpu, rs),
Signature · 1 line
1.7.4.1
#3 lore raw
In reply to Scott Wood

DQoNCj4gLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCj4gRnJvbTogV29vZCBTY290dC1CMDc0 MjENCj4gU2VudDogVHVlc2RheSwgSnVuZSAxOSwgMjAxMiAyOjE5IEFNDQo+IFRvOiBTZXRoaSBW YXJ1bi1CMTYzOTUNCj4gQ2M6IGt2bS1wcGNAdmdlci5rZXJuZWwub3JnDQo+IFN1YmplY3Q6IFJl OiBbUEFUQ0hdIEtWTTogUFBDOiBib29rZWh2NjQ6IEFkZCBzdXBwb3J0IGZvciBzdGQvbGQNCj4g ZW11bGF0aW9uLg0KPiANCj4gT24gMDYvMTgvMjAxMiAwMzo0MiBQTSwgVmFydW4gU2V0aGkgd3Jv dGU6DQo+ID4gQWRkIHN1cHBvcnQgZm9yIHN0ZC9sZCBlbXVsYXRpb24uDQo+ID4NCj4gPiBTaWdu ZWQtb2ZmLWJ5OiBWYXJ1biBTZXRoaSA8VmFydW4uU2V0aGlAZnJlZXNjYWxlLmNvbT4NCj4gPiAt LS0NCj4gPiAgYXJjaC9wb3dlcnBjL2t2bS9lbXVsYXRlLmMgfCAgIDE0ICsrKysrKysrKysrKysr DQo+ID4gIDEgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgMCBkZWxldGlvbnMoLSkN Cj4gPg0KPiA+IGRpZmYgLS1naXQgYS9hcmNoL3Bvd2VycGMva3ZtL2VtdWxhdGUuYyBiL2FyY2gv cG93ZXJwYy9rdm0vZW11bGF0ZS5jDQo+ID4gaW5kZXggZjkwZTg2ZC4uYTA0NTQzYSAxMDA2NDQN Cj4gPiAtLS0gYS9hcmNoL3Bvd2VycGMva3ZtL2VtdWxhdGUuYw0KPiA+ICsrKyBiL2FyY2gvcG93 ZXJwYy9rdm0vZW11bGF0ZS5jDQo+ID4gQEAgLTU5LDExICs1OSwxMyBAQA0KPiA+ICAjZGVmaW5l IE9QXzMxX1hPUF9TVEhCUlggICAgOTE4DQo+ID4NCj4gPiAgI2RlZmluZSBPUF9MV1ogIDMyDQo+ ID4gKyNkZWZpbmUgT1BfTEQgICA1OA0KPiA+ICAjZGVmaW5lIE9QX0xXWlUgMzMNCj4gPiAgI2Rl ZmluZSBPUF9MQlogIDM0DQo+ID4gICNkZWZpbmUgT1BfTEJaVSAzNQ0KPiA+ICAjZGVmaW5lIE9Q X1NUVyAgMzYNCj4gPiAgI2RlZmluZSBPUF9TVFdVIDM3DQo+ID4gKyNkZWZpbmUgT1BfU1REICA2 Mg0KPiA+ICAjZGVmaW5lIE9QX1NUQiAgMzgNCj4gPiAgI2RlZmluZSBPUF9TVEJVIDM5DQo+ID4g ICNkZWZpbmUgT1BfTEhaICA0MA0KPiANCj4gV2hhdCBhYm91dCBTVERVLCBTVERYLCBMV0EsIGV0 Yz8gIElmIHlvdSdyZSBnb2luZyB0byBhZGQgc29tZSA2NC1iaXQNCj4gbG9hZC9zdG9yZSBpbnN0 cnVjdGlvbnMsIGJ1dCBub3Qgb3RoZXJzIG9mIHRoZSBzYW1lIGNsYXNzZXMgYXMgYXJlDQo+IGlt cGxlbWVudGVkIGZvciAzMi1iaXQsIGF0IGxlYXN0IGxlYXZlIGEgY29tbWVudCBwb2ludGluZyBv dXQgd2hhdCdzDQo+IG1pc3NpbmcuDQpUaGVyZSB3b3VsZCBiZSBhIHNlcGFyYXRlIHBhdGNoIGZv ciBzdXBwb3J0aW5nIHRob3NlIGluc3RydWN0aW9ucy4gSSB3aWxsIGEgIlRCRCIgY29tbWVudCAN CmluIHRoZSBjb2RlLg0KDQotVmFydW4NCg=