mirror of
https://github.com/corda/corda.git
synced 2025-01-05 20:54:13 +00:00
include return address size in frameSize passed to vmInvoke; fix printf warnings
This commit is contained in:
parent
2478d4fc7f
commit
14613193fa
@ -288,7 +288,7 @@ bitsToFloat(uint32_t bits)
|
||||
return f;
|
||||
}
|
||||
|
||||
inline intptr_t
|
||||
inline int
|
||||
difference(void* a, void* b)
|
||||
{
|
||||
return reinterpret_cast<intptr_t>(a) - reinterpret_cast<intptr_t>(b);
|
||||
|
@ -5412,7 +5412,8 @@ jumpAndInvoke(MyThread* t, object method, void* base, void* stack, ...)
|
||||
stack,
|
||||
argumentCount * BytesPerWord,
|
||||
arguments,
|
||||
t->arch->alignFrameSize(t->arch->argumentFootprint(argumentCount))
|
||||
(t->arch->alignFrameSize(t->arch->argumentFootprint(argumentCount))
|
||||
+ t->arch->frameReturnAddressSize())
|
||||
* BytesPerWord);
|
||||
}
|
||||
|
||||
@ -5922,11 +5923,11 @@ class MyProcessor: public Processor {
|
||||
t->init();
|
||||
|
||||
if (false) {
|
||||
fprintf(stderr, "%"LD"\n", difference(&(t->continuation), t));
|
||||
fprintf(stderr, "%"LD"\n", difference(&(t->exception), t));
|
||||
fprintf(stderr, "%"LD"\n", difference(&(t->exceptionStackAdjustment), t));
|
||||
fprintf(stderr, "%"LD"\n", difference(&(t->exceptionOffset), t));
|
||||
fprintf(stderr, "%"LD"\n", difference(&(t->exceptionHandler), t));
|
||||
fprintf(stderr, "%d\n", difference(&(t->continuation), t));
|
||||
fprintf(stderr, "%d\n", difference(&(t->exception), t));
|
||||
fprintf(stderr, "%d\n", difference(&(t->exceptionStackAdjustment), t));
|
||||
fprintf(stderr, "%d\n", difference(&(t->exceptionOffset), t));
|
||||
fprintf(stderr, "%d\n", difference(&(t->exceptionHandler), t));
|
||||
exit(0);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user