Skip to content

Rename bytecode functions from do's to register's #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rename bytecode functions from do's to register's #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions helpers/BytecodeHelpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,57 +99,57 @@ void compileFunction(VM *vm, Function *function) {
}
}

int64_t doNop(RuntimeBuilder *rb, IlBuilder *b)
int64_t registerNop(RuntimeBuilder *rb, IlBuilder *b)
{
rb->DefaultFallthrough(b, b->ConstInt64(1));
return 0;
}

int64_t doPushConstant(RuntimeBuilder *rb, IlBuilder *b)
int64_t registerPushConstant(RuntimeBuilder *rb, IlBuilder *b)
{
IlValue *constant = rb->GetInt64Immediate(b, b->ConstInt64(1));
push(rb, b, constant);
rb->DefaultFallthrough(b, b->ConstInt64(9));
return 0;
}

int64_t doPushArg(RuntimeBuilder *rb, IlBuilder *b) {
int64_t registerPushArg(RuntimeBuilder *rb, IlBuilder *b) {
IlValue *argIndex = rb->GetInt64Immediate(b, b->ConstInt64(1));
IlValue *arg = getArg(rb, b, argIndex);
push(rb, b, arg);
rb->DefaultFallthrough(b, b->ConstInt64(9));
return 0;
}

int64_t doPushLocal(RuntimeBuilder *rb, IlBuilder *b) {
int64_t registerPushLocal(RuntimeBuilder *rb, IlBuilder *b) {
IlValue *localIndex = rb->GetInt64Immediate(b, b->ConstInt64(1));
IlValue *local = getLocal(rb, b, localIndex);
push(rb, b, local);
rb->DefaultFallthrough(b, b->ConstInt64(9));
return 0;
}

int64_t doPop(RuntimeBuilder *rb, IlBuilder *b) {
int64_t registerPop(RuntimeBuilder *rb, IlBuilder *b) {
pop(rb, b);
rb->DefaultFallthrough(b, b->ConstInt64(1));
return 0;
}

int64_t doPopLocal(RuntimeBuilder *rb, IlBuilder *b) {
int64_t registerPopLocal(RuntimeBuilder *rb, IlBuilder *b) {
IlValue *localIndex = rb->GetInt64Immediate(b, b->ConstInt64(1));
IlValue *local = pop(rb, b);
setLocal(rb, b, localIndex, local);
rb->DefaultFallthrough(b, b->ConstInt64(9));
return 0;
}

int64_t doDup(RuntimeBuilder *rb, IlBuilder *b) {
int64_t registerDup(RuntimeBuilder *rb, IlBuilder *b) {
dup(rb, b);
rb->DefaultFallthrough(b, b->ConstInt64(1));
return 0;
}

int64_t doAdd(RuntimeBuilder *rb, IlBuilder *b) {
int64_t registerAdd(RuntimeBuilder *rb, IlBuilder *b) {
//TODO switch all IlValue * to named tmps for all operations
IlValue *right = pop(rb, b);
IlValue *left = pop(rb, b);
Expand All @@ -159,7 +159,7 @@ int64_t doAdd(RuntimeBuilder *rb, IlBuilder *b) {
return 0;
}

int64_t doSub(RuntimeBuilder *rb, IlBuilder *b) {
int64_t registerSub(RuntimeBuilder *rb, IlBuilder *b) {
IlValue *right = pop(rb, b);
IlValue *left = pop(rb, b);
IlValue *res = b->Sub(left, right);
Expand All @@ -168,7 +168,7 @@ int64_t doSub(RuntimeBuilder *rb, IlBuilder *b) {
return 0;
}

int64_t doMul(RuntimeBuilder *rb, IlBuilder *b) {
int64_t registerMul(RuntimeBuilder *rb, IlBuilder *b) {
IlValue *right = pop(rb, b);
IlValue *left = pop(rb, b);
IlValue *res = b->Mul(left, right);
Expand All @@ -177,7 +177,7 @@ int64_t doMul(RuntimeBuilder *rb, IlBuilder *b) {
return 0;
}

int64_t doDiv(RuntimeBuilder *rb, IlBuilder *b) {
int64_t registerDiv(RuntimeBuilder *rb, IlBuilder *b) {
IlValue *right = pop(rb, b);
IlValue *left = pop(rb, b);
IlValue *res = b->Div(left, right);
Expand All @@ -186,7 +186,7 @@ int64_t doDiv(RuntimeBuilder *rb, IlBuilder *b) {
return 0;
}

int64_t doMod(RuntimeBuilder *rb, IlBuilder *b) {
int64_t registerMod(RuntimeBuilder *rb, IlBuilder *b) {
IlValue *right = pop(rb, b);
IlValue *left = pop(rb, b);
IlValue *res = b->Rem(left, right);
Expand All @@ -195,13 +195,13 @@ int64_t doMod(RuntimeBuilder *rb, IlBuilder *b) {
return 0;
}

int64_t doJMP(RuntimeBuilder *rb, IlBuilder *b) {
int64_t registerJMP(RuntimeBuilder *rb, IlBuilder *b) {
IlValue *target = rb->GetInt64Immediate(b, b->ConstInt64(1));
rb->Jump(b, target, true);
return 0;
}

int64_t doJMPE(RuntimeBuilder *rb, IlBuilder *b) {
int64_t registerJMPE(RuntimeBuilder *rb, IlBuilder *b) {
IlValue *right = pop(rb, b);
IlValue *left = pop(rb, b);
IlValue *condition = b->EqualTo(left, right);
Expand All @@ -210,7 +210,7 @@ int64_t doJMPE(RuntimeBuilder *rb, IlBuilder *b) {
return 0;
}

int64_t doJMPL(RuntimeBuilder *rb, IlBuilder *b) {
int64_t registerJMPL(RuntimeBuilder *rb, IlBuilder *b) {
IlValue *right = pop(rb, b);
IlValue *left = pop(rb, b);
IlValue *condition = b->LessThan(left, right);
Expand All @@ -219,7 +219,7 @@ int64_t doJMPL(RuntimeBuilder *rb, IlBuilder *b) {
return 0;
}

int64_t doJMPG(RuntimeBuilder *rb, IlBuilder *b) {
int64_t registerJMPG(RuntimeBuilder *rb, IlBuilder *b) {
IlValue *right = pop(rb, b);
IlValue *left = pop(rb, b);
IlValue *condition = b->GreaterThan(left, right);
Expand All @@ -228,7 +228,7 @@ int64_t doJMPG(RuntimeBuilder *rb, IlBuilder *b) {
return 0;
}

int64_t doCall(RuntimeBuilder *rb, IlBuilder *b) {
int64_t registerCall(RuntimeBuilder *rb, IlBuilder *b) {
IlValue *functionID = rb->GetInt64Immediate(b, b->ConstInt64(1));
IlValue *argCount = rb->GetInt64Immediate(b, b->ConstInt64(9));

Expand Down Expand Up @@ -310,7 +310,7 @@ int64_t doCall(RuntimeBuilder *rb, IlBuilder *b) {
return 0;
}

int64_t doRet(RuntimeBuilder *rb, IlBuilder *b)
int64_t registerRet(RuntimeBuilder *rb, IlBuilder *b)
{
b->Store("return_retVal", pop(rb, b));
b->StoreIndirect("VM", "frame",
Expand All @@ -330,7 +330,7 @@ int64_t doRet(RuntimeBuilder *rb, IlBuilder *b)
return 1;
}

int64_t doPrintString(RuntimeBuilder *rb, IlBuilder *b) {
int64_t registerPrintString(RuntimeBuilder *rb, IlBuilder *b) {
IlValue *vm = b->Load("vm");
IlValue *stringID = rb->GetInt64Immediate(b, b->ConstInt64(1));
IlValue *stringVal =
Expand All @@ -344,19 +344,19 @@ int64_t doPrintString(RuntimeBuilder *rb, IlBuilder *b) {
return 0;
}

int64_t doPrintInt64(RuntimeBuilder *rb, IlBuilder *b) {
int64_t registerPrintInt64(RuntimeBuilder *rb, IlBuilder *b) {
b->Call("printInt64", 1, pop(rb, b));
rb->DefaultFallthrough(b, b->ConstInt64(1));
return 0;
}

int64_t doCurrentTime(RuntimeBuilder *rb, IlBuilder *b) {
int64_t registerCurrentTime(RuntimeBuilder *rb, IlBuilder *b) {
push(rb, b, b->Call("getCurrentTime", 0));
rb->DefaultFallthrough(b, b->ConstInt64(1));
return 0;
}

int64_t doHalt(RuntimeBuilder *rb, IlBuilder *b)
int64_t registerHalt(RuntimeBuilder *rb, IlBuilder *b)
{
b->Call("exit", 1, b->ConstInt32(0));
return 1;
Expand Down
44 changes: 22 additions & 22 deletions helpers/BytecodeHelpers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,28 +59,28 @@ void setLocal(RuntimeBuilder *rb, IlBuilder *builder, IlValue *localIndex, IlVal
int64_t invokedCompiledFunction(VM *vm, Function *function, int64_t*args);
void compileFunction(VM *vm, Function *function);

int64_t doNop(RuntimeBuilder *rb, IlBuilder *b);
int64_t doPushConstant(RuntimeBuilder *rb, IlBuilder *b);
int64_t doPushArg(RuntimeBuilder *rb, IlBuilder *b);
int64_t doPushLocal(RuntimeBuilder *rb, IlBuilder *b);
int64_t doPop(RuntimeBuilder *rb, IlBuilder *b);
int64_t doPopLocal(RuntimeBuilder *rb, IlBuilder *b);
int64_t doDup(RuntimeBuilder *rb, IlBuilder *b);
int64_t doAdd(RuntimeBuilder *rb, IlBuilder *b);
int64_t doSub(RuntimeBuilder *rb, IlBuilder *b);
int64_t doMul(RuntimeBuilder *rb, IlBuilder *b);
int64_t doDiv(RuntimeBuilder *rb, IlBuilder *b);
int64_t doMod(RuntimeBuilder *rb, IlBuilder *b);
int64_t doJMP(RuntimeBuilder *rb, IlBuilder *b);
int64_t doJMPE(RuntimeBuilder *rb, IlBuilder *b);
int64_t doJMPL(RuntimeBuilder *rb, IlBuilder *b);
int64_t doJMPG(RuntimeBuilder *rb, IlBuilder *b);
int64_t doCall(RuntimeBuilder *rb, IlBuilder *b);
int64_t doRet(RuntimeBuilder *rb, IlBuilder *b);
int64_t doPrintString(RuntimeBuilder *rb, IlBuilder *b);
int64_t doPrintInt64(RuntimeBuilder *rb, IlBuilder *b);
int64_t doCurrentTime(RuntimeBuilder *rb, IlBuilder *b);
int64_t doHalt(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerNop(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerPushConstant(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerPushArg(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerPushLocal(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerPop(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerPopLocal(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerDup(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerAdd(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerSub(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerMul(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerDiv(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerMod(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerJMP(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerJMPE(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerJMPL(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerJMPG(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerCall(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerRet(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerPrintString(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerPrintInt64(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerCurrentTime(RuntimeBuilder *rb, IlBuilder *b);
int64_t registerHalt(RuntimeBuilder *rb, IlBuilder *b);

class InterpreterVMState: public VirtualMachineState {
public:
Expand Down
Loading