Emulation/StrikeBox
1
0
Fork 0
mirror of https://github.com/StrikerX3/StrikeBox.git synced 2024-06-23 14:53:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve WHPX initialization

Browse source
This commit is contained in:
StrikerX3 2018-12-29 21:58:35 -02:00
parent 42139f684b
commit a0a4b8c909
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/cpu-module-whvp/cpu_whvp.cpp
View file

@ -58,11 +58,6 @@ CPUInitStatus WhvpCpu::InitializeImpl() {
m_vcpu->SetIoPortCallback(IoPortCallback);
m_vcpu->SetMemoryCallback(MemoryCallback);
// Windows Hypervisor Platform VCPUs are initialized to EIP = 0xFFFF0
// which comes from the 16-bit initialization address FFFF:FFF0,
// but we expect it to be 0xFFFFFFF0 instead, so let's set this here
RegWrite(REG_EIP, 0xFFFFFFF0);
}
return CPUS_INIT_OK;
@ -215,10 +210,15 @@ CPUOperationStatus WhvpCpu::RegWrite(enum CpuReg reg, uint32_t value) {
}
switch (reg) {
case REG_EIP: case REG_EFLAGS: case REG_EAX: case REG_ECX: case REG_EDX: case REG_EBX:
case REG_ESI: case REG_EDI: case REG_ESP: case REG_EBP: case REG_CR0: case REG_CR2: case REG_CR3: case REG_CR4:
case REG_EAX: case REG_ECX: case REG_EDX: case REG_EBX:
case REG_ESI: case REG_EDI: case REG_ESP: case REG_EBP:
case REG_CR0: case REG_CR2: case REG_CR3: case REG_CR4:
case REG_EIP:
vals[0].Reg32 = value;
break;
case REG_EFLAGS:
vals[0].Reg32 = (value | 0x2) & ~0x8028;
break;
case REG_CS: case REG_SS: case REG_DS: case REG_ES: case REG_FS: case REG_GS: case REG_TR:
{
vals[0].Segment.Selector = value;
@ -339,10 +339,15 @@ CPUOperationStatus WhvpCpu::RegWrite(CpuReg regs[], uint32_t values[], uint8_t n
}
switch (regs[i]) {
case REG_EIP: case REG_EFLAGS: case REG_EAX: case REG_ECX: case REG_EDX: case REG_EBX:
case REG_ESI: case REG_EDI: case REG_ESP: case REG_EBP: case REG_CR0: case REG_CR2: case REG_CR3: case REG_CR4:
case REG_EAX: case REG_ECX: case REG_EDX: case REG_EBX:
case REG_ESI: case REG_EDI: case REG_ESP: case REG_EBP:
case REG_CR0: case REG_CR2: case REG_CR3: case REG_CR4:
case REG_EIP:
whvpVals[i].Reg32 = values[i];
break;
case REG_EFLAGS:
whvpVals[i].Reg32 = (values[i] | 0x2) & ~0x8028;
break;
case REG_CS: case REG_SS: case REG_DS: case REG_ES: case REG_FS: case REG_GS: case REG_TR:
{
whvpVals[i].Segment.Selector = values[i];