ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-07 13:38:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

use MyBlock::start when computing constant pool offsets, not MyBlock::offset

Browse Source
This commit is contained in:
Joel Dice 2010-12-07 18:17:41 -07:00
parent 314bdae80d
commit 544cebb7f0
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/arm.cpp
View File

@ -701,12 +701,16 @@ resolve(MyBlock* b)
if (b->next == 0 or b->next->poolEventHead) {
append = true;
} else {
int32_t v = (b->offset + b->size + b->next->size + BytesPerWord - 8)
- (c->poolOffsetHead->offset + c->poolOffsetHead->block->offset);
int32_t v = (b->start + b->size + b->next->size + BytesPerWord - 8)
- (c->poolOffsetHead->offset + c->poolOffsetHead->block->start);
append = (v != (v & PoolOffsetMask));
if (DebugPool) {
fprintf(stderr,
"current %p %d %d next %p %d %d\n",
b, b->start, b->size, b->next, b->start + b->size,
b->next->size);
fprintf(stderr,
"offset %p %d is of distance %d to next block; append? %d\n",
c->poolOffsetHead, c->poolOffsetHead->offset, v, append);
@ -714,6 +718,13 @@ resolve(MyBlock* b)
}
if (append) {
#ifndef NDEBUG
int32_t v = (b->start + b->size - 8)
- (c->poolOffsetHead->offset + c->poolOffsetHead->block->start);
expect(c, v == (v & PoolOffsetMask));
#endif // not NDEBUG
appendPoolEvent(c, b, b->size, c->poolOffsetHead, c->poolOffsetTail);
if (DebugPool) {