Added the correct version to --version funktion

add drop (idk if it is working right)
add prog5 and prog6

Makefile

@@ -0,0 +1,29 @@
+# Makefile for a simple C program
+
+# Compiler
+CC = gcc
+
+# Compiler flags
+CFLAGS = -g -Wall -std=c99 -pedantic
+
+# Source file
+SRC = njvm.c
+
+# Executable name
+TARGET = njvm
+
+# Default target
+all: 
+	$(CC) $(CFLAGS) -o $(TARGET) $(SRC)
+# Clean up
+clean:
+	rm -f $(OBJ) $(TARGET)
+
+run: all
+	./$(TARGET)
+
+nja:	./nja/nja$(V)
+	./nja/nja$(V) $(IN) $(OUT)
+
+njc: ./njc/njc$(V)
+	./njc/njc$(V) $(IN) $(OUT)

SDA.c

@@ -6,21 +6,22 @@
 #include <stdio.h>
 
 struct sda {
-    int *size;
     unsigned int *sda;
+    int size;
 };
 
-unsigned int getSDA(int i, struct sda s) {
-    return s.sda[i];
+int getSDA(unsigned int offset, struct sda *sda) {
+    return sda->sda[offset];
 }
 
-void setSDA(int point, int val, struct sda s) {
-    s.sda[point] = val;
+void setSDA(unsigned int offset, int value, struct sda *sda) {
+    sda->sda[offset] = value;
 }
 
-void printSDA(struct sda s) {
-    for (int i = 0; i < *s.size; i++) {
-        printf("%i\n", getSDA(i, s));
+void printSDA(struct sda *sda) {
+    printf("SDA:\n");
+    for (int i = 0; i < sda->size; ++i) {
+        printf("[%d] = %d\n", i, sda->sda[i]);
     }
 }
 

codeReader.c

@@ -6,13 +6,13 @@
 #include <stdlib.h>
 #include "program.c"
 
-unsigned int fromFile(char *path, struct program program) {
+unsigned int fromFile(char *path, struct program *program) {
     unsigned int countInstructions;
     unsigned int staticVars;
     FILE *fptr;
-    fptr = fopen(path, "r+b");
+    fptr = fopen(path, "r");
     if (fptr == NULL) {
-        printf("Error: cannot open code file %s", path);
+        printf("Error: cannot open code file %s\n", path);
         exit(EXIT_FAILURE);
     }
     unsigned int buffer[4];

consts.c

@@ -1,7 +1,5 @@
 #ifndef CONSTS
 #define CONSTS
-#define VERSION 2
+#define VERSION 4
 
-#endif /* ifndef CONSTS
-#define CONSTS
-#define VERSION 2; */
+#endif 

instruktion.c

@@ -22,5 +22,17 @@
 #define RSF 14
 #define PUSHL 15
 #define POPL 16
+#define EQ 17
+#define NE 18
+#define LT 19
+#define LE 20
+#define GT 21
+#define GE 22
+#define JMP 23
+#define BRF 24
+#define BRT 25
+#define CALL 26
+#define RET 27
+#define DROP 28
 
 #endif /* ifndef INSREUKTION */

nja/nja4

@@ -0,0 +1,13 @@
+--2024-01-14 15:04:22--  https://git.thm.de/arin07/KSP_public/-/raw/master/aufgaben/a4/nja?inline=false
+Loaded CA certificate '/etc/ssl/certs/ca-certificates.crt'
+Resolving git.thm.de (git.thm.de)... 212.201.6.138
+Connecting to git.thm.de (git.thm.de)|212.201.6.138|:443... connected.
+HTTP request sent, awaiting response... 200 OK
+Length: 56947 (56K) [application/octet-stream]
+Saving to: ‘nja?inline=false’
+
+     0K .......... .......... .......... .......... .......... 89% 1.02M 0s
+    50K .....                                                 100% 18.3M=0.05s
+
+2024-01-14 15:04:22 (1.13 MB/s) - ‘nja?inline=false’ saved [56947/56947]
+

nja/nja5

@@ -0,0 +1,13 @@
+--2024-01-14 15:04:59--  https://git.thm.de/arin07/KSP_public/-/raw/master/aufgaben/a5/nja?inline=false
+Loaded CA certificate '/etc/ssl/certs/ca-certificates.crt'
+Resolving git.thm.de (git.thm.de)... 212.201.6.138
+Connecting to git.thm.de (git.thm.de)|212.201.6.138|:443... connected.
+HTTP request sent, awaiting response... 200 OK
+Length: 56947 (56K) [application/octet-stream]
+Saving to: ‘nja?inline=false’
+
+     0K .......... .......... .......... .......... .......... 89% 1.07M 0s
+    50K .....                                                 100% 18.4M=0.05s
+
+2024-01-14 15:05:00 (1.18 MB/s) - ‘nja?inline=false’ saved [56947/56947]
+

nja/nja6

@@ -0,0 +1,13 @@
+--2024-01-14 15:05:08--  https://git.thm.de/arin07/KSP_public/-/raw/master/aufgaben/a6/nja?inline=false
+Loaded CA certificate '/etc/ssl/certs/ca-certificates.crt'
+Resolving git.thm.de (git.thm.de)... 212.201.6.138
+Connecting to git.thm.de (git.thm.de)|212.201.6.138|:443... connected.
+HTTP request sent, awaiting response... 200 OK
+Length: 56947 (56K) [application/octet-stream]
+Saving to: ‘nja?inline=false.1’
+
+     0K .......... .......... .......... .......... .......... 89% 1.04M 0s
+    50K .....                                                 100% 25.8M=0.05s
+
+2024-01-14 15:05:08 (1.15 MB/s) - ‘nja?inline=false.1’ saved [56947/56947]
+

nja/nja7

@@ -0,0 +1,13 @@
+--2024-01-14 15:05:15--  https://git.thm.de/arin07/KSP_public/-/raw/master/aufgaben/a7/nja?inline=false
+Loaded CA certificate '/etc/ssl/certs/ca-certificates.crt'
+Resolving git.thm.de (git.thm.de)... 212.201.6.138
+Connecting to git.thm.de (git.thm.de)|212.201.6.138|:443... connected.
+HTTP request sent, awaiting response... 200 OK
+Length: 57195 (56K) [application/octet-stream]
+Saving to: ‘nja?inline=false.2’
+
+     0K .......... .......... .......... .......... .......... 89% 1.23M 0s
+    50K .....                                                 100% 11.7M=0.04s
+
+2024-01-14 15:05:16 (1.36 MB/s) - ‘nja?inline=false.2’ saved [57195/57195]
+

nja/nja8

@@ -0,0 +1,13 @@
+--2024-01-14 15:05:26--  https://git.thm.de/arin07/KSP_public/-/raw/master/aufgaben/a8/nja?inline=false
+Loaded CA certificate '/etc/ssl/certs/ca-certificates.crt'
+Resolving git.thm.de (git.thm.de)... 212.201.6.138
+Connecting to git.thm.de (git.thm.de)|212.201.6.138|:443... connected.
+HTTP request sent, awaiting response... 200 OK
+Length: 57195 (56K) [application/octet-stream]
+Saving to: ‘nja?inline=false.3’
+
+     0K .......... .......... .......... .......... .......... 89% 1.22M 0s
+    50K .....                                                 100% 14.5M=0.04s
+
+2024-01-14 15:05:27 (1.35 MB/s) - ‘nja?inline=false.3’ saved [57195/57195]
+

njc/njc4

@@ -0,0 +1,14 @@
+--2024-01-14 15:07:13--  https://git.thm.de/arin07/KSP_public/-/raw/master/aufgaben/a4/njc?inline=false
+Loaded CA certificate '/etc/ssl/certs/ca-certificates.crt'
+Resolving git.thm.de (git.thm.de)... 212.201.6.138
+Connecting to git.thm.de (git.thm.de)|212.201.6.138|:443... connected.
+HTTP request sent, awaiting response... 200 OK
+Length: 137095 (134K) [application/octet-stream]
+Saving to: ‘njc?inline=false’
+
+     0K .......... .......... .......... .......... .......... 37% 1.23M 0s
+    50K .......... .......... .......... .......... .......... 74% 2.63M 0s
+   100K .......... .......... .......... ...                  100% 9.98M=0.06s
+
+2024-01-14 15:07:14 (2.13 MB/s) - ‘njc?inline=false’ saved [137095/137095]
+

njc/njc5

@@ -0,0 +1,14 @@
+--2024-01-14 15:07:20--  https://git.thm.de/arin07/KSP_public/-/raw/master/aufgaben/a5/njc?inline=false
+Loaded CA certificate '/etc/ssl/certs/ca-certificates.crt'
+Resolving git.thm.de (git.thm.de)... 212.201.6.138
+Connecting to git.thm.de (git.thm.de)|212.201.6.138|:443... connected.
+HTTP request sent, awaiting response... 200 OK
+Length: 137095 (134K) [application/octet-stream]
+Saving to: ‘njc?inline=false.1’
+
+     0K .......... .......... .......... .......... .......... 37% 1.21M 0s
+    50K .......... .......... .......... .......... .......... 74% 2.51M 0s
+   100K .......... .......... .......... ...                  100% 11.2M=0.06s
+
+2024-01-14 15:07:21 (2.08 MB/s) - ‘njc?inline=false.1’ saved [137095/137095]
+

njc/njc6

@@ -0,0 +1,14 @@
+--2024-01-14 15:07:28--  https://git.thm.de/arin07/KSP_public/-/raw/master/aufgaben/a6/njc?inline=false
+Loaded CA certificate '/etc/ssl/certs/ca-certificates.crt'
+Resolving git.thm.de (git.thm.de)... 212.201.6.138
+Connecting to git.thm.de (git.thm.de)|212.201.6.138|:443... connected.
+HTTP request sent, awaiting response... 200 OK
+Length: 137095 (134K) [application/octet-stream]
+Saving to: ‘njc?inline=false.2’
+
+     0K .......... .......... .......... .......... .......... 37% 1.02M 0s
+    50K .......... .......... .......... .......... .......... 74% 2.03M 0s
+   100K .......... .......... .......... ...                  100% 11.4M=0.07s
+
+2024-01-14 15:07:28 (1.74 MB/s) - ‘njc?inline=false.2’ saved [137095/137095]
+

njc/njc7

@@ -0,0 +1,15 @@
+--2024-01-14 15:07:49--  https://git.thm.de/arin07/KSP_public/-/raw/master/aufgaben/a7/njc?inline=false
+Loaded CA certificate '/etc/ssl/certs/ca-certificates.crt'
+Resolving git.thm.de (git.thm.de)... 212.201.6.138
+Connecting to git.thm.de (git.thm.de)|212.201.6.138|:443... connected.
+HTTP request sent, awaiting response... 200 OK
+Length: 166681 (163K) [application/octet-stream]
+Saving to: ‘njc?inline=false.6’
+
+     0K .......... .......... .......... .......... .......... 30% 1.04M 0s
+    50K .......... .......... .......... .......... .......... 61% 2.13M 0s
+   100K .......... .......... .......... .......... .......... 92% 11.2M 0s
+   150K .......... ..                                         100% 14.2M=0.08s
+
+2024-01-14 15:07:49 (2.11 MB/s) - ‘njc?inline=false.6’ saved [166681/166681]
+

njc/njc8

@@ -0,0 +1,15 @@
+--2024-01-14 15:07:46--  https://git.thm.de/arin07/KSP_public/-/raw/master/aufgaben/a8/njc?inline=false
+Loaded CA certificate '/etc/ssl/certs/ca-certificates.crt'
+Resolving git.thm.de (git.thm.de)... 212.201.6.138
+Connecting to git.thm.de (git.thm.de)|212.201.6.138|:443... connected.
+HTTP request sent, awaiting response... 200 OK
+Length: 166681 (163K) [application/octet-stream]
+Saving to: ‘njc?inline=false.5’
+
+     0K .......... .......... .......... .......... .......... 30% 1.20M 0s
+    50K .......... .......... .......... .......... .......... 61% 2.53M 0s
+   100K .......... .......... .......... .......... .......... 92% 6.70M 0s
+   150K .......... ..                                         100% 8.97M=0.07s
+
+2024-01-14 15:07:47 (2.31 MB/s) - ‘njc?inline=false.5’ saved [166681/166681]
+

njvm.c

@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include "consts.c"
 #include "instruktion.c"
 #include "code.c"
 #include "stack.c"
@@ -7,165 +8,338 @@
 #include "codeReader.c"
 #include "SDA.c"
 
-//Comment to disable debug
-
-#define DEBUG
-
-// Stack
-struct stack stack;
-#define SIZE 1000
-
 // Program
-struct program program;
+struct program *program;
 
 // SDA
-struct sda sda;
-unsigned fp;
+int fp;
+int debug = 0;
 
 void version(void) {
-    printf("Ninja Virtual Machine version %i (compiled %s, %s)\n", 0, __DATE__, __TIME__);
+    printf("Ninja Virtual Machine version %i (compiled %s, %s)\n", VERSION, __DATE__, __TIME__);
 }
 
 void help(void) {
     printf("Usage: ./njvm [options] <code file>\n\t--debug\tstart virtual machine in debug mode\n\t--version\tshow version and exit\n\t--help\t\tshow this help and exit\n");
 }
 
-void execute(struct program program) {
-    int i;
+void execute(struct program *program, struct sda *sda) {
+    struct stack stack;
+    stack.size = 1000;
+    stack.currentFrame = 0;
+    struct stack callStack;
+    callStack.size = 1000;
+    callStack.currentFrame = 0;
+
+    for (int i = 0; i < stack.size; ++i) {
+        struct stackFrame *frame = malloc(sizeof(struct stackFrame));
+        frame->fp = malloc(sizeof(int) * stack.size);
+        frame->sp = malloc(sizeof(int) * stack.size);
+        frame->bp = NULL;
+        stack.frames[i] = frame;
+    }
+
+    for (int i = 0; i < callStack.size; ++i) {
+        struct stackFrame *frame = malloc(sizeof(struct stackFrame));
+        frame->fp = malloc(sizeof(int) * stack.size);
+        frame->sp = malloc(sizeof(int) * stack.size);
+        frame->bp = NULL;
+        callStack.frames[i] = frame;
+    }
+
+    struct stackFrame *currentFrame = NULL;
+    //struct stackFrame *currentCallFrame = NULL;
+    unsigned int tmp;
     int intInput;
-    unsigned int temp;
     char charInput;
-    for (i = 0; i < *program.size; ++i) {
-        switch (program.program[i] >> 24) {
+
+    for (int i = 0; i < program->size; ++i) {
+        unsigned int instruction = program->program[i];
+        if (i >= program->size) {
+            printf("Error: Jump out of program memory\n");
+            goto end;
+        }
+
+        switch (instruction >> 24) {
             case HALT:
                 goto end;
             case PUSHC:
-                push(stack, SIGN_EXTEND(IMMEDIATE(program.program[i])));
+                if (debug == 1) printf("PUSHC %d\n", SIGN_EXTEND(IMMEDIATE(instruction)));
+                push(&stack, SIGN_EXTEND(IMMEDIATE(instruction)));
                 break;
             case ADD:
-                push(stack, pop(stack) + pop(stack));
+                if (debug == 1) printf("ADD\n");
+                push(&stack, pop(&stack) + pop(&stack));
                 break;
             case SUB:
-                temp = pop(stack);
-                push(stack, pop(stack) - temp);
+                tmp = pop(&stack);
+                if (debug == 1) printf("SUB\n");
+                if (debug == 1) printf("tmp: %d\n", tmp);
+                push(&stack, pop(&stack) - tmp);
                 break;
             case MUL:
-                push(stack, pop(stack) * pop(stack));
+                if (debug == 1) printf("MUL\n");
+                push(&stack, pop(&stack) * pop(&stack));
                 break;
             case DIV:
-                temp = pop(stack);
-                push(stack, pop(stack) / temp);
+                tmp = pop(&stack);
+                if (debug == 1) printf("DIV\n");
+                if (debug == 1) printf("tmp: %d\n", tmp);
+                push(&stack, pop(&stack) / tmp);
                 break;
             case MOD:
-                temp = pop(stack);
-                push(stack, pop(stack) % temp);
+                tmp = pop(&stack);
+                if (debug == 1) printf("MOD\n");
+                if (debug == 1) printf("tmp: %d\n", tmp);
+                push(&stack, pop(&stack) % tmp);
                 break;
             case RDINT:
                 scanf("%i", &intInput);
-                push(stack, intInput);
+                if (debug == 1) printf("RDINT %d\n", intInput);
+                push(&stack, intInput);
                 break;
             case WRINT:
-                printf("%i", pop(stack));
+                if (debug == 1) printf("WRINT\n");
+                printf("%i", pop(&stack));
                 break;
             case RDCHR:
                 scanf("%c", &charInput);
-                push(stack, charInput);
+                if (debug == 1) printf("RDCHR %c\n", charInput);
+                push(&stack, charInput);
                 break;
             case WRCHR:
-                printf("%c", pop(stack));
+                if (debug == 1) printf("WRCHR\n");
+                printf("%c", pop(&stack));
                 break;
             case PUSHG:
-                push(stack, getSDA(SIGN_EXTEND(IMMEDIATE(program.program[i])), sda));
+                if (debug == 1) printf("PUSHG %d\n", SIGN_EXTEND(IMMEDIATE(instruction)));
+                currentFrame = stack.frames[stack.currentFrame];
+                currentFrame->bp = currentFrame->sp;
+
+                *currentFrame->sp++ = getSDA(SIGN_EXTEND(IMMEDIATE(instruction)), sda);
                 break;
             case POPG:
-                setSDA(SIGN_EXTEND(IMMEDIATE(program.program[i])), pop(stack), sda);
+                if (debug == 1) printf("POPG %d\n", SIGN_EXTEND(IMMEDIATE(instruction)));
+                currentFrame = stack.frames[stack.currentFrame];
+                currentFrame->bp = currentFrame->sp;
+
+                setSDA(SIGN_EXTEND(IMMEDIATE(instruction)), pop(&stack), sda);
                 break;
             case ASF:
-                push(stack, *stack.current);
-                fp = *stack.current;
-                *stack.current = *stack.current + SIGN_EXTEND(IMMEDIATE(program.program[i]));
+                if (debug == 1) printf("ASF %d\n", SIGN_EXTEND(IMMEDIATE(instruction)));
+                currentFrame = stack.frames[stack.currentFrame];
+                push(&stack, *currentFrame->sp);
+                *currentFrame->sp = stack.currentFrame;
+                currentFrame->bp = currentFrame->sp;
+
+                stack.currentFrame += SIGN_EXTEND(IMMEDIATE(instruction));
                 break;
             case RSF:
-                *stack.current = fp;
-                fp = pop(stack);
+                if (debug == 1) printf("RSF\n");
+                stack.currentFrame = pop(&stack);
+                currentFrame = stack.frames[stack.currentFrame];
+                currentFrame->bp = NULL;
+                break;
             case PUSHL:
-                stack.stack[fp + SIGN_EXTEND(IMMEDIATE(program.program[i]))] = pop(stack);
+                printf("PUSHL %d\n", SIGN_EXTEND(IMMEDIATE(instruction)));
+                currentFrame = stack.frames[stack.currentFrame];
+                currentFrame->bp = currentFrame->sp;
+                int x = SIGN_EXTEND(IMMEDIATE(instruction));
+                push(&stack, currentFrame->fp[x]);
                 break;
             case POPL:
-                push(stack, stack.stack[fp + SIGN_EXTEND(IMMEDIATE(program.program[i]))]);
+                if (debug == 1) printf("POPL %d\n", SIGN_EXTEND(IMMEDIATE(instruction)));
+                currentFrame = stack.frames[stack.currentFrame];
+                currentFrame->fp[SIGN_EXTEND(IMMEDIATE(instruction))] = pop(&stack);
+                break;
+            case EQ:
+                if (debug == 1) printf("EQ\n");
+                if (pop(&stack) == pop(&stack)) {
+                    push(&stack, 1);
+                } else {
+                    push(&stack, 0);
+                }
+                break;
+            case NE:
+                if (debug == 1) printf("NE\n");
+                if (pop(&stack) != pop(&stack)) {
+                    push(&stack, 1);
+                } else {
+                    push(&stack, 0);
+                }
+                break;
+            case LT:
+                if (debug == 1) printf("LT\n");
+                tmp = pop(&stack);
+                if (pop(&stack) < tmp) {
+                    push(&stack, 1);
+                } else {
+                    push(&stack, 0);
+                }
+                break;
+            case LE:
+                if (debug == 1) printf("LE\n");
+                tmp = pop(&stack);
+                if (pop(&stack) <= tmp) {
+                    push(&stack, 1);
+                } else {
+                    push(&stack, 0);
+                }
+                break;
+            case GT:
+                if (debug == 1) printf("GT\n");
+                if (debug == 1) printf("peek(1): %d\n", peek(&stack, 1));
+                if (debug == 1) printf("peek(2): %d\n", peek(&stack, 2));
+                if (debug == 1) printf("peek(1) > peek(2): %d\n", peek(&stack, 2) > peek(&stack, 1));
+                tmp = pop(&stack);
+                if (pop(&stack) > tmp) {
+                    push(&stack, 1);
+                } else {
+                    push(&stack, 0);
+                }
+                break;
+            case GE:
+                if (debug == 1) printf("GE\n");
+                tmp = pop(&stack);
+                if (pop(&stack) >= tmp) {
+                    push(&stack, 1);
+                } else {
+                    push(&stack, 0);
+                }
+                break;
+            case JMP:
+                if (debug == 1) printf("JMP %d\n", SIGN_EXTEND(IMMEDIATE(instruction)));
+                int j = SIGN_EXTEND(IMMEDIATE(program->program[i]));
+                if (debug == 1) printf("JMP %d\n", j);
+                if (j-- >= program->size) {
+                    printf("Error: Jump out of program memory\n");
+                    goto end;
+                }
+                i = j;
+                break;
+            case BRF: // branch on false
+                if (debug == 1) printf("BRF %d\nStack: %d\n", SIGN_EXTEND(IMMEDIATE(instruction)), pop(&stack));
+                if (pop(&stack) == 0) {
+                    int j = SIGN_EXTEND(IMMEDIATE(program->program[i]));
+                    if (j-- >= program->size) {
+                        printf("Error: BRF out of program memory\n");
+                        goto end;
+                    }
+                    i = j;
+                }
+                break;
+            case BRT:
+                if (debug == 1) printf("BRT %d\n", SIGN_EXTEND(IMMEDIATE(instruction)));
+                if (pop(&stack) == 1) {
+                    int j = SIGN_EXTEND(IMMEDIATE(program->program[i]));
+                    if (j-- >= program->size) {
+                        printf("Error: BRT out of program memory\n");
+                        goto end;
+                    }
+                    i = j;
+                }
+                break;
+            case CALL:
+                tmp = SIGN_EXTEND(IMMEDIATE(program->program[i]));
+                if (j-- >= program->size) {
+                    printf("Error: Call out of program memory\n");
+                    goto end;
+                }
+                push(&callStack, i + 1);
+                i = tmp;
+                break;
+            case RET:
+                if (debug == 1) printf("RET\n");
+                tmp = pop(&callStack);
+                if (tmp-- >= program->size) {
+                    printf("Error: Return out of program memory\n");
+                    goto end;
+                }
+                i = tmp;
+                break;
+            case DROP:
+                tmp = SIGN_EXTEND(IMMEDIATE(instruction));
+                if (debug == 1) printf("DROP %d\n", tmp);
+                for (int b = 0; b < tmp; ++b) {
+                    pop(&stack);
+                }
                 break;
         }
     }
+
     end:
     return;
 }
 
-#ifdef DEBUG
-
+// run prog2.bin
 void tests(void) {
-    printf("Runnig debug mode\n");
-    int temp = fromFile("./prog1.bin", program);
-    int sizeSDA = temp;
-    unsigned int s[sizeSDA];
-    sda.size = &temp;
-    sda.sda = s;
-    printProgram(program);
+    printf("Test started\n");
+    /*struct sda *sda = malloc(sizeof(struct sda));
+    unsigned int s[1000];
+    sda->size = 1000;
+    sda->sda = s;
+    fromFile("prog2.bin", program);
+    execute(program, (struct sda *) &sda);*/
+    printf("Test finished\n");
 }
 
-#endif /* ifdef DEBUG */
-
 int main(int argc, char *argv[]) {
     // Initialize the Stack
+    struct stack stack;
     int size = SIZE;
-    int current = 0;
-    unsigned int s[SIZE];
-    stack.size = &size;
-    stack.current = &current;
-    stack.stack = s;
+    stack.size = size;
+    stack.currentFrame = 0;
 
     // Initialize ProgrammSpeicher
-    int psize = 1000;
-    int saveProgram = 0;
+    int psize = SIZE;
     unsigned int p[1000];
-    program.size = &psize;
-    program.program = p;
-    program.saveProgram = &saveProgram;
+    program = malloc(sizeof(struct program));
+    program->size = psize;
+    program->program = p;
 
+    // Initialize runtime variables
+    int run = 0;
+    int sizeSDA;
 
-#ifdef DEBUG
-    tests();
-#endif /* ifdef DEBUG */
     if (argc > 1) {
-        if (strcmp(argv[1], "--version") == 0) {
-            version();
-        } else if (strcmp(argv[1], "--help") == 0) {
-            help();
-        } else if (strcmp(argv[1], "--prog1") == 0) {
-            copyToProgram(code1, sizeof(code1) / sizeof(code1[0]), program);
-            goto run;
-        } else if (strcmp(argv[1], "--prog2") == 0) {
-            copyToProgram(code2, sizeof(code2) / sizeof(code2[0]), program);
-            goto run;
-        } else if (strcmp(argv[1], "--prog3") == 0) {
-            copyToProgram(code3, sizeof(code3) / sizeof(code3[0]), program);
-            goto run;
-        } else {
-            printf("unknown command line argument '%s', try './njvm --help'", argv[1]);
+        for (int i = 1; i < argc; ++i) {
+            if (strcmp(argv[i], "--debug") == 0) {
+                debug = 1;
+            } else if (strcmp(argv[i], "--version") == 0) {
+                version();
+                return 0;
+            } else if (strcmp(argv[i], "--help") == 0) {
+                help();
+                return 0;
+            } else {
+                sizeSDA = fromFile(argv[i], program);
+                run = 1;
+            }
         }
-    } else {
-        run:
-//    Started
-        if (*program.saveProgram == 1) {
-            printf("Ninja Virtual Machine started\n");
-            printProgram(program);
-            execute(program);
-            printSDA(sda);
-        } else {
-            printf("Error: no code file specified\n");
-            return 1;
-        }
-//    Stopped
-        printf("Ninja Virtual Machine stopped\n");
-        return 0;
     }
+
+    /*
+     * Debug mode
+     */
+    if (debug) {
+        tests();
+    }
+
+    /*
+     * Run program
+     */
+    if (run) {
+        printf("Ninja Virtual Machine started\n");
+        struct sda *sda = malloc(sizeof(struct sda));
+        unsigned int s[sizeSDA];
+        sda->size = sizeSDA;
+        sda->sda = s;
+        if (debug == 1) printProgram(program);
+        execute(program, (struct sda *) &sda);
+        printf("Ninja Virtual Machine stopped\n");
+    } else {
+        printf("Error: no code file specified\n");
+        return 1;
+    }
+    return 0;
 }

program.c

@@ -9,23 +9,21 @@
 #include <stdio.h>
 
 struct program {
-    int *size;
     unsigned int *program;
-    int *saveProgram;
+    int size;
 };
 
-void copyToProgram(const unsigned int codeToCopy[], int size, struct program program) {
+void copyToProgram(const unsigned int codeToCopy[], int size, struct program *program) {
     for (int i = 0; i < size; ++i) {
-        program.program[i] = codeToCopy[i];
+        program->program[i] = codeToCopy[i];
     }
-    *program.size = size;
-    *program.saveProgram = 1;
+    program->size = size;
 }
 
-void printProgram(struct program program) {
+void printProgram(struct program *program) {
     char c[10];
-    for (int i = 0; i < *program.size; i++) {
-        switch (program.program[i] >> 24) {
+    for (int i = 0; i < program->size; i++) {
+        switch (program->program[i] >> 24) {
             case PUSHC:
                 strcpy(c, "pushc");
                 break;
@@ -77,11 +75,44 @@ void printProgram(struct program program) {
             case POPL:
                 strcpy(c, "popl");
                 break;
+            case EQ:
+                strcpy(c,"eq");
+                break;
+            case NE:
+                strcpy(c,"ne");
+                break;
+            case LT:
+                strcpy(c,"lt");
+                break;
+            case GT:
+                strcpy(c,"gt");
+                break;
+            case GE:
+                strcpy(c,"ge");
+                break;
+            case JMP:
+                strcpy(c,"jmp");
+                break;
+            case BRF:
+                strcpy(c, "brf");
+                break;
+            case BRT:
+                strcpy(c,"brt");
+                break;
+            case CALL:
+                strcpy(c,"call");
+                break;
+            case RET:
+                strcpy(c,"ret");
+                break;
+            case DROP:
+                strcpy(c,"drop");
+                break;
             default:
                 strcpy(c, "ERROR");
                 break;
         }
-        IMMEDIATE(program.program[i]) ? printf("%03i:\t%s\t%i\n", i, c, SIGN_EXTEND(IMMEDIATE(program.program[i]))) : printf(
+        IMMEDIATE(program->program[i]) ? printf("%03i:\t%s\t%i\n", i, c, SIGN_EXTEND(IMMEDIATE(program->program[i]))) : printf(
                 "%03i:\t%s\n", i, c);
     }
 }

programs/prog-test-1.asm

@@ -0,0 +1,11 @@
+pushc	3
+pushc	4
+add
+pushc	10
+pushc	6
+sub
+mul
+wrint
+pushc	10
+wrchr
+halt

programs/prog-test-2.asm

@@ -0,0 +1,9 @@
+	pushc	-2
+	rdint
+	mul
+	pushc	3
+	add
+	wrint
+	pushc	'\n'
+	wrchr
+	halt

programs/prog-test-3.asm

@@ -0,0 +1,5 @@
+	rdchr
+	wrint
+	pushc	'\n'
+	wrchr
+	halt

programs/prog1.asm

@@ -0,0 +1,31 @@
+//
+// prog1.asm -- an assembler example with global variables
+//
+
+// global Integer x;
+// global Integer y;
+// x = 2;
+// y = x + 3;
+// x = 7 * y + x;
+// writeInteger(x + -33);
+// writeCharacter('\n');
+
+	pushc	2
+	popg	0
+	pushg	0
+	pushc	3
+	add
+	popg	1
+	pushc	7
+	pushg	1
+	mul
+	pushg	0
+	add
+	popg	0
+	pushg	0
+	pushc	-33
+	add
+	wrint
+	pushc	'\n'
+	wrchr
+	halt

programs/prog2.asm

@@ -0,0 +1,33 @@
+//
+// prog2.asm -- an assembler example with local variables
+//
+
+// local Integer x;
+// local Integer y;
+// x = 2;
+// y = x + 3;
+// x = 7 * y + x;
+// writeInteger(x + -33);
+// writeCharacter('\n');
+
+	asf	2
+	pushc	2
+	popl	0
+	pushl	0
+	pushc	3
+	add
+	popl	1
+	pushc	7
+	pushl	1
+	mul
+	pushl	0
+	add
+	popl	0
+	pushl	0
+	pushc	-33
+	add
+	wrint
+	pushc	'\n'
+	wrchr
+	rsf
+	halt

programs/prog3.asm

@@ -0,0 +1,61 @@
+//
+// prog1.asm -- an assembler example with global variables
+//
+
+//
+// compute the gcd of two positive numbers
+//
+// global Integer x;
+// global Integer y;
+// x = readInteger();
+// y = readInteger();
+// while (x != y) {
+//   if (x > y) {
+//     x = x - y;
+//   } else {
+//     y = y - x;
+//   }
+// }
+// writeInteger(x);
+// writeCharacter('\n');
+
+	// x = readInteger();
+	rdint
+	popg	0
+	// y = readInteger();
+	rdint
+	popg	1
+	// while ...
+L1:
+	// x != y
+	pushg	0 // 4
+	pushg	1
+	ne
+	brf	L2
+	// if ...
+	pushg	0
+	pushg	1
+	gt
+	brf	L3
+	// x = x - y
+	pushg	0
+	pushg	1
+	sub
+	popg	0
+	jmp	L4
+L3:
+	// y = y - x
+	pushg	1 // 17
+	pushg	0
+	sub
+	popg	1
+L4:
+	jmp	L1 // 21
+L2:
+	// writeInteger(x);
+	pushg	0 // 22
+	wrint
+	// writeCharacter('\n');
+	pushc	'\n'
+	wrchr
+	halt

programs/prog4.asm

@@ -0,0 +1,63 @@
+//
+// prog2.asm -- an assembler example with local variables
+//
+
+//
+// compute the gcd of two positive numbers
+//
+// local Integer x;
+// local Integer y;
+// x = readInteger();
+// y = readInteger();
+// while (x != y) {
+//   if (x > y) {
+//     x = x - y;
+//   } else {
+//     y = y - x;
+//   }
+// }
+// writeInteger(x);
+// writeCharacter('\n');
+
+	asf	2
+	// x = readInteger();
+	rdint
+	popl	0
+	// y = readInteger();
+	rdint
+	popl	1
+	// while ...
+L1:
+	// x != y
+	pushl	0
+	pushl	1
+	ne
+	brf	L2
+	// if ...
+	pushl	0
+	pushl	1
+	gt
+	brf	L3
+	// x = x - y
+	pushl	0
+	pushl	1
+	sub
+	popl	0
+	jmp	L4
+L3:
+	// y = y - x
+	pushl	1
+	pushl	0
+	sub
+	popl	1
+L4:
+	jmp	L1
+L2:
+	// writeInteger(x);
+	pushl	0
+	wrint
+	// writeCharacter('\n');
+	pushc	'\n'
+	wrchr
+	rsf
+	halt

programs/prog5.asm

@@ -0,0 +1,35 @@
+//
+// prog01.asm -- call/ret without args, and without ret value
+//
+
+	asf	3
+	pushc	11
+	wrint
+	pushc	'\n'
+	wrchr
+	call	proc
+	pushc	44
+	wrint
+	pushc	'\n'
+	wrchr
+	rsf
+	halt
+
+proc:
+	asf	2
+	pushc	22
+	wrint
+	pushc	'\n'
+	wrchr
+	call	proctwo
+	rsf
+	ret
+
+proctwo:
+	asf	2
+	pushc	33
+	wrint
+	pushc	'\n'
+	wrchr
+	rsf
+	ret

programs/prog6.asm

@@ -0,0 +1,28 @@
+//
+// prog02.asm -- call/ret with args, but without ret value
+//
+
+	asf	3
+	pushc	11
+	pushc	33
+	call	proc
+	drop	2
+	rsf
+	halt
+
+proc:
+	asf	2
+	pushl	-4
+	wrint
+	pushc	'\n'
+	wrchr
+	pushc	22
+	wrint
+	pushc	'\n'
+	wrchr
+	pushl	-3
+	wrint
+	pushc	'\n'
+	wrchr
+	rsf
+	ret

programs/prog7.asm

@@ -0,0 +1,28 @@
+//
+// prog02.asm -- call/ret with args, but without ret value
+//
+
+	asf	3
+	pushc	11
+	pushc	33
+	call	proc
+	drop	2
+	rsf
+	halt
+
+proc:
+	asf	2
+	pushl	4
+	wrint
+	pushc	'\n'
+	wrchr
+	pushc	22
+	wrint
+	pushc	'\n'
+	wrchr
+	pushl	3
+	wrint
+	pushc	'\n'
+	wrchr
+	rsf
+	ret

stack.c

@@ -3,38 +3,46 @@
 //
 #ifndef STACK
 #define STACK
+#define SIZE 1000
+
 
 #include <stdio.h>
 #include <stdlib.h>
 
-struct stack {
-    int* size;
-    int* current;
-    unsigned int *stack;
+struct stackFrame {
+    int *fp; // Frame pointer
+    int *sp; // Stack pointer
+    int *bp; // Base pointer
 };
 
-void printStack(struct stack stack) {
-    printf("Stack\nSize:\t\t%i\nCurrent:\t%i\n", *stack.size, *stack.current);
-    for (int i = 0; i < *stack.size; ++i) {
-        printf("|%i|\n", stack.stack[i]);
+struct stack {
+    int size;
+    int currentFrame;
+    struct stackFrame *frames[SIZE];
+};
+
+void printStack(struct stack *stack) {
+    printf("Stack:\n");
+    for (int i = 0; i < stack->size; ++i) {
+        printf("[%d] = %d\n", i, stack->frames[stack->currentFrame]->sp[i]);
     }
 }
 
-void push(struct stack s, unsigned int value) {
-    if (*s.current >= *s.size) {
-        printf("Stack Overflow\n");
-        exit(EXIT_FAILURE);
-    }
-    s.stack[*s.current] = value;
-    *s.current=*s.current + 1;
+void push(struct stack *stack, unsigned int value) {
+    struct stackFrame *currentFrame = stack->frames[stack->currentFrame];
+    *(currentFrame->sp) = value;
+    currentFrame->sp++;
 }
 
-unsigned int pop(struct stack s) {
-    if (*s.current == 0) {
-        printf("Stack Underflow\n");
-        exit(EXIT_FAILURE);
-    }
-    *s.current = *s.current -1;
-    return s.stack[*s.current];
+int pop(struct stack *stack) {
+    struct stackFrame *currentFrame = stack->frames[stack->currentFrame];
+    currentFrame->sp--;
+    return *(currentFrame->sp);
 }
+
+int peek(struct stack *stack, int steps) { // peek is pop without removing the value
+    struct stackFrame *currentFrame = stack->frames[stack->currentFrame];
+    return *(currentFrame->sp - steps);
+}
+
 #endif