swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-10-20 10:02:55 -04:00
Code Issues Projects Releases Wiki Activity

this is a more "clean" conversion to 64 bit than the type-fixups branch, which does borrow some elements from it but has far less find and replace...it is about 98-99% done, notes to follow later

Browse Source
This commit is contained in:
DarthArgus
2017-01-24 03:35:59 +00:00
parent 42b949c3dc
commit 36686348e9
458 changed files with 2282 additions and 2367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverScript/src/shared/JavaLibrary.cpp
+5 -5
View File
@@ -790,7 +790,7 @@ void JavaLibrary::fatalHandler(int signum)
char lib1[BUFLEN], lib2[BUFLEN];
char file1[BUFLEN], file2[BUFLEN];
int line1, line2;
bool result1 = DebugHelp::lookupAddress(reinterpret_cast<uint32>(crashAddress1), lib1, file1, BUFLEN, line1);
bool result1 = DebugHelp::lookupAddress(reinterpret_cast<uintptr_t>(crashAddress1), lib1, file1, BUFLEN, line1);
// do a second test based on the return address
// it turns out that in some java crashes we don't even have 2 return
@@ -801,25 +801,25 @@ void JavaLibrary::fatalHandler(int signum)
void *crashAddress2c = nullptr;
void *frameAddressA = nullptr;
void *frameAddressB = nullptr;
uint32 frameAddressHigh = (reinterpret_cast<uint32>(frameAddress) >> 16);
uint32 frameAddressHigh = (reinterpret_cast<uintptr_t>(frameAddress) >> 16);
crashAddress2a = __builtin_return_address(0);
if (crashAddress2a != nullptr)
{
frameAddressA = __builtin_frame_address(1);
if (frameAddressA != nullptr &&
(reinterpret_cast<uint32>(frameAddressA) >> 16 == frameAddressHigh))
(reinterpret_cast<uintptr_t>(frameAddressA) >> 16 == frameAddressHigh))
{
crashAddress2b = __builtin_return_address(1);
if (crashAddress2b != nullptr)
{
frameAddressB = __builtin_frame_address(2);
if (frameAddressB != nullptr &&
(reinterpret_cast<uint32>(frameAddressB) >> 16 == frameAddressHigh))
(reinterpret_cast<uintptr_t>(frameAddressB) >> 16 == frameAddressHigh))
{
crashAddress2c = __builtin_return_address(2);
if (crashAddress2c != nullptr)
{
result2 = DebugHelp::lookupAddress(reinterpret_cast<uint32>(
result2 = DebugHelp::lookupAddress(reinterpret_cast<uintptr_t>(
crashAddress2c), lib2, file2, BUFLEN, line2);
}
}