lassik
/
upscheme
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

some micro-optimizations

This commit is contained in:
JeffBezanson 2009-01-16 14:12:35 +00:00
parent 8197197ced
commit 808d92dfb6
2 changed files with 47 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
femtolisp/flisp.c
View File

@ -615,13 +615,13 @@ static value_t assoc(value_t item, value_t v)
is that a vararg lambda often needs to recur by applying itself to the is that a vararg lambda often needs to recur by applying itself to the
tail of its argument list, so copying the list would be unacceptable. tail of its argument list, so copying the list would be unacceptable.
*/ */
static void list(value_t *pv, int nargs, value_t *plastcdr) static void list(value_t *pv, uint32_t nargs, value_t *plastcdr)
{ {
cons_t *c; cons_t *c;
int i; uint32_t i;
*pv = cons_reserve(nargs); *pv = cons_reserve(nargs);
c = (cons_t*)ptr(*pv); c = (cons_t*)ptr(*pv);
for(i=SP-nargs; i < (int)SP; i++) { for(i=SP-nargs; i < SP; i++) {
c->car = Stack[i]; c->car = Stack[i];
c->cdr = tagptr(c+1, TAG_CONS); c->cdr = tagptr(c+1, TAG_CONS);
c++; c++;
@ -683,8 +683,8 @@ static value_t eval_sexpr(value_t e, uint32_t penv, int tail)
value_t f, v, *pv, *argsyms, *body; value_t f, v, *pv, *argsyms, *body;
cons_t *c; cons_t *c;
symbol_t *sym; symbol_t *sym;
uint32_t saveSP, envsz, lenv; uint32_t saveSP, envsz, lenv, nargs;
int i, nargs=0, noeval=0; int i, noeval=0;
fixnum_t s, lo, hi; fixnum_t s, lo, hi;
cvalue_t *cv; cvalue_t *cv;
int64_t accum; int64_t accum;
@ -700,8 +700,10 @@ static value_t eval_sexpr(value_t e, uint32_t penv, int tail)
if (car_(v)==e) return *pv; if (car_(v)==e) return *pv;
v = cdr_(v); pv++; v = cdr_(v); pv++;
} }
if (v == e) return *pv; // dotted list if (v != NIL) {
if (v != NIL) pv++; if (v == e) return *pv; // dotted list
pv++;
}
if (*pv == NIL) break; if (*pv == NIL) break;
pv = &vector_elt(*pv, 0); pv = &vector_elt(*pv, 0);
} }
@ -758,12 +760,14 @@ static value_t eval_sexpr(value_t e, uint32_t penv, int tail)
} }
f = cdr_(f); pv++; f = cdr_(f); pv++;
} }
if (f == e) { if (f != NIL) {
*pv = v; if (f == e) {
SP = saveSP; *pv = v;
return v; SP = saveSP;
return v;
}
pv++;
} }
if (f != NIL) pv++;
if (*pv == NIL) break; if (*pv == NIL) break;
pv = &vector_elt(*pv, 0); pv = &vector_elt(*pv, 0);
} }
@ -792,19 +796,29 @@ static value_t eval_sexpr(value_t e, uint32_t penv, int tail)
PUSH(Stack[penv+1]); // env has already been captured; share PUSH(Stack[penv+1]); // env has already been captured; share
} }
c = (cons_t*)ptr(v=cons_reserve(3)); c = (cons_t*)ptr(v=cons_reserve(3));
e = Stack[saveSP];
if (!iscons(e)) goto notpair;
c->car = LAMBDA; c->car = LAMBDA;
c->cdr = tagptr(c+1, TAG_CONS); c++; c->cdr = tagptr(c+1, TAG_CONS); c++;
c->car = car(Stack[saveSP]); //argsyms c->car = car_(e); //argsyms
c->cdr = tagptr(c+1, TAG_CONS); c++; c->cdr = tagptr(c+1, TAG_CONS); c++;
c->car = car(cdr_(Stack[saveSP])); //body if (!iscons(e=cdr_(e))) goto notpair;
c->cdr = Stack[SP-1]; //env c->car = car_(e); //body
c->cdr = Stack[SP-1]; //env
break; break;
case F_IF: case F_IF:
v = car(Stack[saveSP]); if (!iscons(Stack[saveSP])) goto notpair;
if (eval(v) != NIL) v = car_(Stack[saveSP]);
v = car(cdr_(Stack[saveSP])); if (eval(v) != NIL) {
else v = cdr_(Stack[saveSP]);
v = car(cdr(cdr_(Stack[saveSP]))); if (!iscons(v)) goto notpair;
v = car_(v);
}
else {
v = cdr_(Stack[saveSP]);
if (!iscons(v) || !iscons(v=cdr_(v))) goto notpair;
v = car_(v);
}
tail_eval(v); tail_eval(v);
break; break;
case F_COND: case F_COND:
@ -913,11 +927,15 @@ static value_t eval_sexpr(value_t e, uint32_t penv, int tail)
break; break;
case F_CAR: case F_CAR:
argcount("car", nargs, 1); argcount("car", nargs, 1);
v = car(Stack[SP-1]); v = Stack[SP-1];
if (!iscons(v)) goto notpair;
v = car_(v);
break; break;
case F_CDR: case F_CDR:
argcount("cdr", nargs, 1); argcount("cdr", nargs, 1);
v = cdr(Stack[SP-1]); v = Stack[SP-1];
if (!iscons(v)) goto notpair;
v = cdr_(v);
break; break;
case F_RPLACA: case F_RPLACA:
argcount("rplaca", nargs, 2); argcount("rplaca", nargs, 2);
@ -1250,7 +1268,8 @@ static value_t eval_sexpr(value_t e, uint32_t penv, int tail)
// apply lambda expression // apply lambda expression
f = cdr_(f); f = cdr_(f);
PUSH(f); PUSH(f);
PUSH(car(f)); // arglist if (!iscons(f)) goto notpair;
PUSH(car_(f)); // arglist
argsyms = &Stack[SP-1]; argsyms = &Stack[SP-1];
// build a calling environment for the lambda // build a calling environment for the lambda
// the environment is the argument binds on top of the captured // the environment is the argument binds on top of the captured
@ -1303,7 +1322,8 @@ static value_t eval_sexpr(value_t e, uint32_t penv, int tail)
lerror(ArgError, "apply: too few arguments"); lerror(ArgError, "apply: too few arguments");
} }
f = cdr_(Stack[saveSP+1]); f = cdr_(Stack[saveSP+1]);
e = car(f); if (!iscons(f)) goto notpair;
e = car_(f);
if (selfevaluating(e)) { SP=saveSP; return(e); } if (selfevaluating(e)) { SP=saveSP; return(e); }
PUSH(cdr_(f)); // add closed environment PUSH(cdr_(f)); // add closed environment
*argsyms = car_(Stack[saveSP+1]); // put lambda list *argsyms = car_(Stack[saveSP+1]); // put lambda list
@ -1339,6 +1359,8 @@ static value_t eval_sexpr(value_t e, uint32_t penv, int tail)
// not reached // not reached
} }
type_error("apply", "function", f); type_error("apply", "function", f);
notpair:
lerror(TypeError, "expected cons");
return NIL; return NIL;
} }

2
femtolisp/flisp.h
View File

@ -150,7 +150,7 @@ void raise(value_t e) __attribute__ ((__noreturn__));
void type_error(char *fname, char *expected, value_t got) __attribute__ ((__noreturn__)); void type_error(char *fname, char *expected, value_t got) __attribute__ ((__noreturn__));
void bounds_error(char *fname, value_t arr, value_t ind) __attribute__ ((__noreturn__)); void bounds_error(char *fname, value_t arr, value_t ind) __attribute__ ((__noreturn__));
extern value_t ArgError, IOError, KeyError; extern value_t ArgError, IOError, KeyError;
static inline void argcount(char *fname, int nargs, int c) static inline void argcount(char *fname, uint32_t nargs, uint32_t c)
{ {
if (__unlikely(nargs != c)) if (__unlikely(nargs != c))
lerror(ArgError,"%s: too %s arguments", fname, nargs<c ? "few":"many"); lerror(ArgError,"%s: too %s arguments", fname, nargs<c ? "few":"many");