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_x86.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_x86.h')
| -rw-r--r-- | src/lj_asm_x86.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lj_asm_x86.h b/src/lj_asm_x86.h index 3a029970..25da5246 100644 --- a/src/lj_asm_x86.h +++ b/src/lj_asm_x86.h | |||
| @@ -600,7 +600,7 @@ static void *asm_callx_func(ASMState *as, IRIns *irf, IRRef func) | |||
| 600 | 600 | ||
| 601 | static void asm_callx(ASMState *as, IRIns *ir) | 601 | static void asm_callx(ASMState *as, IRIns *ir) |
| 602 | { | 602 | { |
| 603 | IRRef args[CCI_NARGS_MAX]; | 603 | IRRef args[CCI_NARGS_MAX*2]; |
| 604 | CCallInfo ci; | 604 | CCallInfo ci; |
| 605 | IRRef func; | 605 | IRRef func; |
| 606 | IRIns *irf; | 606 | IRIns *irf; |
| @@ -2593,7 +2593,7 @@ static void asm_tail_prep(ASMState *as) | |||
| 2593 | /* Ensure there are enough stack slots for call arguments. */ | 2593 | /* Ensure there are enough stack slots for call arguments. */ |
| 2594 | static Reg asm_setup_call_slots(ASMState *as, IRIns *ir, const CCallInfo *ci) | 2594 | static Reg asm_setup_call_slots(ASMState *as, IRIns *ir, const CCallInfo *ci) |
| 2595 | { | 2595 | { |
| 2596 | IRRef args[CCI_NARGS_MAX]; | 2596 | IRRef args[CCI_NARGS_MAX*2]; |
| 2597 | int nslots; | 2597 | int nslots; |
| 2598 | asm_collectargs(as, ir, ci, args); | 2598 | asm_collectargs(as, ir, ci, args); |
| 2599 | nslots = asm_count_call_slots(as, ci, args); | 2599 | nslots = asm_count_call_slots(as, ci, args); |