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

TLS again

This commit is contained in:
Aaron Robinson 2003-04-06 00:25:30 +00:00
parent 66e0d7d6d1
commit a0538fa45e
10 changed files with 98 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Include/Core/Xbe.h
View File

@ -254,6 +254,11 @@ class Xbe : public Error
// ******************************************************************
uint08 *GetTLSData() { if(m_TLS == 0) return 0; else return GetAddr(m_TLS->dwDataStartAddr); }
// ******************************************************************
// * GetTLSIndex
// ******************************************************************
uint32 *GetTLSIndex() { if(m_TLS == 0) return 0; else return (uint32*)GetAddr(m_TLS->dwTLSIndexAddr); }
private:
// ******************************************************************
// * Constructor Initialization

7
Include/Win32/CxbxKrnl/Emu.h
View File

@ -47,7 +47,7 @@ extern "C" CXBXKRNL_API void NTAPI EmuNoFunc();
// ******************************************************************
// * func: EmuInit
// ******************************************************************
extern "C" CXBXKRNL_API void NTAPI EmuInit(Xbe::LibraryVersion *LibraryVersion, DebugMode DbgMode, char *szDebugFilename, Xbe::Header *XbeHeader, uint32 XbeHeaderSize, void (*Entry)());
extern "C" CXBXKRNL_API void NTAPI EmuInit(uint32 TlsAdjust, Xbe::LibraryVersion *LibraryVersion, DebugMode DbgMode, char *szDebugFilename, Xbe::Header *XbeHeader, uint32 XbeHeaderSize, void (*Entry)());
// ******************************************************************
// * func: EmuPanic
@ -59,4 +59,9 @@ extern "C" CXBXKRNL_API void NTAPI EmuPanic();
// ******************************************************************
extern "C" CXBXKRNL_API uint32 KernelThunkTable[367];
// ******************************************************************
// * data: g_TlsAdjust
// ******************************************************************
extern uint32 g_TlsAdjust;
#endif

2
Include/Win32/CxbxKrnl/EmuFS.h
View File

@ -56,7 +56,7 @@ static inline void EmuSwapFS()
// ******************************************************************
// * func: EmuGenerateFS
// ******************************************************************
void EmuGenerateFS();
void EmuGenerateFS(int TlsAdjust);
// ******************************************************************
// * func: EmuInitFS

28
Source/Win32/Cxbx/EmuExe.cpp
View File

@ -549,6 +549,33 @@ EmuExe::EmuExe(Xbe *x_Xbe, DebugMode x_debug_mode, char *x_debug_filename) : Exe
// ******************************************************************
memcpy(m_bzSection[i] + 0x100 + x_Xbe->m_Header.dwSizeofHeaders + 260, x_Xbe->m_LibraryVersion, sizeof(Xbe::LibraryVersion) * x_Xbe->m_Header.dwLibraryVersions);
// ******************************************************************
// * calculate TLS adjustment
// ******************************************************************
uint32 TlsAdjust = 0;
if(x_Xbe->m_TLS == 0 || OrigTLSAddr == 0)
TlsAdjust = -1;
else
{
// ******************************************************************
// * necessary tls adjustment values
// ******************************************************************
uint32 TlsZF = OrigTLS.dwSizeofZeroFill;
uint32 TlsEA = OrigTLS.dwDataEndAddr;
uint32 TlsSA = OrigTLS.dwDataStartAddr;
// ******************************************************************
// * calculate tls adjustment
// ******************************************************************
TlsAdjust = TlsZF + (TlsEA - TlsSA) + 0x0F;
TlsAdjust &= 0xFFFFFFF0;
TlsAdjust += 4;
TlsAdjust /= 5;
TlsAdjust += 2;
TlsAdjust *= 4;
}
// ******************************************************************
// * patch prolog function parameters
// ******************************************************************
@ -559,6 +586,7 @@ EmuExe::EmuExe(Xbe *x_Xbe, DebugMode x_debug_mode, char *x_debug_filename) : Exe
*(uint32 *)((uint32)m_bzSection[i] + 21) = m_SectionHeader[i].m_virtual_addr + m_OptionalHeader.m_image_base + 0x100 + x_Xbe->m_Header.dwSizeofHeaders;
*(uint32 *)((uint32)m_bzSection[i] + 26) = x_debug_mode;
*(uint32 *)((uint32)m_bzSection[i] + 31) = m_SectionHeader[i].m_virtual_addr + m_OptionalHeader.m_image_base + 0x100 + x_Xbe->m_Header.dwSizeofHeaders + 260;
*(uint32 *)((uint32)m_bzSection[i] + 36) = TlsAdjust;
printf("OK\n");
}

