Previous software interrupt support was added to Xed, but I wasn't using the kernel

[palacios.git] / palacios / src / palacios / vmm_v3dec.c

diff --git a/palacios/src/palacios/vmm_v3dec.c b/palacios/src/palacios/vmm_v3dec.c
index f10bed9..343be38 100644 (file)
--- a/palacios/src/palacios/vmm_v3dec.c
+++ b/palacios/src/palacios/vmm_v3dec.c
@@ -122,7 +122,9 @@ int v3_decode(struct guest_info * core, addr_t instr_ptr, struct x86_instr * ins
     instr->instr_length += length;
 
 #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,6 +448,15 @@ 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;
 
@@ -501,16 +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;
 
-    // KCH: for syscall interposition
-    case INT:
-        return V3_OP_INT;
-
-
        case MOV_MEM2_8:
        case MOV_MEM2:
        case MOV_2MEM_8: