Permalink
Browse files

Bug 607555 - TM: fix interleaving of bytecode and LIR with TMFLAGS=re…

…corder. r=edwsmith.
  • Loading branch information...
1 parent 57206c7 commit e4be181fff27bef99f3118efd2b77f846c8113ab @nnethercote nnethercote committed Oct 27, 2010
Showing with 5 additions and 10 deletions.
  1. +5 −10 nanojit/LIR.h
View
@@ -1826,14 +1826,9 @@ namespace nanojit
{
if (!code.isEmpty()) {
InsBuf b;
- int32_t count = 0;
- for (Seq<LIns*>* p = code.get(); p != NULL; p = p->tail) {
+ for (Seq<LIns*>* p = code.get(); p != NULL; p = p->tail)
logc->printf("%s %s\n", prefix, printer->formatIns(&b, p->head));
- count++;
- }
code.clear();
- if (count > 1)
- logc->printf("\n");
}
}
@@ -1842,15 +1837,15 @@ namespace nanojit
}
LIns* insGuardXov(LOpcode op, LIns* a, LIns* b, GuardRecord *gr) {
- return add_flush(out->insGuardXov(op,a,b,gr));
+ return add(out->insGuardXov(op,a,b,gr));
}
LIns* insBranch(LOpcode v, LIns* condition, LIns* to) {
return add_flush(out->insBranch(v, condition, to));
}
LIns* insBranchJov(LOpcode v, LIns* a, LIns* b, LIns* to) {
- return add_flush(out->insBranchJov(v, a, b, to));
+ return add(out->insBranchJov(v, a, b, to));
}
LIns* insJtbl(LIns* index, uint32_t size) {
@@ -1883,7 +1878,7 @@ namespace nanojit
return add(out->insLoad(v, base, disp, accSet, loadQual));
}
LIns* insStore(LOpcode op, LIns* v, LIns* b, int32_t d, AccSet accSet) {
- return add(out->insStore(op, v, b, d, accSet));
+ return add_flush(out->insStore(op, v, b, d, accSet));
}
LIns* insAlloc(int32_t size) {
return add(out->insAlloc(size));
@@ -1901,7 +1896,7 @@ namespace nanojit
}
LIns* insComment(const char* str) {
- return add(out->insComment(str));
+ return add_flush(out->insComment(str));
}
};

0 comments on commit e4be181

Please sign in to comment.