Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-07-07 05:06:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing operator precedence bug in stack limit checks

Browse source
This commit is contained in:
Alex Shinn 2012-10-03 21:30:50 +09:00
parent 2c5522dfff
commit 94ef945f8d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
vm.c
View file

@ -977,7 +977,7 @@ sexp sexp_apply (sexp ctx, sexp proc, sexp args) {
ip = sexp_bytecode_data(bc) - sizeof(sexp); ip = sexp_bytecode_data(bc) - sizeof(sexp);
tmp1 = proc, tmp2 = args; tmp1 = proc, tmp2 = args;
i = sexp_unbox_fixnum(sexp_length(ctx, tmp2)); i = sexp_unbox_fixnum(sexp_length(ctx, tmp2));
sexp_ensure_stack(i + 64 + sexp_procedurep(tmp1) ? sexp_bytecode_max_depth(sexp_procedure_code(tmp1)) : 0); sexp_ensure_stack(i + 64 + (sexp_procedurep(tmp1) ? sexp_bytecode_max_depth(sexp_procedure_code(tmp1)) : 0));
for (top += i; sexp_pairp(tmp2); tmp2=sexp_cdr(tmp2), top--) for (top += i; sexp_pairp(tmp2); tmp2=sexp_cdr(tmp2), top--)
_ARG1 = sexp_car(tmp2); _ARG1 = sexp_car(tmp2);
top += i+1; top += i+1;
@ -1115,7 +1115,7 @@ sexp sexp_apply (sexp ctx, sexp proc, sexp args) {
tmp2 = _ARG2; tmp2 = _ARG2;
apply1: apply1:
i = sexp_unbox_fixnum(sexp_length(ctx, tmp2)); /* number of params */ i = sexp_unbox_fixnum(sexp_length(ctx, tmp2)); /* number of params */
sexp_ensure_stack(i + 64 + sexp_procedurep(tmp1) ? sexp_bytecode_max_depth(sexp_procedure_code(tmp1)) : 0); sexp_ensure_stack(i + 64 + (sexp_procedurep(tmp1) ? sexp_bytecode_max_depth(sexp_procedure_code(tmp1)) : 0));
k = sexp_unbox_fixnum(stack[fp+3]); /* previous fp */ k = sexp_unbox_fixnum(stack[fp+3]); /* previous fp */
j = sexp_unbox_fixnum(stack[fp]); /* previous num params */ j = sexp_unbox_fixnum(stack[fp]); /* previous num params */
self = stack[fp+2]; self = stack[fp+2];