r4/lang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: r4:298883939b3cd4b0c02d1fcaf9ba45a153ea9d6e
Branches Tags
r4:master
...
compare: r4:ef63742015255fa04c668089f0bfa966b43e6258
Branches Tags
r4:master

2 Commits
298883939b ... ef63742015

Author SHA1 Message Date
r4
ef63742015 reduce mallocs when calling functions 2021-12-23 17:00:57 +01:00
r4
7ae9ddaee9 multi-line expressions 2021-12-23 16:51:10 +01:00
3 changed files with 30 additions and 10 deletions
Show Stats Expand all files Collapse all files

6
calculate_pi.script
View File

@ -5,7 +5,11 @@ iterations := 100
while k - iterations {
k_f := float(k)
sum = sum + 1.0 / pow(16.0, k_f) * (4.0 / (8.0 * k_f + 1.0) - 2.0 / (8.0 * k_f + 4.0) - 1.0 / (8.0 * k_f + 5.0) - 1.0 / (8.0 * k_f + 6.0))
sum = sum + 1.0 / pow(16.0, k_f) *
(4.0 / (8.0 * k_f + 1.0) -
2.0 / (8.0 * k_f + 4.0) -
1.0 / (8.0 * k_f + 5.0) -
1.0 / (8.0 * k_f + 6.0))
k = k + 1
}

8
parse.c
View File

@ -177,6 +177,14 @@ static ExprRet expr(IRToks *out_ir, TokList *toks, Map *funcs, Scope *parent_sc,
negate = true;
}
/* Delete newline if we're definitely expecting an operand. */
if (t->tok.kind == TokOp && t->tok.Op == OpNewLn) {
if (t == start)
start = t->next;
t = t->next;
toklist_del(toks, t->prev, t->prev);
}
/* Collapse parentheses. */
if (t->tok.kind == TokOp && t->tok.Op == OpLParen) {
ExprRet r;

26
vm.c
View File

@ -43,6 +43,10 @@ static Value *irparam_to_val(Stack *s, IRParam *v) {
}
void run(const IRToks *ir, const BuiltinFunc *builtin_funcs) {
/* so we don't have to call malloc on every function call */
size_t fn_args_cap = 16;
Value *fn_args = xmalloc(sizeof(Value) * fn_args_cap);
Stack s = stack_make();
for (size_t i = 0; i < ir->len;) {
IRTok *instr = &ir->toks[i];
@ -52,17 +56,18 @@ void run(const IRToks *ir, const BuiltinFunc *builtin_funcs) {
case IRSet:
case IRNeg:
stack_fit(&s, instr->Unary.addr);
TRY(s.mem[instr->Unary.addr] = eval_unary(instr->instr, irparam_to_val(&s, &instr->Unary.val)));
TRY_ELSE(s.mem[instr->Unary.addr] = eval_unary(instr->instr, irparam_to_val(&s, &instr->Unary.val)),
{free(fn_args); stack_term(&s);});
break;
case IRAdd:
case IRSub:
case IRDiv:
case IRMul:
stack_fit(&s, instr->Arith.addr);
TRY(s.mem[instr->Arith.addr] = eval_arith(instr->instr,
TRY_ELSE(s.mem[instr->Arith.addr] = eval_arith(instr->instr,
irparam_to_val(&s, &instr->Arith.lhs),
irparam_to_val(&s, &instr->Arith.rhs)
));
irparam_to_val(&s, &instr->Arith.rhs)),
{free(fn_args); stack_term(&s);});
break;
case IRJmp:
i = instr->Jmp.iaddr;
@ -75,14 +80,16 @@ void run(const IRToks *ir, const BuiltinFunc *builtin_funcs) {
break;
case IRCallInternal: {
const BuiltinFunc *f = &builtin_funcs[instr->CallI.fid];
Value *args = xmalloc(sizeof(Value) * f->n_args);
/* make sure enough space for our arguments is allocated */
if (f->n_args > fn_args_cap)
fn_args = xrealloc(fn_args, sizeof(Value) * (fn_args_cap = f->n_args));
/* copy arguments into buffer */
for (size_t i = 0; i < f->n_args; i++)
args[i] = *irparam_to_val(&s, &instr->CallI.args[i]);
fn_args[i] = *irparam_to_val(&s, &instr->CallI.args[i]);
stack_fit(&s, instr->CallI.ret_addr);
TRY_ELSE(s.mem[instr->CallI.ret_addr] = f->func(args), free(args));
free(args);
TRY_ELSE(s.mem[instr->CallI.ret_addr] = f->func(fn_args),
{free(fn_args); stack_term(&s);});
break;
}
default:
@ -92,4 +99,5 @@ void run(const IRToks *ir, const BuiltinFunc *builtin_funcs) {
i++;
}
stack_term(&s);
free(fn_args);
}