#include <palacios/vmm_types.h>
-
/* .... Giant fucking switch tables */
case OR_IMM2SX_8:
case SUB_IMM2SX_8:
case XOR_IMM2SX_8:
- switch (v3_get_vm_cpu_mode(info)) {
+ 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;
- }
+ if (instr->prefixes.rex_op_size) {
+ return 8;
+ }
case PROTECTED:
case PROTECTED_PAE:
case LONG_32_COMPAT:
- if (info->segments.cs.db) {
- // default is 32
- return (instr->prefixes.op_size) ? 2 : 4;
- } else {
- return (instr->prefixes.op_size) ? 4 : 2;
- }
+ if (info->segments.cs.db) {
+ // default is 32
+ return (instr->prefixes.op_size) ? 2 : 4;
+ } else {
+ return (instr->prefixes.op_size) ? 4 : 2;
+ }
default:
PrintError("Unsupported CPU mode: %d\n", info->cpu_mode);
return -1;
}
-
+
case INVLPG:
switch (v3_get_vm_cpu_mode(info)) {
case REAL:
case PROTECTED:
case PROTECTED_PAE:
case LONG_32_COMPAT:
-
return 4;
case LONG:
return 8;
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:
}
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,
- struct x86_instr * instr, struct x86_operand * operand,
- uint8_t * reg_code) {
-
-
- return 0;
+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;
+ }
+
+ 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 += MASK_DISPLACEMENT(gprs->rax, mod_mode);
+ break;
+ case 1:
+ base_addr += MASK_DISPLACEMENT(gprs->rcx, mod_mode);
+ break;
+ case 2:
+ base_addr += MASK_DISPLACEMENT(gprs->rdx, mod_mode);
+ break;
+ case 3:
+ base_addr += MASK_DISPLACEMENT(gprs->rbx, mod_mode);
+ break;
+ case 4:
+ base_addr += MASK_DISPLACEMENT(gprs->rsp, mod_mode);
+ break;
+ case 5:
+ if (modrm->mod != 0) {
+ base_addr += MASK_DISPLACEMENT(gprs->rbp, mod_mode);
+ }
+ break;
+ case 6:
+ base_addr += MASK_DISPLACEMENT(gprs->rsi, mod_mode);
+ break;
+ case 7:
+ base_addr += MASK_DISPLACEMENT(gprs->rdi, mod_mode);
+ break;
+ case 8:
+ base_addr += MASK_DISPLACEMENT(gprs->r8, mod_mode);
+ break;
+ case 9:
+ base_addr += MASK_DISPLACEMENT(gprs->r9, mod_mode);
+ break;
+ case 10:
+ base_addr += MASK_DISPLACEMENT(gprs->r10, mod_mode);
+ break;
+ case 11:
+ base_addr += MASK_DISPLACEMENT(gprs->r11, mod_mode);
+ break;
+ case 12:
+ base_addr += MASK_DISPLACEMENT(gprs->r12, mod_mode);
+ break;
+ case 13:
+ base_addr += MASK_DISPLACEMENT(gprs->r13, mod_mode);
+ break;
+ case 14:
+ base_addr += MASK_DISPLACEMENT(gprs->r14, mod_mode);
+ break;
+ case 15:
+ base_addr += MASK_DISPLACEMENT(gprs->r15, mod_mode);
+ 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);
+
+
}
static int decode_rm_operand(struct guest_info * core,
uint8_t * instr_ptr, // input
+ op_form_t form,
struct x86_instr * instr,
struct x86_operand * operand,
uint8_t * reg_code) {
v3_cpu_mode_t mode = v3_get_vm_cpu_mode(core);
- if (mode == REAL) {
- return decode_rm_operand16(core, instr_ptr, instr, operand, reg_code);
- } else if ((mode == PROTECTED) || (mode == PROTECTED_PAE) || (mode == LONG_32_COMPAT)) {
- return decode_rm_operand32(core, instr_ptr, instr, operand, reg_code);
- } else if (mode == LONG) {
+ operand->size = get_operand_width(core, instr, form);
+
+ switch (mode) {
+ case REAL:
+ return decode_rm_operand16(core, instr_ptr, instr, operand, reg_code);
+ case LONG:
+ if (instr->prefixes.rex_op_size) {
return decode_rm_operand64(core, instr_ptr, instr, operand, reg_code);
- } else {
- PrintError("Invalid CPU_MODE (%d)\n", mode);
- return -1;
+ }
+ case PROTECTED:
+ case PROTECTED_PAE:
+ case LONG_32_COMPAT:
+ return decode_rm_operand32(core, instr_ptr, instr, operand, reg_code);
+ default:
+ PrintError("Invalid CPU_MODE (%d)\n", mode);
+ return -1;
}
}
