X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_v3dec.c;h=54e11ad17dabe5bfd579eb1eea130d453c8ea0ad;hb=3eca92952c19aa937b39d7f147b4950bb5de24ce;hp=c38102919038b3aa03a309ad9e9844c7ee1a3fd5;hpb=9cf8f2ddcb1d8c1d14adb6e5ac7084a5bb91d07a;p=palacios.git

diff --git a/palacios/src/palacios/vmm_v3dec.c b/palacios/src/palacios/vmm_v3dec.c
index c381029..54e11ad 100644
--- a/palacios/src/palacios/vmm_v3dec.c
+++ b/palacios/src/palacios/vmm_v3dec.c
@@ -27,7 +27,7 @@
 
 
 #define MASK(val, length) ({						\
-            ullong_t mask = 0x0LL;					\
+            uint64_t mask = 0x0LL;					\
             switch (length) {						\
 		case 1:							\
 		    mask = 0x00000000000000ffLL;			\
@@ -75,7 +75,7 @@ int v3_decode(struct guest_info * core, addr_t instr_ptr, struct x86_instr * ins
     int length = 0;
 
 
-    V3_Print("Decoding Instruction at %p\n", (void *)instr_ptr);
+    PrintDebug("Decoding Instruction at %p\n", (void *)instr_ptr);
 
     memset(instr, 0, sizeof(struct x86_instr));
 
@@ -102,7 +102,7 @@ int v3_decode(struct guest_info * core, addr_t instr_ptr, struct x86_instr * ins
 
     form = op_code_to_form((uint8_t *)(instr_ptr + length), &length);
 
-    V3_Print("\t decoded as (%s)\n", op_form_to_str(form));
+    PrintDebug("\t decoded as (%s)\n", op_form_to_str(form));
 
     if (form == INVALID_INSTR) {
 	PrintError("Could not find instruction form (%x)\n", *(uint32_t *)(instr_ptr + length));
@@ -121,7 +121,9 @@ int v3_decode(struct guest_info * core, addr_t instr_ptr, struct x86_instr * ins
 
     instr->instr_length += length;
 
+#ifdef CONFIG_DEBUG_DECODER
     v3_print_instr(instr);
+#endif
 
     return 0;
 }
@@ -261,6 +263,56 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
 
 	    break;
 	}
+	case MOVSX_8:
+	case MOVZX_8: {
+	    uint8_t reg_code = 0;
+
+	    ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->src_operand), &reg_code);
+	    instr->src_operand.size = 1;
+
+	    if (ret == -1) {
+		PrintError("Error decoding operand\n");
+		return -1;
+	    }
+
+	    instr_ptr += ret;
+
+	    instr->dst_operand.size = operand_width;
+	    instr->dst_operand.type = REG_OPERAND;
+	    decode_gpr(core, reg_code, &(instr->dst_operand));
+
+	    instr->src_operand.read = 1;
+	    instr->dst_operand.write = 1;
+
+	    instr->num_operands = 2;
+
+	    break;
+	}
+	case MOVSX:
+	case MOVZX: {
+	    uint8_t reg_code = 0;
+
+	    ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->src_operand), &reg_code);
+	    instr->src_operand.size = 2;
+
+	    if (ret == -1) {
+		PrintError("Error decoding operand\n");
+		return -1;
+	    }
+
+	    instr_ptr += ret;
+
+	    instr->dst_operand.size = operand_width;
+	    instr->dst_operand.type = REG_OPERAND;
+	    decode_gpr(core, reg_code, &(instr->dst_operand));
+
+	    instr->src_operand.read = 1;
+	    instr->dst_operand.write = 1;
+
+	    instr->num_operands = 2;
+
+	    break;
+	}
 	case ADC_IMM2SX_8:
 	case ADD_IMM2SX_8:
 	case AND_IMM2SX_8:
@@ -280,7 +332,7 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
 
 	    instr->src_operand.type = IMM_OPERAND;
 	    instr->src_operand.size = operand_width;
-	    instr->src_operand.operand = *(sint8_t *)instr_ptr;  // sign extend.
+	    instr->src_operand.operand = (addr_t)MASK((sint64_t)*(sint8_t *)instr_ptr, operand_width);  // sign extend.
 
 	    instr->src_operand.read = 1;
 	    instr->dst_operand.write = 1;
@@ -350,14 +402,13 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
 	    ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand),
 				    &reg_code);
 	    
-
 	    if (ret == -1) {
 		PrintError("Error decoding operand for (%s)\n", op_form_to_str(form));
 		return -1;
 	    }
 
 	    instr_ptr += ret;
-		
+	    
 	    instr->src_operand.type = REG_OPERAND;
 	    instr->src_operand.size = operand_width;
 	    decode_cr(core, reg_code, &(instr->src_operand));
@@ -371,26 +422,26 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
 	case STOS:
 	case STOS_8: {
 	    instr->is_str_op = 1;
-	    
+
 	    if (instr->prefixes.rep == 1) {
 		instr->str_op_length = MASK(core->vm_regs.rcx, operand_width);
 	    } else {
 		instr->str_op_length = 1;
 	    }
-	    
+
 	    instr->src_operand.size = operand_width;
 	    instr->src_operand.type = REG_OPERAND;
 	    instr->src_operand.operand = (addr_t)&(core->vm_regs.rax);
-	    
+
 	    instr->dst_operand.type = MEM_OPERAND;
 	    instr->dst_operand.size = operand_width;
 	    instr->dst_operand.operand = get_addr_linear(core, MASK(core->vm_regs.rdi, addr_width), &(core->segments.es));
-	    
+
 	    instr->src_operand.read = 1;
 	    instr->dst_operand.write = 1;
-	    
+
 	    instr->num_operands = 2;
-	    
+
 	    break;
 	}
 	case INVLPG: {