1
Source/Win32/Cxbx/Prolog.cpp
View File

@ -61,6 +61,7 @@ __declspec(allocate(".cxbxplg")) uint08 Prolog[] =
0x68, 0xC3, 0xC3, 0xC3, 0xC3, // push 0xC3C3C3C3
0x68, 0xC3, 0xC3, 0xC3, 0xC3, // push 0xC3C3C3C3
0x68, 0xC3, 0xC3, 0xC3, 0xC3, // push 0xC3C3C3C3
0x68, 0xC3, 0xC3, 0xC3, 0xC3, // push 0xC3C3C3C3
0xFF, 0xD6, // call esi
0xC3 // ret
};

13
Source/Win32/CxbxKrnl/Emu.cpp
View File

@ -53,6 +53,8 @@ namespace xboxkrnl
// ******************************************************************
static void EmuInstallWrappers(OOVPATable *OovpaTable, uint32 OovpaTableSize, void (*Entry)(), Xbe::Header *XbeHeader);
uint32 g_TlsAdjust = 0;
// ******************************************************************
// * func: DllMain
// ******************************************************************
@ -82,8 +84,10 @@ extern "C" CXBXKRNL_API void NTAPI EmuNoFunc()
// ******************************************************************
// * func: EmuInit
// ******************************************************************
extern "C" CXBXKRNL_API void NTAPI EmuInit(Xbe::LibraryVersion *LibraryVersion, DebugMode DbgMode, char *szDebugFilename, Xbe::Header *XbeHeader, uint32 XbeHeaderSize, void (*Entry)())
extern "C" CXBXKRNL_API void NTAPI EmuInit(uint32 TlsAdjust, Xbe::LibraryVersion *LibraryVersion, DebugMode DbgMode, char *szDebugFilename, Xbe::Header *XbeHeader, uint32 XbeHeaderSize, void (*Entry)())
{
g_TlsAdjust = TlsAdjust;
// ******************************************************************
// * debug console allocation (if configured)
// ******************************************************************
@ -118,6 +122,7 @@ extern "C" CXBXKRNL_API void NTAPI EmuInit(Xbe::LibraryVersion *LibraryVersion,
printf("Emu: EmuInit\n"
"(\n"
" TlsAdjust : 0x%.08X\n"
" LibraryVersion : 0x%.08X\n"
" DebugConsole : 0x%.08X\n"
" DebugFilename : \"%s\"\n"
@ -125,7 +130,7 @@ extern "C" CXBXKRNL_API void NTAPI EmuInit(Xbe::LibraryVersion *LibraryVersion,
" XBEHeaderSize : 0x%.08X\n"
" Entry : 0x%.08X\n"
");\n",
LibraryVersion, DbgMode, szDebugFilename, XbeHeader, XbeHeaderSize, Entry);
TlsAdjust, LibraryVersion, DbgMode, szDebugFilename, XbeHeader, XbeHeaderSize, Entry);
#else
printf("CxbxKrnl (0x%.08X): _DEBUG_TRACE disabled.\n", GetCurrentThreadId());
@ -204,15 +209,13 @@ extern "C" CXBXKRNL_API void NTAPI EmuInit(Xbe::LibraryVersion *LibraryVersion,
{
EmuInitFS();
EmuGenerateFS();
EmuGenerateFS(TlsAdjust);
EmuInitD3D(XbeHeader, XbeHeaderSize);
}
printf("Emu (0x%.08X): Initial thread starting.\n", GetCurrentThreadId());
// This must be enabled or the debugger may crash (sigh)
// __asm _emit 0xF1
EmuSwapFS(); // XBox FS
Entry();

41
Source/Win32/CxbxKrnl/EmuFS.cpp
View File

@ -59,7 +59,7 @@ void EmuInitFS()
// ******************************************************************
// * func: EmuGenerateFS
// ******************************************************************
void EmuGenerateFS()
void EmuGenerateFS(int TlsAdjust)
{
NT_TIB *OrgNtTib;
xboxkrnl::KPCR *NewPcr;
@ -122,11 +122,46 @@ void EmuGenerateFS()
}
// HACK: This converts from XBE stack form to Windows form (I guess?!)
TLSPtr = (void*)((uint32)TLSPtr+20 + (2*8));
TLSPtr = (void*)((uint32)TLSPtr + TlsAdjust);
// TlsAdjust == -1 implies that there is no TLS
if(TlsAdjust == -1)
{
TLSPtr = new uint32;
*(uint32*)TLSPtr = 0;
}
NewPcr->PrcbData.CurrentThread->TlsData = TLSPtr;
}
/*
Data Start Address : 0x00000000
Data End Address : 0x00000000
TLS Index Address : 0x00030DC4
TLS Callback Address : 0x00000000
Size of Zero Fill : 0x0000000C -> 12
Characteristics : 0x00000000 -> 16
Data Start Address : 0x00010494 |
Data End Address : 0x000104A0 |-> 12
TLS Index Address : 0x00030D5C
TLS Callback Address : 0x00000000
Size of Zero Fill : 0x00000008 -> 8
Characteristics : 0x00000000 -> 26
Data Start Address : 0x00010494 |
Data End Address : 0x000104A4 |-> 16
TLS Index Address : 0x00030D5C
TLS Callback Address : 0x00000000
Size of Zero Fill : 0x00000008 -> 8
Characteristics : 0x00000000 -> 36
Data Start Address : 0x00010494 |
Data End Address : 0x000104A8 |-> 20
TLS Index Address : 0x00030D5C
TLS Callback Address : 0x00000000
Size of Zero Fill : 0x00000008 -> 8
Characteristics : 0x00000000 -> 52
*/
// ******************************************************************
// * Swap into the "NewFS"
// ******************************************************************
@ -144,13 +179,11 @@ void EmuGenerateFS()
// ******************************************************************
// * Save "TLSPtr" inside NewFS.StackBase
// ******************************************************************
{
__asm
{
mov eax, TLSPtr
mov fs:[0x04], eax
}
}
// ******************************************************************
// * Swap back into the "OrgFS"

2
Source/Win32/CxbxKrnl/EmuKrnl.cpp
View File

@ -96,7 +96,7 @@ DWORD WINAPI PCSTProxy
delete iPCSTProxyParam;
EmuGenerateFS();
EmuGenerateFS(g_TlsAdjust);
// ******************************************************************
// * debug trace

5
Source/Win32/CxbxKrnl/EmuXapi.cpp
View File

@ -45,6 +45,7 @@ namespace xapi
#include "EmuXapi.h"
};
#include "Emu.h"
#include "EmuFS.h"
#include "EmuD3D8.h"
#include "EmuDInput.h"
@ -74,7 +75,7 @@ static DWORD WINAPI EmuCreateThreadProxy
delete iEmuCreateThreadProxyParam;
EmuGenerateFS();
EmuGenerateFS(g_TlsAdjust);
// ******************************************************************
// * debug trace
@ -337,8 +338,6 @@ HANDLE WINAPI xapi::EmuCreateThread
lpThreadId
);
printf("Returned : %d\n", RetHandle);
EmuSwapFS(); // XBox FS
return RetHandle;

