#include <palacios/vmm_types.h>
-
/* .... Giant fucking switch tables */
SMSW,
CLTS,
INVLPG,
+ INT,
MOV_CR2,
MOV_2CR,
case XOR_MEM2_8:
case XOR_IMM2_8:
case INC_8:
+ case INT:
case DEC_8:
case NEG_8:
case NOT_8:
case MOV_MEM2:
case MOV_2MEM:
case MOV_MEM2AX:
- case MOV_AX2MEM:
- case MOV_IMM2:
+ case MOV_AX2MEM:
case MOVS:
case MOVSX:
case MOVZX:
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;
case LONG:
if (instr->prefixes.rex_op_size) {
return 8;
+ } else {
+ return (instr->prefixes.op_size) ? 2 : 4;
}
case PROTECTED:
case PROTECTED_PAE:
PrintError("Unsupported CPU mode: %d\n", info->cpu_mode);
return -1;
}
-
case INVLPG:
switch (v3_get_vm_cpu_mode(info)) {
case REAL:
return -1;
}
+ //case INT:
case MOV_DR2:
case MOV_2DR:
case MOV_CR2:
return -1;
}
+
return 0;
}
struct v3_ctrl_regs * crs = &(core->ctrl_regs);
- PrintDebug("\t Ctrl regs %d\n", reg_code);
+// PrintDebug("\t Ctrl regs %d\n", reg_code);
switch (reg_code) {
case 0:
return 0;
}
-// This converts the displacement into the appropriate masked value
-/*
- QUESTION: Are the register Values signed ?????
- */
-#define MASK_DISPLACEMENT(reg, mode) ({ \
- sint64_t val = 0; \
- if (mode == DISP8) { \
- val = (sint8_t)(reg & 0xff); \
- } else if (mode == DISP16) { \
- val = (sint16_t)(reg & 0xffff); \
- } else if (mode == DISP32) { \
- val = (sint32_t)(reg & 0xffffffff); \
- } else { \
- PrintError("Error invalid displacement size (%d)\n", mode); \
- /*V3_ASSERT(0);*/ \
- } \
- val; \
- })
#define ADDR_MASK(val, length) ({ \
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;
}
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) {
switch (sib->base) {
case 0:
- base_addr += MASK_DISPLACEMENT(gprs->rax, mod_mode);
+ base_addr += ADDR_MASK(gprs->rax, 4);
break;
case 1:
- base_addr += MASK_DISPLACEMENT(gprs->rcx, mod_mode);
+ base_addr += ADDR_MASK(gprs->rcx, 4);
break;
case 2:
- base_addr += MASK_DISPLACEMENT(gprs->rdx, mod_mode);
+ base_addr += ADDR_MASK(gprs->rdx, 4);
break;
case 3:
- base_addr += MASK_DISPLACEMENT(gprs->rbx, mod_mode);
+ base_addr += ADDR_MASK(gprs->rbx, 4);
break;
case 4:
- base_addr += MASK_DISPLACEMENT(gprs->rsp, mod_mode);
+ base_addr += ADDR_MASK(gprs->rsp, 4);
break;
case 5:
if (modrm->mod != 0) {
- base_addr += MASK_DISPLACEMENT(gprs->rbp, mod_mode);
+ base_addr += ADDR_MASK(gprs->rbp, 4);
}
break;
case 6:
- base_addr += MASK_DISPLACEMENT(gprs->rsi, mod_mode);
+ base_addr += ADDR_MASK(gprs->rsi, 4);
break;
case 7:
- base_addr += MASK_DISPLACEMENT(gprs->rdi, mod_mode);
+ base_addr += ADDR_MASK(gprs->rdi, 4);
break;
}
}
operand->operand = ADDR_MASK(get_addr_linear(core, base_addr, seg),
- get_addr_width(core, instr));
+ get_addr_width(core, 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) {
switch (base_val) {
case 0:
- base_addr += MASK_DISPLACEMENT(gprs->rax, mod_mode);
+ base_addr += gprs->rax;
break;
case 1:
- base_addr += MASK_DISPLACEMENT(gprs->rcx, mod_mode);
+ base_addr += gprs->rcx;
break;
case 2:
- base_addr += MASK_DISPLACEMENT(gprs->rdx, mod_mode);
+ base_addr += gprs->rdx;
break;
case 3:
- base_addr += MASK_DISPLACEMENT(gprs->rbx, mod_mode);
+ base_addr += gprs->rbx;
break;
case 4:
- base_addr += MASK_DISPLACEMENT(gprs->rsp, mod_mode);
+ base_addr += gprs->rsp;
break;
case 5:
if (modrm->mod != 0) {
- base_addr += MASK_DISPLACEMENT(gprs->rbp, mod_mode);
+ base_addr += gprs->rbp;
}
break;
case 6:
- base_addr += MASK_DISPLACEMENT(gprs->rsi, mod_mode);
+ base_addr += gprs->rsi;
break;
case 7:
- base_addr += MASK_DISPLACEMENT(gprs->rdi, mod_mode);
+ base_addr += gprs->rdi;
break;
case 8:
- base_addr += MASK_DISPLACEMENT(gprs->r8, mod_mode);
+ base_addr += gprs->r8;
break;
case 9:
- base_addr += MASK_DISPLACEMENT(gprs->r9, mod_mode);
+ base_addr += gprs->r9;
break;
case 10:
- base_addr += MASK_DISPLACEMENT(gprs->r10, mod_mode);
+ base_addr += gprs->r10;
break;
case 11:
- base_addr += MASK_DISPLACEMENT(gprs->r11, mod_mode);
+ base_addr += gprs->r11;
break;
case 12:
- base_addr += MASK_DISPLACEMENT(gprs->r12, mod_mode);
+ base_addr += gprs->r12;
break;
case 13:
- base_addr += MASK_DISPLACEMENT(gprs->r13, mod_mode);
+ base_addr += gprs->r13;
break;
case 14:
- base_addr += MASK_DISPLACEMENT(gprs->r14, mod_mode);
+ base_addr += gprs->r14;
break;
case 15:
- base_addr += MASK_DISPLACEMENT(gprs->r15, mod_mode);
+ base_addr += gprs->r15;
break;
}
}
- /*
- Segments should be ignored
- // get appropriate segment
- if (instr->prefixes.cs_override) {
- seg = &(core->segments.cs);
- } else if (instr->prefixes.es_override) {
- seg = &(core->segments.es);
- } else if (instr->prefixes.ss_override) {
- seg = &(core->segments.ss);
- } else if (instr->prefixes.fs_override) {
- seg = &(core->segments.fs);
- } else if (instr->prefixes.gs_override) {
- seg = &(core->segments.gs);
- } else {
- seg = &(core->segments.ds);
- }
- */
+
+ //Segments should be ignored
+ // get appropriate segment
+
+ if (instr->prefixes.cs_override) {
+ seg = &(core->segments.cs);
+ } else if (instr->prefixes.es_override) {
+ seg = &(core->segments.es);
+ } else if (instr->prefixes.ss_override) {
+ seg = &(core->segments.ss);
+ } else if (instr->prefixes.fs_override) {
+ seg = &(core->segments.fs);
+ } else if (instr->prefixes.gs_override) {
+ seg = &(core->segments.gs);
+ } else {
+ seg = &(core->segments.ds);
+ }
+
operand->operand = ADDR_MASK(get_addr_linear(core, base_addr, seg),
- get_addr_width(core, instr));
+ get_addr_width(core, instr));
}
case REAL:
return decode_rm_operand16(core, instr_ptr, instr, operand, reg_code);
case LONG:
- if (instr->prefixes.rex_op_size) {
+ if (instr->prefixes.rex) {
return decode_rm_operand64(core, instr_ptr, instr, operand, reg_code);
}
case PROTECTED:
case 0xf4:
return HLT;
+ case 0xcd:
+ return INT;
case 0xf6: {
struct modrm_byte * modrm = (struct modrm_byte *)&(instr[1]);
case SETO: return "SETO";
case STOS_8: return "STOS_8";
case STOS: return "STOS";
+ case INT: return "INT";
case INVALID_INSTR:
default: