diff options
author | Mike Pall <mike> | 2010-02-23 18:27:39 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2010-02-23 19:41:32 +0100 |
commit | 8ae2f9feaaed874e01a87df6646242b80acceabb (patch) | |
tree | 0c0e030b007a4ef5b663476f4142f1f860ee3675 /src/lj_record.c | |
parent | d5c8fe4b90c54cbd03924d3eaf04d83dcf2f3cb8 (diff) | |
download | luajit-8ae2f9feaaed874e01a87df6646242b80acceabb.tar.gz luajit-8ae2f9feaaed874e01a87df6646242b80acceabb.tar.bz2 luajit-8ae2f9feaaed874e01a87df6646242b80acceabb.zip |
Randomize penalties for aborts and add blacklisting.
Diffstat (limited to 'src/lj_record.c')
-rw-r--r-- | src/lj_record.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lj_record.c b/src/lj_record.c index 2b63b87d..1ef01386 100644 --- a/src/lj_record.c +++ b/src/lj_record.c | |||
@@ -419,9 +419,9 @@ static int innerloopleft(jit_State *J, const BCIns *pc) | |||
419 | { | 419 | { |
420 | ptrdiff_t i; | 420 | ptrdiff_t i; |
421 | for (i = 0; i < PENALTY_SLOTS; i++) | 421 | for (i = 0; i < PENALTY_SLOTS; i++) |
422 | if (J->penalty[i].pc == pc) { | 422 | if (mref(J->penalty[i].pc, const BCIns) == pc) { |
423 | if (J->penalty[i].reason == LJ_TRERR_LLEAVE && | 423 | if (J->penalty[i].reason == LJ_TRERR_LLEAVE && |
424 | J->penalty[i].val >= 2*HOTCOUNT_MIN_PENALTY) | 424 | J->penalty[i].val >= 2*PENALTY_MIN) |
425 | return 1; | 425 | return 1; |
426 | break; | 426 | break; |
427 | } | 427 | } |
@@ -2149,7 +2149,7 @@ void lj_record_ins(jit_State *J) | |||
2149 | case BC_ILOOP: | 2149 | case BC_ILOOP: |
2150 | case BC_IFUNCF: | 2150 | case BC_IFUNCF: |
2151 | case BC_IFUNCV: | 2151 | case BC_IFUNCV: |
2152 | lj_trace_err(J, LJ_TRERR_LBLACKL); | 2152 | lj_trace_err(J, LJ_TRERR_BLACKL); |
2153 | break; | 2153 | break; |
2154 | 2154 | ||
2155 | case BC_JMP: | 2155 | case BC_JMP: |