PrintDebug("OperandVal = %x\n", new_cr0_val);
- PrintDebug("Old CR0=%x\n", *real_cr0);
+ PrintDebug("Old CR0=%x\n", *(uint_t *)real_cr0);
*(uchar_t*)real_cr0 &= 0xf0;
*(uchar_t*)real_cr0 |= new_cr0_val;
- PrintDebug("New CR0=%x\n", *real_cr0);
+ PrintDebug("New CR0=%x\n", *(uint_t *)real_cr0);
if (info->shdw_pg_mode == SHADOW_PAGING) {
struct cr0_real * shadow_cr0 = (struct cr0_real*)&(info->shdw_pg_state.guest_cr0);
- PrintDebug(" Old Shadow CR0=%x\n", *shadow_cr0);
+ PrintDebug(" Old Shadow CR0=%x\n", *(uint_t *)shadow_cr0);
*(uchar_t*)shadow_cr0 &= 0xf0;
*(uchar_t*)shadow_cr0 |= new_cr0_val;
- PrintDebug("New Shadow CR0=%x\n", *shadow_cr0);
+ PrintDebug("New Shadow CR0=%x\n", *(uint_t *)shadow_cr0);
}
} else if (v3_opcode_cmp(V3_OPCODE_MOV2CR, (const uchar_t *)(dec_instr.opcode)) == 0) {
PrintDebug("MOV2CR0\n");
if (info->cpu_mode == LONG) {
// 64 bit registers
+ PrintError("Long mode currently not handled\n");
+ return -1;
} else {
// 32 bit registers
struct cr0_32 *real_cr0 = (struct cr0_32*)&(info->ctrl_regs.cr0);
struct cr0_32 *new_cr0= (struct cr0_32 *)(dec_instr.src_operand.operand);
- PrintDebug("OperandVal = %x, length=%d\n", *new_cr0, dec_instr.src_operand.size);
+ PrintDebug("OperandVal = %x, length=%d\n", *(uint_t *)new_cr0, dec_instr.src_operand.size);
- PrintDebug("Old CR0=%x\n", *real_cr0);
+ PrintDebug("Old CR0=%x\n", *(uint_t *)real_cr0);
*real_cr0 = *new_cr0;
if (info->shdw_pg_mode == SHADOW_PAGING) {
struct cr0_32 * shadow_cr0 = (struct cr0_32 *)&(info->shdw_pg_state.guest_cr0);
- PrintDebug("Old Shadow CR0=%x\n", *shadow_cr0);
+ PrintDebug("Old Shadow CR0=%x\n", *(uint_t *)shadow_cr0);
real_cr0->et = 1;
if (v3_get_mem_mode(info) == VIRTUAL_MEM) {
struct cr3_32 * shadow_cr3 = (struct cr3_32 *)&(info->shdw_pg_state.shadow_cr3);
-
+ PrintDebug("Setting up Shadow Page Table\n");
info->ctrl_regs.cr3 = *(addr_t*)shadow_cr3;
} else {
info->ctrl_regs.cr3 = *(addr_t*)&(info->direct_map_pt);
real_cr0->pg = 1;
}
- PrintDebug("New Shadow CR0=%x\n",*shadow_cr0);
+ PrintDebug("New Shadow CR0=%x\n",*(uint_t *)shadow_cr0);
}
- PrintDebug("New CR0=%x\n", *real_cr0);
+ PrintDebug("New CR0=%x\n", *(uint_t *)real_cr0);
}
} else if (v3_opcode_cmp(V3_OPCODE_CLTS, (const uchar_t *)(dec_instr.opcode)) == 0) {
struct cr0_32 * real_cr0 = (struct cr0_32 *)&(info->ctrl_regs.cr0);
PrintDebug("MOVCR2\n");
- PrintDebug("CR0 at 0x%x\n", real_cr0);
+ PrintDebug("CR0 at 0x%p\n", (void *)real_cr0);
if (info->shdw_pg_mode == SHADOW_PAGING) {
*virt_cr0 = *(struct cr0_32 *)&(info->shdw_pg_state.guest_cr0);
PrintDebug("SMSW\n");
- PrintDebug("CR0 at 0x%x\n", real_cr0);
+ PrintDebug("CR0 at 0x%p\n", real_cr0);
*(char *)virt_cr0 &= 0xf0;
*(char *)virt_cr0 |= cr0_val;
PrintDebug("MOV2CR3\n");
- PrintDebug("CR3 at 0x%x\n", &(info->ctrl_regs.cr3));
+ PrintDebug("CR3 at 0x%p\n", &(info->ctrl_regs.cr3));
if (info->shdw_pg_mode == SHADOW_PAGING) {
struct cr3_32 * new_cr3 = (struct cr3_32 *)(dec_instr.src_operand.operand);
*(uint_t*)shadow_cr3, *(uint_t*)guest_cr3);
- cached = v3_cache_page_tables32(info, CR3_TO_PDE32(*(addr_t *)new_cr3));
+ cached = v3_cache_page_tables32(info, (addr_t)V3_PAddr((void *)(addr_t)CR3_TO_PDE32((void *)*(addr_t *)new_cr3)));
+
if (cached == -1) {
PrintError("CR3 Cache failed\n");
return -1;
} else if (cached == 0) {
addr_t shadow_pt;
- PrintDebug("New CR3 is different - flushing shadow page table\n");
-
- delete_page_tables_pde32((pde32_t *)CR3_TO_PDE32(*(uint_t*)shadow_cr3));
+ if(info->mem_mode == VIRTUAL_MEM) {
+ PrintDebug("New CR3 is different - flushing shadow page table %p\n", shadow_cr3 );
+ delete_page_tables_pde32((pde32_t *)CR3_TO_PDE32(*(uint_t*)shadow_cr3));
+ }
shadow_pt = v3_create_new_shadow_pt32();
- shadow_cr3->pdt_base_addr = PD32_BASE_ADDR(shadow_pt);
+ shadow_cr3->pdt_base_addr = (addr_t)V3_PAddr((void *)(addr_t)PD32_BASE_ADDR(shadow_pt));
+ PrintDebug( "Created new shadow page table %p\n", (void *)(addr_t)shadow_cr3->pdt_base_addr );
+ //PrintDebugPageTables( (pde32_t *)CR3_TO_PDE32(*(uint_t*)shadow_cr3) );
+
+
} else {
PrintDebug("Reusing cached shadow Page table\n");
}
+
shadow_cr3->pwt = new_cr3->pwt;
shadow_cr3->pcd = new_cr3->pcd;
PrintDebug("MOVCR32\n");
struct cr3_32 * virt_cr3 = (struct cr3_32 *)(dec_instr.dst_operand.operand);
- PrintDebug("CR3 at 0x%x\n", &(info->ctrl_regs.cr3));
+ PrintDebug("CR3 at 0x%p\n", &(info->ctrl_regs.cr3));
if (info->shdw_pg_mode == SHADOW_PAGING) {
*virt_cr3 = *(struct cr3_32 *)&(info->shdw_pg_state.guest_cr3);
return 0;
}
+
+int v3_handle_cr4_read(struct guest_info * info) {
+ PrintError("CR4 Read not handled\n");
+ return -1;
+}
+
+int v3_handle_cr4_write(struct guest_info * info) {
+ uchar_t instr[15];
+ int ret;
+ struct x86_instr dec_instr;
+
+ if (info->mem_mode == PHYSICAL_MEM) {
+ ret = read_guest_pa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
+ } else {
+ ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
+ }
+
+ if (v3_decode(info, (addr_t)instr, &dec_instr) == -1) {
+ PrintError("Could not decode instruction\n");
+ return -1;
+ }
+
+ if (v3_opcode_cmp(V3_OPCODE_MOV2CR, (const uchar_t *)(dec_instr.opcode)) != 0) {
+ PrintError("Invalid opcode in write to CR4\n");
+ return -1;
+ }
+
+ if ((info->cpu_mode == PROTECTED) || (info->cpu_mode == PROTECTED_PAE)) {
+ struct cr4_32 * new_cr4 = (struct cr4_32 *)(dec_instr.src_operand.operand);
+ struct cr4_32 * old_cr4 = (struct cr4_32 *)&(info->ctrl_regs.cr4);
+
+ PrintDebug("OperandVal = %x, length = %d\n", *(uint_t *)new_cr4, dec_instr.src_operand.size);
+ PrintDebug("Old CR4=%x\n", *(uint_t *)old_cr4);
+
+
+
+
+ if ((info->shdw_pg_mode == SHADOW_PAGING) &&
+ (v3_get_mem_mode(info) == PHYSICAL_MEM)) {
+
+ if ((old_cr4->pae == 0) && (new_cr4->pae == 1)) {
+ // Create Passthrough PAE pagetables
+ PrintDebug("Creating PAE passthrough tables\n");
+ info->ctrl_regs.cr3 = (addr_t)V3_PAddr(create_passthrough_pts_PAE32(info));
+ } else if ((old_cr4->pae == 1) && (new_cr4->pae == 0)) {
+ // Create passthrough standard 32bit pagetables
+ return -1;
+ }
+ }
+
+ *old_cr4 = *new_cr4;
+ PrintDebug("New CR4=%x\n", *(uint_t *)old_cr4);
+
+ } else {
+ return -1;
+ }
+
+ info->rip += dec_instr.instr_length;
+ return 0;
+}
+
+
+int v3_handle_efer_read(uint_t msr, struct v3_msr * dst, void * priv_data) {
+ PrintError("EFER Read not handled\n");
+ return -1;
+}
+
+
+int v3_handle_efer_write(uint_t msr, struct v3_msr src, void * priv_data) {
+ // struct guest_info * info = (struct guest_info *)(priv_data);
+ PrintError("EFER Write not handled (rax=%p, rdx=%p)\n",
+ (void *)(addr_t)(src.lo),
+ (void *)(addr_t)(src.hi));
+ return -1;
+}
