Merge branch 'devel' of ssh://newskysaw.cs.northwestern.edu//home/palacios/palacios...

[palacios-OLD.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 f36a738..1cce578 100644 (file)
--- a/palacios/include/palacios/vmm_instr_decoder.h
+++ b/palacios/include/palacios/vmm_instr_decoder.h
@@ -261,6 +261,8 @@ static int get_operand_width(struct guest_info * info, struct x86_instr * instr,
                case LONG:
                    if (instr->prefixes.rex_op_size) {
                        return 8;
+                   } else {
+                       return 4;
                    }
                case PROTECTED:
                case PROTECTED_PAE:
@@ -333,6 +335,7 @@ static int get_operand_width(struct guest_info * info, struct x86_instr * instr,
            return -1;
        
     }
+
     return 0;
 }
 
@@ -546,37 +549,41 @@ static  int decode_rm_operand16(struct guest_info * core,
            mod_mode = DISP8;
        } else if (modrm->mod == 2) {
            mod_mode = DISP16;
+       } else {
+           PrintError("Instruction format error: Invalid mod_rm mode (%d)\n", modrm->mod);
+           v3_print_instr(instr);
+           return -1;
        }
 
        switch (modrm->rm) {
            case 0:
-               base_addr = gprs->rbx + MASK_DISPLACEMENT(gprs->rsi, mod_mode);
+               base_addr = gprs->rbx + ADDR_MASK(gprs->rsi, 2);
                break;
            case 1:
-               base_addr = gprs->rbx + MASK_DISPLACEMENT(gprs->rdi, mod_mode);
+               base_addr = gprs->rbx + ADDR_MASK(gprs->rdi, 2);
                break;
            case 2:
-               base_addr = gprs->rbp + MASK_DISPLACEMENT(gprs->rsi, mod_mode);
+               base_addr = gprs->rbp + ADDR_MASK(gprs->rsi, 2);
                break;
            case 3:
-               base_addr = gprs->rbp + MASK_DISPLACEMENT(gprs->rdi, mod_mode);
+               base_addr = gprs->rbp + ADDR_MASK(gprs->rdi, 2);
                break;
            case 4:
-               base_addr = gprs->rsi;
+               base_addr = ADDR_MASK(gprs->rsi, 2);
                break;
            case 5:
-               base_addr = gprs->rdi;
+               base_addr = ADDR_MASK(gprs->rdi, 2);
                break;
            case 6:
                if (modrm->mod == 0) {
                    base_addr = 0;
                    mod_mode = DISP16;
                } else {
-                   base_addr = gprs->rbp;
+                   base_addr = ADDR_MASK(gprs->rbp, 2);
                }
                break;
            case 7:
-               base_addr = gprs->rbx;
+               base_addr = ADDR_MASK(gprs->rbx, 2);
                break;
        }
 
@@ -651,6 +658,10 @@ static int decode_rm_operand32(struct guest_info * core,
            mod_mode = DISP8;
        } else if (modrm->mod == 2) {
            mod_mode = DISP32;
+       } else {
+           PrintError("Instruction format error: Invalid mod_rm mode (%d)\n", modrm->mod);
+           v3_print_instr(instr);
+           return -1;
        }
     
        switch (modrm->rm) {
@@ -825,6 +836,10 @@ int decode_rm_operand64(struct guest_info * core, uint8_t * modrm_instr,
            mod_mode = DISP8;
        } else if (modrm->mod == 2) {
            mod_mode = DISP32;
+       } else {
+           PrintError("Instruction format error: Invalid mod_rm mode (%d)\n", modrm->mod);
+           v3_print_instr(instr);
+           return -1;
        }
     
        if (rm_val == 4) {