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_mips.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_mips.h')
-rw-r--r-- | src/lj_asm_mips.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lj_asm_mips.h b/src/lj_asm_mips.h index 5070a7a2..fe7d55d3 100644 --- a/src/lj_asm_mips.h +++ b/src/lj_asm_mips.h | |||
@@ -328,7 +328,7 @@ static void asm_setupresult(ASMState *as, IRIns *ir, const CCallInfo *ci) | |||
328 | 328 | ||
329 | static void asm_callx(ASMState *as, IRIns *ir) | 329 | static void asm_callx(ASMState *as, IRIns *ir) |
330 | { | 330 | { |
331 | IRRef args[CCI_NARGS_MAX]; | 331 | IRRef args[CCI_NARGS_MAX*2]; |
332 | CCallInfo ci; | 332 | CCallInfo ci; |
333 | IRRef func; | 333 | IRRef func; |
334 | IRIns *irf; | 334 | IRIns *irf; |
@@ -1725,7 +1725,7 @@ static void asm_tail_prep(ASMState *as) | |||
1725 | /* Ensure there are enough stack slots for call arguments. */ | 1725 | /* Ensure there are enough stack slots for call arguments. */ |
1726 | static Reg asm_setup_call_slots(ASMState *as, IRIns *ir, const CCallInfo *ci) | 1726 | static Reg asm_setup_call_slots(ASMState *as, IRIns *ir, const CCallInfo *ci) |
1727 | { | 1727 | { |
1728 | IRRef args[CCI_NARGS_MAX]; | 1728 | IRRef args[CCI_NARGS_MAX*2]; |
1729 | uint32_t i, nargs = CCI_XNARGS(ci); | 1729 | uint32_t i, nargs = CCI_XNARGS(ci); |
1730 | int nslots = 4, ngpr = REGARG_NUMGPR, nfpr = REGARG_NUMFPR; | 1730 | int nslots = 4, ngpr = REGARG_NUMGPR, nfpr = REGARG_NUMFPR; |
1731 | asm_collectargs(as, ir, ci, args); | 1731 | asm_collectargs(as, ir, ci, args); |