decoder fixes

[palacios.git] / palacios / include / palacios / vmm_instr_decoder.h

diff --git a/palacios/include/palacios/vmm_instr_decoder.h b/palacios/include/palacios/vmm_instr_decoder.h
index 2e26457..3fe838b 100644 (file)
--- a/palacios/include/palacios/vmm_instr_decoder.h
+++ b/palacios/include/palacios/vmm_instr_decoder.h
@@ -28,6 +28,7 @@ typedef enum {
     SMSW,
     CLTS,
     INVLPG,
+    INT, 
 
     MOV_CR2,
     MOV_2CR,
@@ -220,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:
@@ -255,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;
@@ -262,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:
@@ -277,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:
@@ -310,6 +310,7 @@ static int get_operand_width(struct guest_info * info, struct x86_instr * instr,
                    return -1;
            }
 
+       case INT:
        case MOV_DR2:
        case MOV_2DR:
        case MOV_CR2:
@@ -1331,6 +1332,8 @@ static op_form_t op_code_to_form(uint8_t * instr, int * length) {
        case 0xf4:
            return HLT;
 
+       case 0xcd:
+               return INT;
 
        case 0xf6: {
            struct modrm_byte * modrm = (struct modrm_byte *)&(instr[1]);
@@ -1493,6 +1496,7 @@ static char * op_form_to_str(op_form_t form) {
        case SETO: return "SETO";
        case STOS_8: return "STOS_8";
        case STOS: return "STOS";
+       case INT: return "INT";
 
        case INVALID_INSTR:
        default: