diff --git a/njvm.c b/njvm.c index 508908e..114e3fd 100644 --- a/njvm.c +++ b/njvm.c @@ -31,46 +31,46 @@ void help(void) { void printProgramm(){ int i = 0; char c[10]; - // while (programmSpeicher[i] != 0) - // { - // switch (programmSpeicher[i] >> 24) { - // case PUSHC: - // strcpy(c,"pushc"); - // break; - // case ADD: - // strcpy(c,"add"); - // break; - // case SUB: - // strcpy(c,"sub"); - // break; - // case MUL: - // strcpy(c,"mul"); - // break; - // case DIV: - // strcpy(c,"div"); - // break; - // case MOD: - // strcpy(c,"mod"); - // break; - // case RDINT: - // strcpy(c,"rdint"); - // break; - // case WRINT: - // strcpy(c,"wrint"); - // break; - // case RDCHR: - // strcpy(c,"rdchr"); - // break; - // case WRCHR: - // strcpy(c,"wrchr"); - // break; - // default: - // strcpy(c,"halt"); - // break; - // } - // IMMEDIATE(programmSpeicher[i])? printf("%03i:\t%s\t%i\n",i,c,IMMEDIATE(programmSpeicher[i])) : printf("%03i:\t%s\n",i,c); - // i++; - // } + while (programmSpeicher[i] != 0) + { + switch (programmSpeicher[i] >> 24) { + case PUSHC: + strcpy(c,"pushc"); + break; + case ADD: + strcpy(c,"add"); + break; + case SUB: + strcpy(c,"sub"); + break; + case MUL: + strcpy(c,"mul"); + break; + case DIV: + strcpy(c,"div"); + break; + case MOD: + strcpy(c,"mod"); + break; + case RDINT: + strcpy(c,"rdint"); + break; + case WRINT: + strcpy(c,"wrint"); + break; + case RDCHR: + strcpy(c,"rdchr"); + break; + case WRCHR: + strcpy(c,"wrchr"); + break; + default: + strcpy(c,"halt"); + break; + } + IMMEDIATE(programmSpeicher[i])? printf("%03i:\t%s\t%i\n",i,c,IMMEDIATE(programmSpeicher[i])) : printf("%03i:\t%s\n",i,c); + i++; + } printf("%03i:\thalt\n",i); } void execute(void) { @@ -168,7 +168,7 @@ int main(int argc, char *argv[]) { // Started printf("Ninja Virtual Machine started\n"); printProgramm(); - // execute(); + execute(); // Stopped printf("Ninja Virtual Machine stopped\n"); return 0;