decoder fixes

diff --git a/palacios/include/palacios/vmm_instr_decoder.h b/palacios/include/palacios/vmm_instr_decoder.h
index 6ed6ba0..3fe838b 100644 (file)
--- a/palacios/include/palacios/vmm_instr_decoder.h
+++ b/palacios/include/palacios/vmm_instr_decoder.h
@@ -221,8 +221,7 @@ static int get_operand_width(struct guest_info * info, struct x86_instr * instr,
        case MOV_MEM2:
        case MOV_2MEM:
        case MOV_MEM2AX:
-       case MOV_AX2MEM:
-       case MOV_IMM2:      
+       case MOV_AX2MEM: 
        case MOVS:
        case MOVSX:
        case MOVZX:
@@ -256,6 +255,7 @@ static int get_operand_width(struct guest_info * info, struct x86_instr * instr,
        case OR_IMM2SX_8:
        case SUB_IMM2SX_8:
        case XOR_IMM2SX_8:
+       case MOV_IMM2:
            switch (v3_get_vm_cpu_mode(info)) {
                case REAL:
                    return (instr->prefixes.op_size) ? 4 : 2;
@@ -263,7 +263,7 @@ static int get_operand_width(struct guest_info * info, struct x86_instr * instr,
                    if (instr->prefixes.rex_op_size) {
                        return 8;
                    } else {
-                       return 4;
+                       return (instr->prefixes.op_size) ? 2 : 4;
                    }
                case PROTECTED:
                case PROTECTED_PAE:
@@ -278,7 +278,6 @@ static int get_operand_width(struct guest_info * info, struct x86_instr * instr,
                    PrintError("Unsupported CPU mode: %d\n", info->cpu_mode);
                    return -1;
            }
-           
        case INVLPG:
            switch (v3_get_vm_cpu_mode(info)) {
                case REAL:

diff --git a/palacios/src/palacios/vmm_v3dec.c b/palacios/src/palacios/vmm_v3dec.c
index b862f96..5f98b9f 100644 (file)
--- a/palacios/src/palacios/vmm_v3dec.c
+++ b/palacios/src/palacios/vmm_v3dec.c
@@ -123,6 +123,7 @@ int v3_decode(struct guest_info * core, addr_t instr_ptr, struct x86_instr * ins
 
 #ifdef V3_CONFIG_DEBUG_DECODER
     v3_print_instr(instr);
+    V3_Print("CS DB FLag=%x\n", core->segments.cs.db);
 #endif
 
     return 0;
@@ -153,8 +154,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 +177,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;