X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_v3dec.c;h=c05aef163cfeea85dafe526f2be35de8a61ee84c;hb=4e43946f01f687361197dc9571b7df02ae20de30;hp=7dd716ef2db8168e819e23628ca670e467aeda2e;hpb=14bea80332af1e5d63df6ab9fc86e449cdcb3c3a;p=palacios.git

diff --git a/palacios/src/palacios/vmm_v3dec.c b/palacios/src/palacios/vmm_v3dec.c
index 7dd716e..c05aef1 100644
--- a/palacios/src/palacios/vmm_v3dec.c
+++ b/palacios/src/palacios/vmm_v3dec.c
@@ -20,9 +20,14 @@
 #include <palacios/vmm_decoder.h>
 #include <palacios/vmm_instr_decoder.h>
 
+#ifndef V3_CONFIG_DEBUG_DECODER
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
+
 
 #define MASK(val, length) ({						\
-            ullong_t mask = 0x0LL;					\
+            uint64_t mask = 0x0LL;					\
             switch (length) {						\
 		case 1:							\
 		    mask = 0x00000000000000ffLL;			\
@@ -70,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(core->vm_info, core, "Decoding Instruction at %p\n", (void *)instr_ptr);
 
     memset(instr, 0, sizeof(struct x86_instr));
 
@@ -78,16 +83,29 @@ int v3_decode(struct guest_info * core, addr_t instr_ptr, struct x86_instr * ins
     length = v3_get_prefixes((uint8_t *)instr_ptr, &(instr->prefixes));
 
 
-    // check for REX prefix
+    // REX prefix
+    if (v3_get_vm_cpu_mode(core) == LONG) {
+	uint8_t prefix = *(uint8_t *)(instr_ptr + length);
 
+	if ((prefix & 0xf0) == 0x40) {
+	    instr->prefixes.rex = 1;
 
-    form = op_code_to_form((uint8_t *)(instr_ptr + length), &length);
+	    instr->prefixes.rex_rm = (prefix & 0x01);
+	    instr->prefixes.rex_sib_idx = ((prefix & 0x02) >> 1);
+	    instr->prefixes.rex_reg = ((prefix & 0x04) >> 2);
+	    instr->prefixes.rex_op_size = ((prefix & 0x08) >> 3);
+
+	    length += 1;
+	}
+    }
 
 
-    V3_Print("\t decoded as (%s)\n", op_form_to_str(form));
+    form = op_code_to_form((uint8_t *)(instr_ptr + length), &length);
+
+    PrintDebug(core->vm_info, core, "\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));
+	PrintError(core->vm_info, core, "Could not find instruction form (%x)\n", *(uint32_t *)(instr_ptr + length));
 	return -1;
     }
 
@@ -96,16 +114,18 @@ int v3_decode(struct guest_info * core, addr_t instr_ptr, struct x86_instr * ins
     ret = parse_operands(core, (uint8_t *)(instr_ptr + length), instr, form);
 
     if (ret == -1) {
-	PrintError("Could not parse instruction operands\n");
+	PrintError(core->vm_info, core, "Could not parse instruction operands\n");
 	return -1;
     }
     length += ret;
-    
 
     instr->instr_length += length;
 
-
+#ifdef V3_CONFIG_DEBUG_DECODER
+    V3_Print(core->vm_info, core, "Decoding Instr at %p\n", (void *)core->rip);
     v3_print_instr(instr);
+    V3_Print(core->vm_info, core, "CS DB FLag=%x\n", core->segments.cs.db);
+#endif
 
     return 0;
 }
@@ -120,7 +140,7 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
     uint8_t * instr_start = instr_ptr;
     
 
-    PrintDebug("\tOperand width=%d, Addr width=%d\n", operand_width, addr_width);
+    PrintDebug(core->vm_info, core, "\tOperand width=%d, Addr width=%d\n", operand_width, addr_width);
 
     switch (form) {
 	case ADC_IMM2_8:
@@ -135,16 +155,14 @@ 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;
 
-	    instr->dst_operand.size = operand_width;
-
-	    ret = decode_rm_operand(core, instr_ptr, instr, &(instr->dst_operand), &reg_code);
+	    ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand), &reg_code);
 
 	    if (ret == -1) {
-		PrintError("Error decoding operand\n");
+		PrintError(core->vm_info, core, "Error decoding operand\n");
 		return -1;
 	    }
 
@@ -153,17 +171,23 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
 	    instr->src_operand.type = IMM_OPERAND;
 	    instr->src_operand.size = operand_width;
 
+
 	    if (operand_width == 1) {
 		instr->src_operand.operand = *(uint8_t *)instr_ptr;
 	    } else if (operand_width == 2) {
 		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);
+		PrintError(core->vm_info, core, "Illegal operand width (%d)\n", operand_width);
 		return -1;
 	    }
 
+	    instr->src_operand.read = 1;
+	    instr->dst_operand.write = 1;
+
 	    instr_ptr += operand_width;
 
 	    instr->num_operands = 2;
