Inline callFunction():

Browse Source 
binary_trees - wren            ..........  3400  0.29s   97.79% relative to baseline
delta_blue - wren              ..........  7565  0.13s  102.23% relative to baseline
fib - wren                     ..........  3039  0.33s   98.93% relative to baseline
for - wren                     ..........  8265  0.12s   92.49% relative to baseline
method_call - wren             ..........  6759  0.15s  131.21% relative to baseline
This commit is contained in:
Bob Nystrom 2015-01-16 07:45:42 -08:00
parent 2a37110bd1
commit eece4ee926
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/wren_vm.c
View File

@ -352,14 +352,13 @@ static ObjString* methodNotFound(WrenVM* vm, ObjClass* classObj, int symbol)
// Pushes [function] onto [fiber]'s callstack and invokes it. Expects [numArgs] // Pushes [function] onto [fiber]'s callstack and invokes it. Expects [numArgs]
// arguments (including the receiver) to be on the top of the stack already. // arguments (including the receiver) to be on the top of the stack already.
// [function] can be an `ObjFn` or `ObjClosure`. // [function] can be an `ObjFn` or `ObjClosure`.
static void callFunction(ObjFiber* fiber, Obj* function, int numArgs) static inline void callFunction(ObjFiber* fiber, Obj* function, int numArgs)
{ {
// TODO: Check for stack overflow. // TODO: Check for stack overflow.
CallFrame* frame = &fiber->frames[fiber->numFrames]; CallFrame* frame = &fiber->frames[fiber->numFrames++];
frame->fn = function; frame->fn = function;
frame->stackStart = fiber->stackTop - numArgs; frame->stackStart = fiber->stackTop - numArgs;
frame->ip = 0;
if (function->type == OBJ_FN) if (function->type == OBJ_FN)
{ {
frame->ip = ((ObjFn*)function)->bytecode; frame->ip = ((ObjFn*)function)->bytecode;
@ -368,8 +367,6 @@ static void callFunction(ObjFiber* fiber, Obj* function, int numArgs)
{ {
frame->ip = ((ObjClosure*)function)->fn->bytecode; frame->ip = ((ObjClosure*)function)->fn->bytecode;
} }
fiber->numFrames++;
} }
// The main bytecode interpreter loop. This is where the magic happens. It is // The main bytecode interpreter loop. This is where the magic happens. It is
@ -591,8 +588,9 @@ static bool runInterpreter(WrenVM* vm)
int numArgs = instruction - CODE_CALL_0 + 1; int numArgs = instruction - CODE_CALL_0 + 1;
int symbol = READ_SHORT(); int symbol = READ_SHORT();
Value receiver = *(fiber->stackTop - numArgs); // The receiver is the first argument.
ObjClass* classObj = wrenGetClassInline(vm, receiver); Value* args = fiber->stackTop - numArgs;
ObjClass* classObj = wrenGetClassInline(vm, args[0]);
// If the class's method table doesn't include the symbol, bail. // If the class's method table doesn't include the symbol, bail.
if (symbol >= classObj->methods.count) if (symbol >= classObj->methods.count)
@ -605,8 +603,6 @@ static bool runInterpreter(WrenVM* vm)
{ {
case METHOD_PRIMITIVE: case METHOD_PRIMITIVE:
{ {
Value* args = fiber->stackTop - numArgs;
// After calling this, the result will be in the first arg slot. // After calling this, the result will be in the first arg slot.
switch (method->fn.primitive(vm, fiber, args)) switch (method->fn.primitive(vm, fiber, args))
{ {
@ -683,8 +679,9 @@ static bool runInterpreter(WrenVM* vm)
int numArgs = instruction - CODE_SUPER_0 + 1; int numArgs = instruction - CODE_SUPER_0 + 1;
int symbol = READ_SHORT(); int symbol = READ_SHORT();
Value receiver = *(fiber->stackTop - numArgs); // The receiver is the first argument.
ObjClass* classObj = wrenGetClassInline(vm, receiver); Value* args = fiber->stackTop - numArgs;
ObjClass* classObj = wrenGetClassInline(vm, args[0]);
// Ignore methods defined on the receiver's immediate class. // Ignore methods defined on the receiver's immediate class.
classObj = classObj->superclass; classObj = classObj->superclass;
@ -700,8 +697,6 @@ static bool runInterpreter(WrenVM* vm)
{ {
case METHOD_PRIMITIVE: case METHOD_PRIMITIVE:
{ {
Value* args = fiber->stackTop - numArgs;
// After calling this, the result will be in the first arg slot. // After calling this, the result will be in the first arg slot.
switch (method->fn.primitive(vm, fiber, args)) switch (method->fn.primitive(vm, fiber, args))
{ {