diff options
| author | Mike Pall <mike> | 2019-08-30 11:24:44 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2019-08-30 11:24:44 +0200 |
| commit | 88d40b00c38611412d0023d7ed55999615deb55b (patch) | |
| tree | 1b5c8c3976a53bbf2c50eb6ef65f7459439cc2f7 /src | |
| parent | 2bde5c7c62e627f10cba1612b58447b4e84b7ac8 (diff) | |
| parent | 20ac817a747cf8cab044ae81b09c08d23e34342b (diff) | |
| download | luajit-88d40b00c38611412d0023d7ed55999615deb55b.tar.gz luajit-88d40b00c38611412d0023d7ed55999615deb55b.tar.bz2 luajit-88d40b00c38611412d0023d7ed55999615deb55b.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/lj_bcwrite.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lj_bcwrite.c b/src/lj_bcwrite.c index 5e05caea..a86d6d00 100644 --- a/src/lj_bcwrite.c +++ b/src/lj_bcwrite.c | |||
| @@ -219,10 +219,7 @@ static char *bcwrite_bytecode(BCWriteCtx *ctx, char *p, GCproto *pt) | |||
| 219 | q[LJ_ENDIAN_SELECT(0, 3)] = (uint8_t)(op-BC_IFORL+BC_FORL); | 219 | q[LJ_ENDIAN_SELECT(0, 3)] = (uint8_t)(op-BC_IFORL+BC_FORL); |
| 220 | } else if (op == BC_JFORL || op == BC_JITERL || op == BC_JLOOP) { | 220 | } else if (op == BC_JFORL || op == BC_JITERL || op == BC_JLOOP) { |
| 221 | BCReg rd = q[LJ_ENDIAN_SELECT(2, 1)] + (q[LJ_ENDIAN_SELECT(3, 0)] << 8); | 221 | BCReg rd = q[LJ_ENDIAN_SELECT(2, 1)] + (q[LJ_ENDIAN_SELECT(3, 0)] << 8); |
| 222 | BCIns ins = traceref(J, rd)->startins; | 222 | memcpy(q, &traceref(J, rd)->startins, 4); |
| 223 | q[LJ_ENDIAN_SELECT(0, 3)] = (uint8_t)(op-BC_JFORL+BC_FORL); | ||
| 224 | q[LJ_ENDIAN_SELECT(2, 1)] = bc_c(ins); | ||
| 225 | q[LJ_ENDIAN_SELECT(3, 0)] = bc_b(ins); | ||
| 226 | } | 223 | } |
| 227 | } | 224 | } |
| 228 | } | 225 | } |