Skip to contentSkip to conversation

x86 emulator: Add pusha and popa instructions

PATCH RESEND In review Mohammed Gamal 2 participants 3 messages Sep 1, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 x86 emulator: Add pusha and popa instructions

This adds pusha and popa instructions (opcodes 0x60-0x61), this enables booting MINIX with invalid guest state emulation on.

---
 arch/x86/kvm/emulate.c |   52 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 51 insertions(+), 1 deletions(-)
arch/x86/kvm/emulate.c +51 -1
index db0820d..9be2e6e 100644
@@ -139,7 +139,8 @@ static u32 opcode_table[256] = {
 	DstReg | Stack, DstReg | Stack, DstReg | Stack, DstReg | Stack,
 	DstReg | Stack, DstReg | Stack, DstReg | Stack, DstReg | Stack,
 	/* 0x60 - 0x67 */
-	0, 0, 0, DstReg | SrcMem32 | ModRM | Mov /* movsxd (x86/64) */ ,
+	ImplicitOps | Stack | No64, ImplicitOps | Stack | No64,
+	0, DstReg | SrcMem32 | ModRM | Mov /* movsxd (x86/64) */ ,
 	0, 0, 0, 0,
 	/* 0x68 - 0x6F */
 	SrcImm | Mov | Stack, 0, SrcImmByte | Mov | Stack, 0,
@@ -1225,6 +1226,47 @@ static int emulate_pop_sreg(struct x86_emulate_ctxt *ctxt,
 	return rc;
 }
 
+static void emulate_pusha(struct x86_emulate_ctxt *ctxt)
+{
+	struct decode_cache *c = &ctxt->decode;
+	unsigned long old_esp = c->regs[VCPU_REGS_RSP];
+	int reg = VCPU_REGS_RAX;
+
+	while (reg <= VCPU_REGS_RDI) {
+		(reg == VCPU_REGS_RSP) ? 
+		(c->src.val = old_esp) : (c->src.val = c->regs[reg]);
+
+		emulate_push(ctxt);
+		++reg;
+	}
+}
+
+static int emulate_popa(struct x86_emulate_ctxt *ctxt,
+			struct x86_emulate_ops *ops)
+{
+	struct decode_cache *c = &ctxt->decode;
+	unsigned long old_esp = c->regs[VCPU_REGS_RSP];
+	int rc = 0;
+	int reg = VCPU_REGS_RDI;
+
+	while (reg >= VCPU_REGS_RAX) {
+		if (reg == VCPU_REGS_RSP) {
+			register_address_increment(c, &c->regs[VCPU_REGS_RSP],
+							c->op_bytes);
+			--reg;
+		}
+
+		rc = emulate_pop(ctxt, ops, &c->regs[reg], c->op_bytes);
+		if (rc != 0) {
+			c->regs[VCPU_REGS_RSP] = old_esp;
+			break;
+		}
+
+		--reg;
+	}
+	return rc;
+}
+
 static inline int emulate_grp1a(struct x86_emulate_ctxt *ctxt,
 				struct x86_emulate_ops *ops)
 {
@@ -1816,6 +1858,14 @@ special_insn:
 		if (rc != 0)
 			goto done;
 		break;
+	case 0x60:	/* pusha */
+		emulate_pusha(ctxt);
+		break;
+	case 0x61:	/* popa */
+		rc = emulate_popa(ctxt, ops);
+		if (rc != 0)
+			goto done;
+		break; 
 	case 0x63:		/* movsxd */
 		if (ctxt->mode != X86EMUL_MODE_PROT64)
 			goto cannot_emulate;
Signature · 1 line
1.6.0.4
#1 lore raw
Quoted 49 lines · Mohammed Gamal

This adds pusha and popa instructions (opcodes 0x60-0x61), this enables booting MINIX with invalid guest state emulation on.

---
 arch/x86/kvm/emulate.c |   52 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 51 insertions(+), 1 deletions(-)
arch/x86/kvm/emulate.c +25 -1
index db0820d..9be2e6e 100644
@@ -139,7 +139,8 @@ static u32 opcode_table[256] = {
 	DstReg | Stack, DstReg | Stack, DstReg | Stack, DstReg | Stack,
 	DstReg | Stack, DstReg | Stack, DstReg | Stack, DstReg | Stack,
 	/* 0x60 - 0x67 */
-	0, 0, 0, DstReg | SrcMem32 | ModRM | Mov /* movsxd (x86/64) */ ,
+	ImplicitOps | Stack | No64, ImplicitOps | Stack | No64,
+	0, DstReg | SrcMem32 | ModRM | Mov /* movsxd (x86/64) */ ,
 	0, 0, 0, 0,
 	/* 0x68 - 0x6F */
 	SrcImm | Mov | Stack, 0, SrcImmByte | Mov | Stack, 0,
@@ -1225,6 +1226,47 @@ static int emulate_pop_sreg(struct x86_emulate_ctxt *ctxt,
 	return rc;
 }
 
+static void emulate_pusha(struct x86_emulate_ctxt *ctxt)
+{
+	struct decode_cache *c = &ctxt->decode;
+	unsigned long old_esp = c->regs[VCPU_REGS_RSP];
+	int reg = VCPU_REGS_RAX;
+
+	while (reg <= VCPU_REGS_RDI) {
+		(reg == VCPU_REGS_RSP) ? 
+		(c->src.val = old_esp) : (c->src.val = c->regs[reg]);
+
+		emulate_push(ctxt);
+		++reg;
+	}
+}
+
+static int emulate_popa(struct x86_emulate_ctxt *ctxt,
+			struct x86_emulate_ops *ops)
+{
+	struct decode_cache *c = &ctxt->decode;
+	unsigned long old_esp = c->regs[VCPU_REGS_RSP];
+	int rc = 0;
+	int reg = VCPU_REGS_RDI;
+

arch/x86/kvm/emulate.c static int emulate_pop_sreg(struct x86_emulate_ctxt *ctxt, · line 1261

Quoted 10 lines
arch/x86/kvm/emulate.c +10 -0
+	while (reg >= VCPU_REGS_RAX) {
+		if (reg == VCPU_REGS_RSP) {
+			register_address_increment(c, &c->regs[VCPU_REGS_RSP],
+							c->op_bytes);
+			--reg;
+		}
+
+		rc = emulate_pop(ctxt, ops, &c->regs[reg], c->op_bytes);
+		if (rc != 0) {
+			c->regs[VCPU_REGS_RSP] = old_esp;

Why is it necessary to restore the local VCPU_REGS_RSP copy on failure?

#2 lore raw
Quoted 54 lines · Marcelo Tosatti
Quoted 53 lines · Mohammed Gamal

This adds pusha and popa instructions (opcodes 0x60-0x61), this enables booting MINIX with invalid guest state emulation on.

---
 arch/x86/kvm/emulate.c |   52 +++++++++++++++++++++++++++++++++++++++++++++++-

 1 files changed, 51 insertions(+), 1 deletions(-)
arch/x86/kvm/emulate.c +29 -1
index db0820d..9be2e6e 100644
@@ -139,7 +139,8 @@ static u32 opcode_table[256] = {
       DstReg | Stack, DstReg | Stack, DstReg | Stack, DstReg | Stack,
       DstReg | Stack, DstReg | Stack, DstReg | Stack, DstReg | Stack,
       /* 0x60 - 0x67 */
-     0, 0, 0, DstReg | SrcMem32 | ModRM | Mov /* movsxd (x86/64) */ ,
+     ImplicitOps | Stack | No64, ImplicitOps | Stack | No64,
+     0, DstReg | SrcMem32 | ModRM | Mov /* movsxd (x86/64) */ ,
       0, 0, 0, 0,
       /* 0x68 - 0x6F */
       SrcImm | Mov | Stack, 0, SrcImmByte | Mov | Stack, 0,
@@ -1225,6 +1226,47 @@ static int emulate_pop_sreg(struct x86_emulate_ctxt *ctxt,
       return rc;
  }
 
+static void emulate_pusha(struct x86_emulate_ctxt *ctxt)
+{
+     struct decode_cache *c = &ctxt->decode;
+     unsigned long old_esp = c->regs[VCPU_REGS_RSP];
+     int reg = VCPU_REGS_RAX;
+
+     while (reg <= VCPU_REGS_RDI) {
+             (reg == VCPU_REGS_RSP) ?
+             (c->src.val = old_esp) : (c->src.val = c->regs[reg]);
+
+             emulate_push(ctxt);
+             ++reg;
+     }
+}
+
+static int emulate_popa(struct x86_emulate_ctxt *ctxt,
+                     struct x86_emulate_ops *ops)
+{
+     struct decode_cache *c = &ctxt->decode;
+     unsigned long old_esp = c->regs[VCPU_REGS_RSP];
+     int rc = 0;
+     int reg = VCPU_REGS_RDI;
+
+     while (reg >= VCPU_REGS_RAX) {
+             if (reg == VCPU_REGS_RSP) {
+                     register_address_increment(c, &c->regs[VCPU_REGS_RSP],
+                                                     c->op_bytes);
Quoted 8 lines

arch/x86/kvm/emulate.c static int emulate_pop_sreg(struct x86_emulate_ctxt *ctxt, · line 1261

Quoted 6 lines
arch/x86/kvm/emulate.c +6 -0
+                     --reg;
+             }
+
+             rc = emulate_pop(ctxt, ops, &c->regs[reg], c->op_bytes);
+             if (rc != 0) {
+                     c->regs[VCPU_REGS_RSP] = old_esp;

Why is it necessary to restore the local VCPU_REGS_RSP copy on failure?

Right. Perhaps this is a little too paranoid since we'll fail anyway