diff options
| author | Mike Pall <mike> | 2013-05-16 20:07:53 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-05-16 20:07:53 +0200 |
| commit | 647cc4613f3acd5ec8785920102af22b85cf2b9c (patch) | |
| tree | e73f6e3ef1201884eb4be43097c51e1df80d9a7f /src/lj_asm_arm.h | |
| parent | a946f678d553494ee23a29a10cced1d5cc11ab7e (diff) | |
| parent | 0f79d4741f29637de1eaaa603fdd0d161feb390d (diff) | |
| download | luajit-647cc4613f3acd5ec8785920102af22b85cf2b9c.tar.gz luajit-647cc4613f3acd5ec8785920102af22b85cf2b9c.tar.bz2 luajit-647cc4613f3acd5ec8785920102af22b85cf2b9c.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_asm_arm.h')
| -rw-r--r-- | src/lj_asm_arm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lj_asm_arm.h b/src/lj_asm_arm.h index 1e024dcd..ddf1480f 100644 --- a/src/lj_asm_arm.h +++ b/src/lj_asm_arm.h | |||
| @@ -455,7 +455,7 @@ static void asm_setupresult(ASMState *as, IRIns *ir, const CCallInfo *ci) | |||
| 455 | 455 | ||
| 456 | static void asm_callx(ASMState *as, IRIns *ir) | 456 | static void asm_callx(ASMState *as, IRIns *ir) |
| 457 | { | 457 | { |
| 458 | IRRef args[CCI_NARGS_MAX]; | 458 | IRRef args[CCI_NARGS_MAX*2]; |
| 459 | CCallInfo ci; | 459 | CCallInfo ci; |
| 460 | IRRef func; | 460 | IRRef func; |
| 461 | IRIns *irf; | 461 | IRIns *irf; |
| @@ -2132,7 +2132,7 @@ static void asm_tail_prep(ASMState *as) | |||
| 2132 | /* Ensure there are enough stack slots for call arguments. */ | 2132 | /* Ensure there are enough stack slots for call arguments. */ |
| 2133 | static Reg asm_setup_call_slots(ASMState *as, IRIns *ir, const CCallInfo *ci) | 2133 | static Reg asm_setup_call_slots(ASMState *as, IRIns *ir, const CCallInfo *ci) |
| 2134 | { | 2134 | { |
| 2135 | IRRef args[CCI_NARGS_MAX]; | 2135 | IRRef args[CCI_NARGS_MAX*2]; |
| 2136 | uint32_t i, nargs = CCI_XNARGS(ci); | 2136 | uint32_t i, nargs = CCI_XNARGS(ci); |
| 2137 | int nslots = 0, ngpr = REGARG_NUMGPR, nfpr = REGARG_NUMFPR, fprodd = 0; | 2137 | int nslots = 0, ngpr = REGARG_NUMGPR, nfpr = REGARG_NUMFPR, fprodd = 0; |
| 2138 | asm_collectargs(as, ir, ci, args); | 2138 | asm_collectargs(as, ir, ci, args); |