@@ -186,12 +210,10 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
 	case MOV_2MEM: {
 	    uint8_t reg_code = 0;
 
-	    instr->dst_operand.size = operand_width;
-
-	    ret = decode_rm_operand(core, instr_ptr, instr, &(instr->dst_operand), &reg_code);
+	    ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand), &reg_code);
 
 	    if (ret == -1) {
-		PrintError("Error decoding operand\n");
+		PrintError(core->vm_info, core, "Error decoding operand\n");
 		return -1;
 	    }
 
@@ -200,6 +222,10 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
 	    instr->src_operand.type = REG_OPERAND;
 	    instr->src_operand.size = operand_width;
 
+	    instr->src_operand.read = 1;
+	    instr->dst_operand.write = 1;
+
+
 	    decode_gpr(core, reg_code, &(instr->src_operand));
 
 	    instr->num_operands = 2;
@@ -220,12 +246,135 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
 	case XOR_MEM2:
 	case MOV_MEM2: {
 	    uint8_t reg_code = 0;
+
+	    ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->src_operand), &reg_code);
+
+	    if (ret == -1) {
+		PrintError(core->vm_info, core, "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 MOV_MEM2AL_8:
+	case MOV_MEM2AX: {
+
+	    /* Use AX for destination operand */
+	    instr->dst_operand.size = operand_width;
+	    instr->dst_operand.type = REG_OPERAND;
+	    instr->dst_operand.operand = (addr_t)&(core->vm_regs.rax);
+	    instr->dst_operand.write = 1;
+
+	    /* Get the correct offset -- (seg + offset) */
+	    struct v3_segment * src_reg = get_instr_segment(core, instr);
+	    addr_t offset = 0;
+
+	    if (addr_width == 2) {
+		offset = *(uint16_t *)instr_ptr;
+	    } else if (addr_width == 4) {
+		offset = *(uint32_t *)instr_ptr;
+	    } else if (addr_width == 8) {
+		offset = *(uint64_t *)instr_ptr;
+	    } else {
+		PrintError(core->vm_info, core, "illegal address width for %s (width=%d)\n", 
+			   op_form_to_str(form), addr_width);
+		return -1;
+	    }
+
+	    instr->src_operand.operand = ADDR_MASK(get_addr_linear(core, offset, src_reg),
+						   get_addr_width(core, instr));
+	    
+	    instr->src_operand.read = 1;
+	    instr->src_operand.type = MEM_OPERAND;
+	    instr->src_operand.size = addr_width;
+
+	    instr_ptr += addr_width;
+	    instr->num_operands = 2;
+	    
+	    break;
+	}
+	case MOV_AL2MEM_8:
+	case MOV_AX2MEM: {
+
+	    /* Use AX for src operand */
 	    instr->src_operand.size = operand_width;
+	    instr->src_operand.type = REG_OPERAND;
+	    instr->src_operand.operand = (addr_t)&(core->vm_regs.rax);
+	    instr->src_operand.write = 1;
+
+	    /* Get the correct offset -- (seg + offset) */
+	    struct v3_segment * dst_reg = get_instr_segment(core, instr);
+	    addr_t offset = 0;
+
+	    if (addr_width == 2) {
+		offset = *(uint16_t *)instr_ptr;
+	    } else if (addr_width == 4) {
+		offset = *(uint32_t *)instr_ptr;
+	    } else if (addr_width == 8) {
+		offset = *(uint64_t *)instr_ptr;
+	    } else {
+		PrintError(core->vm_info, core, "illegal address width for %s (width=%d)\n", 
+			   op_form_to_str(form), addr_width);
+		return -1;
+	    }
+
+	    instr->dst_operand.operand = ADDR_MASK(get_addr_linear(core, offset, dst_reg),
+						   get_addr_width(core, instr));
+	    
+	    instr->dst_operand.read = 1;
+	    instr->dst_operand.type = MEM_OPERAND;
+	    instr->dst_operand.size = addr_width;
+
+	    instr_ptr += addr_width;
+	    instr->num_operands = 2;
+	    
+	    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(core->vm_info, core, "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;
 
-	    ret = decode_rm_operand(core, instr_ptr, instr, &(instr->src_operand), &reg_code);
+	    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");
+		PrintError(core->vm_info, core, "Error decoding operand\n");
 		return -1;
 	    }
 
@@ -235,6 +384,9 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
 	    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;
@@ -246,12 +398,11 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
 	case SUB_IMM2SX_8:
 	case XOR_IMM2SX_8: {
 	    uint8_t reg_code = 0;
-	    instr->src_operand.size = operand_width;
 
-	    ret = decode_rm_operand(core, instr_ptr, instr, &(instr->src_operand), &reg_code);
+	    ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand), &reg_code);
 
 	    if (ret == -1) {
-		PrintError("Error decoding operand\n");
+		PrintError(core->vm_info, core, "Error decoding operand\n");
 		return -1;
 	    }
 
@@ -259,7 +410,10 @@ 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;
 
 	    instr_ptr += 1;
 
@@ -272,7 +426,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;
 	    }
@@ -284,107 +438,138 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
 	    instr->src_operand.size = operand_width;
 	    instr->src_operand.operand = get_addr_linear(core,  MASK(core->vm_regs.rsi, addr_width), &(core->segments.ds));
 
+
 	    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 MOV_2CR: {
+	    uint8_t reg_code = 0;
+	    
+	    ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->src_operand),
+				    &reg_code);
+
+	    if (ret == -1) {
+		PrintError(core->vm_info, core, "Error decoding operand for (%s)\n", op_form_to_str(form));
+		return -1;
+	    }
+		
+	    instr_ptr += ret;
 