11
Source/Win32/CxbxKrnl/Xapi.1.0.4627.inl
View File

@ -98,7 +98,7 @@ OOVPATable XAPI_1_0_4627[] =
"EmuCreateThread"
#endif
},
*/
//*/
/* Too High Level
// CloseHandle (* unchanged since 1.0.4361 *)
{
@ -110,7 +110,7 @@ OOVPATable XAPI_1_0_4627[] =
"EmuCloseHandle"
#endif
},
*/
//*/
/* Too High Level
// XapiInitProcess (* unchanged since 1.0.4361 *)
{
@ -122,7 +122,7 @@ OOVPATable XAPI_1_0_4627[] =
"EmuXapiInitProcess"
#endif
},
*/
//*/
// XapiBootToDash (* unchanged since 1.0.3911 *)
{
(OOVPA*)&XapiBootDash_1_0_3911,
@ -143,7 +143,8 @@ OOVPATable XAPI_1_0_4627[] =
#ifdef _DEBUG_TRACE
"Emu__rtinit",
#endif
},*/
},
//*/
/* Too High Level
// __cinit (* unchanged since 1.0.3911 *)
{
@ -155,7 +156,7 @@ OOVPATable XAPI_1_0_4627[] =
"Emu__cinit",
#endif
},
*/
//*/
};
// ******************************************************************