ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-01 16:58:27 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

check bootThunkTable as well as thunkTable in MyProcessor::getStackTrace

Browse Source 
We need to check to see if we caught the thread somewhere in the thunk
code (i.e. about to call a helper function), in which case the stack
and base pointers are valid and may be used to create an accurate
trace.
This commit is contained in:
Joel Dice 2009-12-01 18:17:33 -07:00
parent 168e206812
commit 80d3a286d1
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/compile.cpp
View File

@ -6973,6 +6973,8 @@ class MyProcessor: public Processor {
nativeThunk(0), nativeThunk(0),
bootNativeThunk(0), bootNativeThunk(0),
aioobThunk(0), aioobThunk(0),
thunkTable(0),
bootThunkTable(0),
callTable(0), callTable(0),
methodTree(0), methodTree(0),
methodTreeSentinal(0), methodTreeSentinal(0),
@ -6985,6 +6987,7 @@ class MyProcessor: public Processor {
bootImage(0), bootImage(0),
codeAllocator(s, 0, 0), codeAllocator(s, 0, 0),
thunkSize(0), thunkSize(0),
bootThunkSize(0),
callTableSize(0), callTableSize(0),
useNativeFeatures(useNativeFeatures) useNativeFeatures(useNativeFeatures)
{ } { }
@ -7298,8 +7301,14 @@ class MyProcessor: public Processor {
uint8_t* thunkStart = p->thunkTable; uint8_t* thunkStart = p->thunkTable;
uint8_t* thunkEnd = thunkStart + (p->thunkSize * ThunkCount); uint8_t* thunkEnd = thunkStart + (p->thunkSize * ThunkCount);
if (static_cast<uint8_t*>(ip) >= thunkStart uint8_t* bootThunkStart = p->bootThunkTable;
uint8_t* bootThunkEnd = bootThunkStart
+ (p->bootThunkSize * ThunkCount);
if ((static_cast<uint8_t*>(ip) >= thunkStart
and static_cast<uint8_t*>(ip) < thunkEnd) and static_cast<uint8_t*>(ip) < thunkEnd)
or (static_cast<uint8_t*>(ip) >= bootThunkStart
and static_cast<uint8_t*>(ip) < bootThunkEnd))
{ {
target->ip = t->arch->frameIp(stack); target->ip = t->arch->frameIp(stack);
target->base = base; target->base = base;
@ -7462,6 +7471,7 @@ class MyProcessor: public Processor {
uint8_t* bootNativeThunk; uint8_t* bootNativeThunk;
uint8_t* aioobThunk; uint8_t* aioobThunk;
uint8_t* thunkTable; uint8_t* thunkTable;
uint8_t* bootThunkTable;
object callTable; object callTable;
object methodTree; object methodTree;
object methodTreeSentinal; object methodTreeSentinal;
@ -7475,6 +7485,7 @@ class MyProcessor: public Processor {
SegFaultHandler segFaultHandler; SegFaultHandler segFaultHandler;
FixedAllocator codeAllocator; FixedAllocator codeAllocator;
unsigned thunkSize; unsigned thunkSize;
unsigned bootThunkSize;
unsigned callTableSize; unsigned callTableSize;
bool useNativeFeatures; bool useNativeFeatures;
}; };
@ -7748,6 +7759,8 @@ fixupThunks(MyThread* t, BootImage* image, uint8_t* code)
p->bootDefaultThunk = code + image->defaultThunk; p->bootDefaultThunk = code + image->defaultThunk;
p->bootNativeThunk = code + image->nativeThunk; p->bootNativeThunk = code + image->nativeThunk;
p->bootThunkTable = code + image->thunkTable;
p->bootThunkSize = image->thunkSize;
updateCall(t, LongCall, code + image->compileMethodCall, updateCall(t, LongCall, code + image->compileMethodCall,
voidPointer(local::compileMethod)); voidPointer(local::compileMethod));