Skip to content

Fix #470: Store warp mode in procedure call tree #481

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

Merged
merged 1 commit into from
Feb 10, 2024
Merged

Fix #470: Store warp mode in procedure call tree #481

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
9 changes: 4 additions & 5 deletions src/engine/virtualmachine_p.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,9 @@ unsigned int *VirtualMachinePrivate::run(unsigned int *pos, bool reset)
atEnd = true;
return pos;
} else {
if (callTree.size() == 1)
warp = false;

pos = callTree.back();
const auto &oldState = callTree.back();
pos = oldState.first;
warp = oldState.second;
callTree.pop_back();
procedureArgTree.pop_back();
if (procedureArgTree.empty())
Expand Down Expand Up @@ -797,7 +796,7 @@ unsigned int *VirtualMachinePrivate::run(unsigned int *pos, bool reset)
unsigned int *procedurePos = procedures[pos[1]];

if (procedurePos) {
callTree.push_back(++pos);
callTree.push_back({ ++pos, warp });
procedureArgs = nextProcedureArgs;
nextProcedureArgs = nullptr;
pos = procedurePos;
Expand Down
2 changes: 1 addition & 1 deletion src/engine/virtualmachine_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ struct VirtualMachinePrivate
bool running = false;
bool atEnd = false;
std::vector<Loop> loops;
std::vector<unsigned int *> callTree;
std::vector<std::pair<unsigned int *, bool>> callTree;
std::vector<std::vector<Value>> procedureArgTree;
std::vector<Value> *procedureArgs = nullptr;
std::vector<Value> *nextProcedureArgs = nullptr;
Expand Down
21 changes: 21 additions & 0 deletions test/virtual_machine/virtual_machine_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1466,6 +1466,27 @@ TEST(VirtualMachineTest, RunProcedures)
ASSERT_EQ(vm.registerCount(), 0);
}

TEST(VirtualMachineTest, RunNestedWarpProcedures)
{
static unsigned int bytecode[] = { OP_START, OP_INIT_PROCEDURE, OP_CALL_PROCEDURE, 0, OP_HALT };
static unsigned int procedure1[] = { OP_START, OP_INIT_PROCEDURE, OP_CALL_PROCEDURE, 1, OP_CONST, 0, OP_REPEAT_LOOP, OP_BREAK_FRAME, OP_LOOP_END, OP_HALT };
static unsigned int procedure2[] = { OP_START, OP_WARP, OP_CONST, 0, OP_REPEAT_LOOP, OP_BREAK_FRAME, OP_LOOP_END, OP_HALT };
static unsigned int *procedures[] = { procedure1, procedure2 };
static Value constValues[] = { 1 };

VirtualMachine vm;
vm.setBytecode(bytecode);
vm.setProcedures(procedures);
vm.setConstValues(constValues);
vm.run();
ASSERT_FALSE(vm.atEnd()); // the procedure should still run in warp mode even after running a warp procedure (#470)
ASSERT_EQ(vm.registerCount(), 0);

vm.run();
ASSERT_TRUE(vm.atEnd());
ASSERT_EQ(vm.registerCount(), 0);
}

TEST(VirtualMachineTest, RunUndefinedProcedure)
{
static unsigned int bytecode[] = {
Expand Down