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

x64 and win32 build fixes

This commit is contained in:
Flyinghead 2019-04-15 18:31:15 +02:00
parent dece3fc13e
commit 5d6e96463c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/hw/sh4/modules/wince.h
View File

@ -39,7 +39,7 @@ static bool read_mem8(u32 addr, u8& data)
return true;
}
static inline u32 GetCurrentThreadId()
static inline u32 getCurrentThreadId()
{
u32 addr = PUserKData + SYSHANDLE_OFFSET + SH_CURTHREAD * 4;
u32 tid;
@ -49,7 +49,7 @@ static inline u32 GetCurrentThreadId()
return 0;
}
static inline u32 GetCurrentProcessId()
static inline u32 getCurrentProcessId()
{
u32 addr = PUserKData + SYSHANDLE_OFFSET + SH_CURPROC * 4;
u32 pid;
@ -294,7 +294,7 @@ static bool print_wince_syscall(u32 address)
sprintf(method_buf, "[%d]", meth_id);
method = method_buf;
}
printf("WinCE %08x %04x.%04x %s: %s", address, GetCurrentProcessId() & 0xffff, GetCurrentThreadId() & 0xffff, api, method);
printf("WinCE %08x %04x.%04x %s: %s", address, getCurrentProcessId() & 0xffff, getCurrentThreadId() & 0xffff, api, method);
if (address == 0xfffffd51) // SetLastError
printf(" dwErrCode = %x\n", r[4]);
else if (address == 0xffffd5ef) // CreateFile

4
core/rec-x64/rec_x64.cpp
View File

@ -125,9 +125,9 @@ WIN32_ONLY( ".seh_pushreg %r14 \n\t")
"movl $" _S(SH4_TIMESLICE) "," _U "cycle_counter(%rip) \n"
#ifdef _WIN32
"movq $" _U "jmp_env, %rcx \n\t" // SETJMP
"lea " _U "jmp_env(%rip), %rcx \n\t" // SETJMP
#else
"movq $" _U "jmp_env, %rdi \n\t"
"lea " _U "jmp_env(%rip), %rdi \n\t"
#endif
"call " _U "setjmp \n\t"
// "testl %rax, %rax \n\t"