topchetoeu/tal-runtime
1
0
Fork 0
Code Pull Requests Activity

Fix table allocation bump optimization.

Browse Source
This commit is contained in:
Mike Pall 2015-05-21 16:38:31 +02:00
parent 4a146cac9a
commit 60fb3fe2b2
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lj_jit.h
View File

@ -293,6 +293,7 @@ typedef struct ScEvEntry {
/* Reverse bytecode map (IRRef -> PC). Only for selected instructions. */ /* Reverse bytecode map (IRRef -> PC). Only for selected instructions. */
typedef struct RBCHashEntry { typedef struct RBCHashEntry {
MRef pc; /* Bytecode PC. */ MRef pc; /* Bytecode PC. */
GCRef pt; /* Prototype. */
IRRef ref; /* IR reference. */ IRRef ref; /* IR reference. */
} RBCHashEntry; } RBCHashEntry;

4
src/lj_record.c
View File

@ -1157,7 +1157,7 @@ static void rec_idx_bump(jit_State *J, RecordIndex *ix)
J->retryrec = 1; /* Abort the trace at the end of recording. */ J->retryrec = 1; /* Abort the trace at the end of recording. */
} }
} else if (ir->o == IR_TDUP) { } else if (ir->o == IR_TDUP) {
GCtab *tpl = gco2tab(proto_kgc(J->pt, ~(ptrdiff_t)bc_d(*pc))); GCtab *tpl = gco2tab(proto_kgc(&gcref(rbc->pt)->pt, ~(ptrdiff_t)bc_d(*pc)));
/* Grow template table, but preserve keys with nil values. */ /* Grow template table, but preserve keys with nil values. */
if (tb->asize > tpl->asize || (1u << nhbits)-1 > tpl->hmask) { if (tb->asize > tpl->asize || (1u << nhbits)-1 > tpl->hmask) {
Node *node = noderef(tpl->node); Node *node = noderef(tpl->node);
@ -1783,6 +1783,7 @@ static TRef rec_tnew(jit_State *J, uint32_t ah)
tr = emitir(IRTG(IR_TNEW, IRT_TAB), asize, hbits); tr = emitir(IRTG(IR_TNEW, IRT_TAB), asize, hbits);
J->rbchash[(tr & (RBCHASH_SLOTS-1))].ref = tref_ref(tr); J->rbchash[(tr & (RBCHASH_SLOTS-1))].ref = tref_ref(tr);
setmref(J->rbchash[(tr & (RBCHASH_SLOTS-1))].pc, J->pc); setmref(J->rbchash[(tr & (RBCHASH_SLOTS-1))].pc, J->pc);
setgcref(J->rbchash[(tr & (RBCHASH_SLOTS-1))].pt, obj2gco(J->pt));
return tr; return tr;
} }
@ -2211,6 +2212,7 @@ void lj_record_ins(jit_State *J)
lj_ir_ktab(J, gco2tab(proto_kgc(J->pt, ~(ptrdiff_t)rc))), 0); lj_ir_ktab(J, gco2tab(proto_kgc(J->pt, ~(ptrdiff_t)rc))), 0);
J->rbchash[(rc & (RBCHASH_SLOTS-1))].ref = tref_ref(rc); J->rbchash[(rc & (RBCHASH_SLOTS-1))].ref = tref_ref(rc);
setmref(J->rbchash[(rc & (RBCHASH_SLOTS-1))].pc, pc); setmref(J->rbchash[(rc & (RBCHASH_SLOTS-1))].pc, pc);
setgcref(J->rbchash[(rc & (RBCHASH_SLOTS-1))].pt, obj2gco(J->pt));
break; break;
/* -- Calls and vararg handling ----------------------------------------- */ /* -- Calls and vararg handling ----------------------------------------- */