diff options
| author | Mike Pall <mike> | 2020-12-04 11:17:45 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2020-12-04 11:17:45 +0100 |
| commit | 351bb43a07eace6a5f67de7954c154566c06f2ca (patch) | |
| tree | ed3590124aa129f572dc6d030b7fc711f762f412 | |
| parent | 377a8488b62a9f1b589bb68875dd1288aa70e76e (diff) | |
| parent | d67ff15a5cf11dff46fa2288e0c074526548db2b (diff) | |
| download | luajit-351bb43a07eace6a5f67de7954c154566c06f2ca.tar.gz luajit-351bb43a07eace6a5f67de7954c154566c06f2ca.tar.bz2 luajit-351bb43a07eace6a5f67de7954c154566c06f2ca.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/vm_x86.dasc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/vm_x86.dasc b/src/vm_x86.dasc index b26cde4f..3dd7dbae 100644 --- a/src/vm_x86.dasc +++ b/src/vm_x86.dasc | |||
| @@ -1372,7 +1372,11 @@ static void build_subroutines(BuildCtx *ctx) | |||
| 1372 | | mov LFUNC:RB, [RA-8] | 1372 | | mov LFUNC:RB, [RA-8] |
| 1373 | | add NARGS:RD, 1 | 1373 | | add NARGS:RD, 1 |
| 1374 | | // This is fragile. L->base must not move, KBASE must always be defined. | 1374 | | // This is fragile. L->base must not move, KBASE must always be defined. |
| 1375 | |.if x64 | ||
| 1376 | | cmp KBASEa, rdx // Continue with CALLT if flag set. | ||
| 1377 | |.else | ||
| 1375 | | cmp KBASE, BASE // Continue with CALLT if flag set. | 1378 | | cmp KBASE, BASE // Continue with CALLT if flag set. |
| 1379 | |.endif | ||
| 1376 | | je ->BC_CALLT_Z | 1380 | | je ->BC_CALLT_Z |
| 1377 | | mov BASE, RA | 1381 | | mov BASE, RA |
| 1378 | | ins_call // Otherwise call resolved metamethod. | 1382 | | ins_call // Otherwise call resolved metamethod. |