ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1399 from RadWolfie/misc-update 

Misc update
This commit is contained in:
RadWolfie 2018-08-19 15:27:03 -05:00 committed by GitHub
parent d2b8b30199 527f92e1d2
commit d22dd8c446
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/CxbxKrnl/CxbxKrnl.cpp
View File

@ -686,13 +686,13 @@ static unsigned int WINAPI CxbxKrnlInterruptThread(PVOID param)
std::vector<xbaddr> g_RdtscPatches;
#define OPCODE_PATCH_RDTSC 0x90EF // OUT DX, EAX; NOP
bool IsRdtscInstruction(xbaddr addr)
{
// First the fastest check - is this a patch? (see PatchRdtsc)
uint8_t* opAddr = (uint8_t*)addr;
// Note : Check second opcode first, as that's most likely to fail fast
return (opAddr[1] == 0x90) // NOP
&& (opAddr[0] == 0xEF) // OUT DX, EAX
// First the fastest check - does addr contain exact patch from PatchRdtsc?
// Second check - is addr on the rdtsc patch list?
return (*(uint16_t*)addr == OPCODE_PATCH_RDTSC)
// Note : It's not needed to check for g_SkipRdtscPatching,
// as when that's set, the g_RdtscPatches vector will be empty
// anyway, failing this lookup :
@ -701,15 +701,13 @@ bool IsRdtscInstruction(xbaddr addr)
void PatchRdtsc(xbaddr addr)
{
uint8_t* opAddr = (uint8_t*)addr;
// Patch away rdtsc with an opcode we can intercept
// We use a privilaged instruction rather than int 3 for debugging
// When using int 3, attached debuggers trap and rdtsc is used often enough
// that it makes Cxbx-Reloaded unusable
// A privilaged instruction (like OUT) does not suffer from this
printf("INIT: Patching rdtsc opcode at 0x%.8X\n", (DWORD)addr);
opAddr[0] = 0xEF; // OUT DX, EAX
opAddr[1] = 0x90; // NOP
*(uint16_t*)addr = OPCODE_PATCH_RDTSC;
g_RdtscPatches.push_back(addr);
}

14
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -1615,6 +1615,12 @@ static LRESULT WINAPI EmuMsgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar
{
PostMessage(hWnd, WM_CLOSE, 0, 0);
}
// NOTE: Windows does not send F10 key message to WM_KEYDOWN.
// Source: https://docs.microsoft.com/en-us/windows/desktop/inputdev/wm-syskeydown
else if(wParam == VK_F10)
{
ToggleFauxFullscreen(hWnd);
}
}
break;
@ -1646,10 +1652,6 @@ static LRESULT WINAPI EmuMsgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar
std::cout << _logThreadPrefix << g_EnumModules2String[to_underlying(CXBXR_MODULE::CXBXR)] << "Enable log is " << g_bPrintfOn << std::endl;
ipc_send_gui_update(IPC_UPDATE_GUI::LOG_ENABLED, static_cast<UINT>(g_bPrintfOn));
}
else if(wParam == VK_F10)
{
ToggleFauxFullscreen(hWnd);
}
else if(wParam == VK_F11)
{
if(g_iWireframe++ == 2)
@ -1707,7 +1709,7 @@ static LRESULT WINAPI EmuMsgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar
if(g_XBVideo.bFullScreen || g_bIsFauxFullscreen)
{
SetCursor(NULL);
return D3D_OK; // = 0
return S_OK; // = Is not part of D3D8 handling.
}
return DefWindowProc(hWnd, msg, wParam, lParam);
@ -1718,7 +1720,7 @@ static LRESULT WINAPI EmuMsgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar
return DefWindowProc(hWnd, msg, wParam, lParam);
}
return D3D_OK; // = 0
return S_OK; // = Is not part of D3D8 handling.
}
std::chrono::time_point<std::chrono::steady_clock, std::chrono::duration<double, std::nano>> GetNextVBlankTime()