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

fix block delimiting code in compile.cpp to avoid cycles and nested blocks

Browse Source
This commit is contained in:
Joel Dice 2009-02-15 11:11:00 -07:00
parent 7803663fc9
commit cea5a9315d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/compiler.cpp
View File

@ -4318,16 +4318,21 @@ compile(Context* c)
LogicalInstruction* nextInstruction = next(c, e->logicalInstruction); LogicalInstruction* nextInstruction = next(c, e->logicalInstruction);
if (e->next == 0 if (e->next == 0
or (e->next->logicalInstruction != e->logicalInstruction or (e->next->logicalInstruction != e->logicalInstruction
and e->next->logicalInstruction != nextInstruction)) and (e->next->logicalInstruction != nextInstruction
or e != e->logicalInstruction->lastEvent)))
{ {
Block* b = e->logicalInstruction->firstEvent->block; Block* b = e->logicalInstruction->firstEvent->block;
while (b->nextBlock) {
b = b->nextBlock;
}
if (b != block) { if (b != block) {
while (b->nextBlock) b = b->nextBlock;
b->nextBlock = block; b->nextBlock = block;
} }
block->nextInstruction = nextInstruction; block->nextInstruction = nextInstruction;
block->assemblerBlock = a->endBlock(e->next != 0); block->assemblerBlock = a->endBlock(e->next != 0);
// fprintf(stderr, "end block %p at %d\n", block->assemblerBlock, e->logicalInstruction->index);
if (e->next) { if (e->next) {
block = ::block(c, e->next); block = ::block(c, e->next);
@ -4340,9 +4345,10 @@ compile(Context* c)
Block* next = block->nextBlock Block* next = block->nextBlock
? block->nextBlock ? block->nextBlock
: block->nextInstruction->firstEvent->block; : block->nextInstruction->firstEvent->block;
next->start = block->assemblerBlock->resolve next->start = block->assemblerBlock->resolve
(block->start, next->assemblerBlock); (block->start, next->assemblerBlock);
// fprintf(stderr, "resolve block %p\n", block->assemblerBlock);
block = next; block = next;
} }