X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_v3dec.c;h=343be383701c7bfcce26a6d303141d63da65d043;hb=3c6a3b61c1fbd76c55c63440276d21fa8e79ab16;hp=54e11ad17dabe5bfd579eb1eea130d453c8ea0ad;hpb=259a6afe752758f5ef79b19d12b599a6419cecc9;p=palacios.git

diff --git a/palacios/src/palacios/vmm_v3dec.c b/palacios/src/palacios/vmm_v3dec.c
index 54e11ad..343be38 100644
--- a/palacios/src/palacios/vmm_v3dec.c
+++ b/palacios/src/palacios/vmm_v3dec.c
@@ -20,7 +20,7 @@
 #include <palacios/vmm_decoder.h>
 #include <palacios/vmm_instr_decoder.h>
 
-#ifndef CONFIG_DEBUG_DECODER
+#ifndef V3_CONFIG_DEBUG_DECODER
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -121,8 +121,10 @@ int v3_decode(struct guest_info * core, addr_t instr_ptr, struct x86_instr * ins
 
     instr->instr_length += length;
 
-#ifdef CONFIG_DEBUG_DECODER
+#ifdef V3_CONFIG_DEBUG_DECODER
+    V3_Print("Decoding Instr at %p\n", (void *)core->rip);
     v3_print_instr(instr);
+    V3_Print("CS DB FLag=%x\n", core->segments.cs.db);
 #endif
 
     return 0;
@@ -153,8 +155,8 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
 	case AND_IMM2:	
 	case OR_IMM2:
   	case SUB_IMM2:
-	case XOR_IMM2: 
-	case MOV_IMM2:{
+	case XOR_IMM2:
+	case MOV_IMM2: {
 	    uint8_t reg_code = 0;
 
 	    ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand), &reg_code);
@@ -176,6 +178,8 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
 		instr->src_operand.operand = *(uint16_t *)instr_ptr;
 	    } else if (operand_width == 4) {
 		instr->src_operand.operand = *(uint32_t *)instr_ptr;
+	    } else if (operand_width == 8) {
+		instr->src_operand.operand = *(sint32_t *)instr_ptr; // This is a special case for sign extended 64bit ops
 	    } else {
 		PrintError("Illegal operand width (%d)\n", operand_width);
 		return -1;
@@ -348,7 +352,7 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
 	    instr->is_str_op = 1;
 	    
 	    if (instr->prefixes.rep == 1) {
-		instr->str_op_length = MASK(core->vm_regs.rcx, operand_width);
+		instr->str_op_length = MASK(core->vm_regs.rcx, addr_width);
 	    } else {
 		instr->str_op_length = 1;
 	    }
@@ -424,7 +428,7 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
 	    instr->is_str_op = 1;
 
 	    if (instr->prefixes.rep == 1) {
-		instr->str_op_length = MASK(core->vm_regs.rcx, operand_width);
+		instr->str_op_length = MASK(core->vm_regs.rcx, addr_width);
 	    } else {
 		instr->str_op_length = 1;
 	    }
@@ -444,25 +448,51 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
 
 	    break;
 	}
+	case INT: {
+	    instr->dst_operand.type = IMM_OPERAND;
+	    instr->dst_operand.size = operand_width;
+		instr->dst_operand.operand = *(uint8_t *)instr_ptr;
+	    instr_ptr += operand_width;
+	    instr->num_operands = 1;
+
+	    break;
+	}
 	case INVLPG: {
 	    uint8_t reg_code = 0;
-	    
+
 	    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->num_operands = 1;
+	    break;
+	}
+	case LMSW: 
+	case SMSW: {
+	    uint8_t reg_code = 0;
+
+	    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->dst_operand.read = 1;
+
 	    instr->num_operands = 1;
 	    break;
 	}
 	case CLTS: {
 	    // no operands. 
 	    break;
-	    
 	}
 	default:
 	    PrintError("Invalid Instruction form: %s\n", op_form_to_str(form));
@@ -484,12 +514,14 @@ static v3_op_type_t op_form_to_type(op_form_t form) {
 	case INVLPG:
 	    return V3_OP_INVLPG;
 
+	case INT:
+	    return V3_OP_INT;
+	    
 	case MOV_CR2:
 	    return V3_OP_MOVCR2;
 	case MOV_2CR:
 	    return V3_OP_MOV2CR;
 
-
 	case MOV_MEM2_8:
 	case MOV_MEM2:
 	case MOV_2MEM_8:
@@ -515,7 +547,6 @@ static v3_op_type_t op_form_to_type(op_form_t form) {
 	    return V3_OP_MOVZX;
 
 
-	    
 	case ADC_2MEM_8:
 	case ADC_2MEM:
 	case ADC_MEM2_8: