mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

subr-call implementation simplification

Browse source 
* libguile/vm-engine.c (subr-call): Reference args from SP, not FP.
This commit is contained in:
Andy Wingo 2015-10-22 11:35:07 +00:00
parent 467e587d68
commit 9144f50c31
1 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

45
libguile/vm-engine.c
View file

@ -801,53 +801,52 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
SYNC_IP ();
// FIXME!!!!
switch (FRAME_LOCALS_COUNT_FROM (1))
{
case 0:
ret = subr ();
break;
case 1:
ret = subr (FP_REF (1));
ret = subr (SP_REF (0));
break;
case 2:
ret = subr (FP_REF (1), FP_REF (2));
ret = subr (SP_REF (1), SP_REF (0));
break;
case 3:
ret = subr (FP_REF (1), FP_REF (2), FP_REF (3));
ret = subr (SP_REF (2), SP_REF (1), SP_REF (0));
break;
case 4:
ret = subr (FP_REF (1), FP_REF (2), FP_REF (3),
FP_REF (4));
ret = subr (SP_REF (3), SP_REF (2), SP_REF (1),
SP_REF (0));
break;
case 5:
ret = subr (FP_REF (1), FP_REF (2), FP_REF (3),
FP_REF (4), FP_REF (5));
ret = subr (SP_REF (4), SP_REF (3), SP_REF (2),
SP_REF (1), SP_REF (0));
break;
case 6:
ret = subr (FP_REF (1), FP_REF (2), FP_REF (3),
FP_REF (4), FP_REF (5), FP_REF (6));
ret = subr (SP_REF (5), SP_REF (4), SP_REF (3),
SP_REF (2), SP_REF (1), SP_REF (0));
break;
case 7:
ret = subr (FP_REF (1), FP_REF (2), FP_REF (3),
FP_REF (4), FP_REF (5), FP_REF (6),
FP_REF (7));
ret = subr (SP_REF (6), SP_REF (5), SP_REF (4),
SP_REF (3), SP_REF (2), SP_REF (1),
SP_REF (0));
break;
case 8:
ret = subr (FP_REF (1), FP_REF (2), FP_REF (3),
FP_REF (4), FP_REF (5), FP_REF (6),
FP_REF (7), FP_REF (8));
ret = subr (SP_REF (7), SP_REF (6), SP_REF (5),
SP_REF (4), SP_REF (3), SP_REF (2),
SP_REF (1), SP_REF (0));
break;
case 9:
ret = subr (FP_REF (1), FP_REF (2), FP_REF (3),
FP_REF (4), FP_REF (5), FP_REF (6),
FP_REF (7), FP_REF (8), FP_REF (9));
ret = subr (SP_REF (8), SP_REF (7), SP_REF (6),
SP_REF (5), SP_REF (4), SP_REF (3),
SP_REF (2), SP_REF (1), SP_REF (0));
break;
case 10:
ret = subr (FP_REF (1), FP_REF (2), FP_REF (3),
FP_REF (4), FP_REF (5), FP_REF (6),
FP_REF (7), FP_REF (8), FP_REF (9),
FP_REF (10));
ret = subr (SP_REF (9), SP_REF (8), SP_REF (7),
SP_REF (6), SP_REF (5), SP_REF (4),
SP_REF (3), SP_REF (2), SP_REF (1),
SP_REF (0));
break;
default:
abort ();