-	    case MOV_2CR: {
-		uint8_t reg_code = 0;
+	    instr->dst_operand.type = REG_OPERAND;
+	    instr->dst_operand.size = operand_width;
+	    decode_cr(core, reg_code, &(instr->dst_operand));
+	    
+	    instr->src_operand.read = 1;
+	    instr->dst_operand.write = 1;
 
-		instr->src_operand.size = operand_width;
+	    instr->num_operands = 2;
+	    break;
+	}
+	case MOV_CR2: {
+	    uint8_t reg_code = 0;
+	    
+	    ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand),
+				    &reg_code);
+	    
+	    if (ret == -1) {
+		PrintError(core->vm_info, core, "Error decoding operand for (%s)\n", op_form_to_str(form));
+		return -1;
+	    }
 
-		ret = decode_rm_operand(core, instr_ptr, instr, &(instr->src_operand),
-					&reg_code);
+	    instr_ptr += ret;
+	    
+	    instr->src_operand.type = REG_OPERAND;
+	    instr->src_operand.size = operand_width;
+	    decode_cr(core, reg_code, &(instr->src_operand));
 
-		if (ret == -1) {
-		    PrintError("Error decoding operand for (%s)\n", op_form_to_str(form));
-		    return -1;
-		}
-		
-		instr_ptr += ret;
+	    instr->src_operand.read = 1;
+	    instr->dst_operand.write = 1;
 
-		instr->dst_operand.type = REG_OPERAND;
-		instr->dst_operand.size = operand_width;
-		decode_cr(core, reg_code, &(instr->dst_operand));
+	    instr->num_operands = 2;
+	    break;
+	}
+	case STOS:
+	case STOS_8: {
+	    instr->is_str_op = 1;
 
-		instr->num_operands = 2;
-		break;
+	    if (instr->prefixes.rep == 1) {
+		instr->str_op_length = MASK(core->vm_regs.rcx, addr_width);
+	    } else {
+		instr->str_op_length = 1;
 	    }
-	    case MOV_CR2: {
-		uint8_t reg_code = 0;
 
-		instr->dst_operand.size = operand_width;
+	    instr->src_operand.size = operand_width;
+	    instr->src_operand.type = REG_OPERAND;
+	    instr->src_operand.operand = (addr_t)&(core->vm_regs.rax);
 
-		ret = decode_rm_operand(core, instr_ptr, instr, &(instr->dst_operand),
-					&reg_code);
+	    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));
 
-		if (ret == -1) {
-		    PrintError("Error decoding operand for (%s)\n", op_form_to_str(form));
-		    return -1;
-		}
+	    instr->src_operand.read = 1;
+	    instr->dst_operand.write = 1;
 
-		instr_ptr += ret;
-		
-		instr->src_operand.type = REG_OPERAND;
-		instr->src_operand.size = operand_width;
-		decode_cr(core, reg_code, &(instr->src_operand));
+	    instr->num_operands = 2;
 
-		instr->num_operands = 2;
-		break;
-	    }
-	    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);
+	    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;
 
-		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));
+	    break;
+	}
+	case INVLPG: {
+	    uint8_t reg_code = 0;
 
-		instr->num_operands = 2;
+	    ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand), &reg_code);
 
-		break;
+	    if (ret == -1) {
+		PrintError(core->vm_info, core, "Error decoding operand for (%s)\n", op_form_to_str(form));
+		return -1;
 	    }
-	    case INVLPG: {
-		uint8_t reg_code = 0;
 
-		// We use the dst operand here to maintain bug-for-bug compatibility with XED
+	    instr_ptr += ret;
 
-		instr->dst_operand.size = operand_width;
+	    instr->num_operands = 1;
+	    break;
+	}
+	case LMSW: 
+	case SMSW: {
+	    uint8_t reg_code = 0;
 
-		ret = decode_rm_operand(core, instr_ptr, instr, &(instr->dst_operand), &reg_code);
+	    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;
-		}
+	    if (ret == -1) {
+		PrintError(core->vm_info, core, "Error decoding operand for (%s)\n", op_form_to_str(form));
+		return -1;
+	    }
 
-		instr_ptr += ret;
+	    instr_ptr += ret;
 
-		instr->num_operands = 1;
-		break;
-	    }
-	    case CLTS: {
-		// no operands. 
-		break;
+	    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));
+	    PrintError(core->vm_info, core, "Invalid Instruction form: %s\n", op_form_to_str(form));
 	    return -1;
     }
 
@@ -403,12 +588,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:
@@ -434,7 +621,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: