diff options
| author | Mike Pall <mike> | 2019-04-29 18:04:47 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2019-04-29 18:04:47 +0200 |
| commit | 178512fab94990361c418c13b2ad5e004b44b924 (patch) | |
| tree | d7e1480861a0278ec65a318e85737eb17424c249 /src/lj_asm.c | |
| parent | b33e3f2d441590f4de0d189bd9a65661824a48f6 (diff) | |
| parent | 9bd5a722bee2ee2c5b159a89937778b81be49915 (diff) | |
| download | luajit-178512fab94990361c418c13b2ad5e004b44b924.tar.gz luajit-178512fab94990361c418c13b2ad5e004b44b924.tar.bz2 luajit-178512fab94990361c418c13b2ad5e004b44b924.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_asm.c')
| -rw-r--r-- | src/lj_asm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_asm.c b/src/lj_asm.c index 992dcf59..ff07b7ee 100644 --- a/src/lj_asm.c +++ b/src/lj_asm.c | |||
| @@ -2130,8 +2130,8 @@ static void asm_setup_regsp(ASMState *as) | |||
| 2130 | #if LJ_SOFTFP | 2130 | #if LJ_SOFTFP |
| 2131 | case IR_MIN: case IR_MAX: | 2131 | case IR_MIN: case IR_MAX: |
| 2132 | if ((ir+1)->o != IR_HIOP) break; | 2132 | if ((ir+1)->o != IR_HIOP) break; |
| 2133 | /* fallthrough */ | ||
| 2134 | #endif | 2133 | #endif |
| 2134 | /* fallthrough */ | ||
| 2135 | /* C calls evict all scratch regs and return results in RID_RET. */ | 2135 | /* C calls evict all scratch regs and return results in RID_RET. */ |
| 2136 | case IR_SNEW: case IR_XSNEW: case IR_NEWREF: case IR_BUFPUT: | 2136 | case IR_SNEW: case IR_XSNEW: case IR_NEWREF: case IR_BUFPUT: |
| 2137 | if (REGARG_NUMGPR < 3 && as->evenspill < 3) | 2137 | if (REGARG_NUMGPR < 3 && as->evenspill < 3) |