#include <palacios/vmm_types.h>
-
/* .... Giant fucking switch tables */
case REAL:
return (instr->prefixes.op_size) ? 4 : 2;
case LONG:
- if (instr->prefixes.rex.op_size) {
+ if (instr->prefixes.rex_op_size) {
return 8;
+ } else {
+ return 4;
}
case PROTECTED:
case PROTECTED_PAE:
return -1;
}
+
return 0;
}
reg->operand = (addr_t)&(gprs->rdi);
}
break;
+ case 8:
+ reg->operand = (addr_t)&(gprs->r8);
+ break;
+ case 9:
+ reg->operand = (addr_t)&(gprs->r9);
+ break;
+ case 10:
+ reg->operand = (addr_t)&(gprs->r10);
+ break;
+ case 11:
+ reg->operand = (addr_t)&(gprs->r11);
+ break;
+ case 12:
+ reg->operand = (addr_t)&(gprs->r12);
+ break;
+ case 13:
+ reg->operand = (addr_t)&(gprs->r13);
+ break;
+ case 14:
+ reg->operand = (addr_t)&(gprs->r14);
+ break;
+ case 15:
+ reg->operand = (addr_t)&(gprs->r15);
+ break;
default:
PrintError("Invalid Reg Code (%d)\n", reg_code);
reg->operand = 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));
}
}
-int decode_rm_operand64(struct guest_info * core, uint8_t * instr_ptr,
+int decode_rm_operand64(struct guest_info * core, uint8_t * modrm_instr,
struct x86_instr * instr, struct x86_operand * operand,
uint8_t * reg_code) {
+ struct v3_gprs * gprs = &(core->vm_regs);
+ uint8_t * instr_cursor = modrm_instr;
+ struct modrm_byte * modrm = (struct modrm_byte *)modrm_instr;
+ addr_t base_addr = 0;
+ modrm_mode_t mod_mode = 0;
+ uint_t has_sib_byte = 0;
+
+
+ instr_cursor += 1;
+
+ *reg_code = modrm->reg;
+ *reg_code |= (instr->prefixes.rex_reg << 3);
+
+ if (modrm->mod == 3) {
+ uint8_t rm_val = modrm->rm;
+
+ rm_val |= (instr->prefixes.rex_rm << 3);
+
+ operand->type = REG_OPERAND;
+ // PrintDebug("first operand = Register (RM=%d)\n",modrm->rm);
+
+ decode_gpr(core, rm_val, operand);
+ } else {
+ struct v3_segment * seg = NULL;
+ uint8_t rm_val = modrm->rm;
+
+ operand->type = MEM_OPERAND;
+
+
+ if (modrm->mod == 0) {
+ mod_mode = DISP0;
+ } else if (modrm->mod == 1) {
+ 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;
+ }
-
- return 0;
+ if (rm_val == 4) {
+ has_sib_byte = 1;
+ } else {
+ rm_val |= (instr->prefixes.rex_rm << 3);
+
+ switch (rm_val) {
+ case 0:
+ base_addr = gprs->rax;
+ break;
+ case 1:
+ base_addr = gprs->rcx;
+ break;
+ case 2:
+ base_addr = gprs->rdx;
+ break;
+ case 3:
+ base_addr = gprs->rbx;
+ break;
+ case 5:
+ if (modrm->mod == 0) {
+ base_addr = 0;
+ mod_mode = DISP32;
+ } else {
+ base_addr = gprs->rbp;
+ }
+ break;
+ case 6:
+ base_addr = gprs->rsi;
+ break;
+ case 7:
+ base_addr = gprs->rdi;
+ break;
+ case 8:
+ base_addr = gprs->r8;
+ break;
+ case 9:
+ base_addr = gprs->r9;
+ break;
+ case 10:
+ base_addr = gprs->r10;
+ break;
+ case 11:
+ base_addr = gprs->r11;
+ break;
+ case 12:
+ base_addr = gprs->r12;
+ break;
+ case 13:
+ base_addr = gprs->r13;
+ break;
+ case 14:
+ base_addr = gprs->r14;
+ break;
+ case 15:
+ base_addr = gprs->r15;
+ break;
+ default:
+ return -1;
+ }
+ }
+
+ if (has_sib_byte) {
+ instr_cursor += 1;
+ struct sib_byte * sib = (struct sib_byte *)(instr_cursor);
+ int scale = 0x1 << sib->scale;
+ uint8_t index_val = sib->index;
+ uint8_t base_val = sib->base;
+
+ index_val |= (instr->prefixes.rex_sib_idx << 3);
+ base_val |= (instr->prefixes.rex_rm << 3);
+
+ instr_cursor += 1;
+
+ switch (index_val) {
+ case 0:
+ base_addr = gprs->rax;
+ break;
+ case 1:
+ base_addr = gprs->rcx;
+ break;
+ case 2:
+ base_addr = gprs->rdx;
+ break;
+ case 3:
+ base_addr = gprs->rbx;
+ break;
+ case 4:
+ base_addr = 0;
+ break;
+ case 5:
+ base_addr = gprs->rbp;
+ break;
+ case 6:
+ base_addr = gprs->rsi;
+ break;
+ case 7:
+ base_addr = gprs->rdi;
+ break;
+ case 8:
+ base_addr = gprs->r8;
+ break;
+ case 9:
+ base_addr = gprs->r9;
+ break;
+ case 10:
+ base_addr = gprs->r10;
+ break;
+ case 11:
+ base_addr = gprs->r11;
+ break;
+ case 12:
+ base_addr = gprs->r12;
+ break;
+ case 13:
+ base_addr = gprs->r13;
+ break;
+ case 14:
+ base_addr = gprs->r14;
+ break;
+ case 15:
+ base_addr = gprs->r15;
+ break;
+ }
+
+ base_addr *= scale;
+
+
+ switch (base_val) {
+ case 0:
+ base_addr += gprs->rax
+ break;
+ case 1:
+ base_addr += gprs->rcx
+ break;
+ case 2:
+ base_addr += gprs->rdx
+ break;
+ case 3:
+ base_addr += gprs->rbx
+ break;
+ case 4:
+ base_addr += gprs->rsp
+ break;
+ case 5:
+ if (modrm->mod != 0) {
+ base_addr += gprs->rbp
+ }
+ break;
+ case 6:
+ base_addr += gprs->rsi
+ break;
+ case 7:
+ base_addr += gprs->rdi
+ break;
+ case 8:
+ base_addr += gprs->r8
+ break;
+ case 9:
+ base_addr += gprs->r9
+ break;
+ case 10:
+ base_addr += gprs->r10
+ break;
+ case 11:
+ base_addr += gprs->r11
+ break;
+ case 12:
+ base_addr += gprs->r12
+ break;
+ case 13:
+ base_addr += gprs->r13
+ break;
+ case 14:
+ base_addr += gprs->r14
+ break;
+ case 15:
+ base_addr += gprs->r15;
+ break;
+ }
+
+ }
+
+
+ if (mod_mode == DISP8) {
+ base_addr += *(sint8_t *)instr_cursor;
+ instr_cursor += 1;
+ } else if (mod_mode == DISP32) {
+ base_addr += *(sint32_t *)instr_cursor;
+ instr_cursor += 4;
+ }
+
+
+ /*
+ 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));
+ }
+
+
+ return (instr_cursor - modrm_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_op_size) {
return decode_rm_operand64(core, instr_ptr, instr, operand, reg_code);
}
case PROTECTED:
