Make max number of instructions configurable

Author: MoritzGoeckel

mfiles/raylib.m

@@ -14,11 +14,13 @@
 let EndDrawing = extern raylib::EndDrawing(): Void;
 
 let DrawText = extern raylib::DrawText(text: String, x: Int, y: Int, fontSize: Int, color: Int): Void;
+let DrawRectangle = extern raylib::DrawRectangle(x: Int, y: Int, width: Int, height: Int, color: Int): Void;
 
 while(WindowShouldClose() == false) {
     BeginDrawing();
-    ClearBackground(1);
-    DrawText(str, 190, 200, 20, 1);
+    ClearBackground(9000);
+    DrawText(str, 200, 200, 5, 7000);
+    DrawRectangle(100, 100, 150, 150, 7000);
     EndDrawing();
 }
 

src/core/Mlang.cpp

@@ -158,7 +158,7 @@ Mlang::Result Mlang::execute(const std::string& theFile,
     auto program = byteCodeEmitter.getProgram();
     executor::ByteCodeVM runner(program);
     runner.setDebug(settings.showExecution);
-    auto result = runner.execute();
+    auto result = runner.execute(settings.maxInstructions);
 
     return Mlang::Result(Mlang::Result::Signal::Success, result);
 }

src/core/Mlang.h

@@ -45,6 +45,7 @@ class Mlang {
         bool showEmission = false;
         bool showTypeInference = false;
         bool showExecution = false;
+        size_t maxInstructions = 0; // 0 means no limit
     };
 
     Settings settings;

src/executer/ByteCode.cpp

@@ -87,7 +87,7 @@ std::string instructionsToString(const std::vector<Instruction>& instructions, b
 }
 
 ProgramState ByteCodeVM::run(size_t maxInstructions) {
-    for (size_t instructionCount = 0; instructionCount < maxInstructions; ++instructionCount) {
+    for (size_t instructionCount = 0; instructionCount < maxInstructions || maxInstructions == 0; ++instructionCount) {
         if (idx >= program.code.size()) {
             throwConstraintViolated("ByteCodeVM: Instruction index out of bounds");
         }
@@ -147,7 +147,6 @@ ProgramState ByteCodeVM::run(size_t maxInstructions) {
                 // LOCALL ID
                 ASSURE(!callstack.empty(), "ByteCodeVM: Empty callstack");
                 auto& locals = callstack.back().locals;
-                std::cout << "locals.size()=" << locals.size() << " arg1=" << inst.arg1 << " callstack.size()=" << callstack.size() << std::endl;
                 ASSURE(inst.arg1 < locals.size(), "ByteCodeVM: Local variable index out of bounds");
                 stack.push(locals[inst.arg1]); // Push local variable onto stack
                 break;

src/executer/ByteCode.h

@@ -161,7 +161,7 @@ class ByteCodeVM {
     public:
     ByteCodeVM(const Program& program);
     void setDebug(bool debug) { this->debug = debug; }
-    std::string execute(size_t maxInstructions = 1000);
+    std::string execute(size_t maxInstructions);
 
 };
 

src/executer/ExternalFunctions.cpp

@@ -89,6 +89,7 @@ qword_t ExternalFunctions::call(size_t id, const Arguments& args) {
     // then follow by the rest of the arguments on the stack
     // Floats go into XMM0 - XMM3
 
+    // This is AT&T (AT&T syntax) assembly code for x64 Windows
     qword_t result;
     __asm__ volatile (
         "movq %[args_tag], %%R10\n" // Bring arg pointer into R10
@@ -217,6 +218,7 @@ qword_t ExternalFunctions::call(size_t id, const Arguments& args) {
     // The result is returned in rax
     // If we need more than 6 arguments, the rest are passed on the stack. (?)
 
+    // This is ATT (AT&T syntax) assembly code for x86_64 Linux
     qword_t result;
     __asm__ volatile (
         "movq %[args_tag], %%R10\n" // Bring arg pointer into R10

src/mains/MLang.cpp

@@ -23,6 +23,8 @@ int main(int argc, char** argv) {
     mlang.settings.showInferedTypes = false;
     mlang.settings.showFunctions = false;
     mlang.settings.showEmission = false;
+    mlang.settings.showExecution = false;
+    mlang.settings.maxInstructions = 0; // 0 means no limit
     // TODO: Config params from cmd
 
     int exitCode = 0;

src/mains/Tests.cpp

@@ -110,6 +110,7 @@ void testFile(std::string path){
     mlang.settings.showEmission = true;
     mlang.settings.showExecution = true;
     mlang.settings.showTypeInference = true;
+    mlang.settings.maxInstructions = 1000;
 
     auto rs = mlang.executeFile(path);