stack organized

This commit is contained in:
nilsplk 2023-10-30 00:17:17 +01:00
parent 9890324ea5
commit 6740f41edc
4 changed files with 120 additions and 94 deletions

8
code.c
View File

@ -1,8 +1,8 @@
#define code #ifndef CODE
#define CODE
#ifndef instruktion
#include "instruktion.c" #include "instruktion.c"
#endif /* ifndef instruktion */
unsigned int code1[] = { unsigned int code1[] = {
(PUSHC << 24) | IMMEDIATE(3), (PUSHC << 24) | IMMEDIATE(3),
@ -35,4 +35,4 @@ unsigned int code3[] = {
(WRCHR << 24), (WRCHR << 24),
(HALT << 24) (HALT << 24)
}; };
#endif

View File

@ -1,3 +1,4 @@
#ifndef INSREUKTION
#define instruktion #define instruktion
#define IMMEDIATE(x) ((x) & 0x00FFFFFF) #define IMMEDIATE(x) ((x) & 0x00FFFFFF)
@ -15,3 +16,5 @@
#define WRINT 8 #define WRINT 8
#define RDCHR 9 #define RDCHR 9
#define WRCHR 10 #define WRCHR 10
#endif /* ifndef INSREUKTION */

156
njvm.c
View File

@ -1,47 +1,26 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#ifndef instruktion
#include "instruktion.c" #include "instruktion.c"
#endif /* ifndef instruktion */
#ifndef code
#include "code.c" #include "code.c"
#endif /* ifndef code */ #include "stack.c"
//Comment to disable debug //Comment to disable debug
// #define DEBUG // #define DEBUG
// Stack
struct stack stack;
#define SIZE 1000
unsigned int* programmSpeicher; unsigned int* programmSpeicher;
void copyToProgramm(unsigned int codeToCopy[]){ void copyToProgramm(unsigned int codeToCopy[]){
programmSpeicher = codeToCopy; programmSpeicher = codeToCopy;
} }
// Stack
#define maxValues 1000
unsigned int stack[maxValues];
unsigned int current = 0;
void stackPush(unsigned int value) {
if (current > (maxValues-1)) {
fprintf(stderr, "stack overflow\n");
exit(EXIT_FAILURE);
}
stack[current] = value;
current++;
}
unsigned int stackPop(void) {
if (current < 1) {
fprintf(stderr, "stack underflow\n");
exit(EXIT_FAILURE);
}
return stack[--current];
}
void version(void) { 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", 0, __DATE__, __TIME__);
} }
@ -52,46 +31,46 @@ void help(void) {
void printProgramm(){ void printProgramm(){
int i = 0; int i = 0;
char c[10]; char c[10];
while (programmSpeicher[i] != 0) // while (programmSpeicher[i] != 0)
{ // {
switch (programmSpeicher[i] >> 24) { // switch (programmSpeicher[i] >> 24) {
case PUSHC: // case PUSHC:
strcpy(c,"pushc"); // strcpy(c,"pushc");
break; // break;
case ADD: // case ADD:
strcpy(c,"add"); // strcpy(c,"add");
break; // break;
case SUB: // case SUB:
strcpy(c,"sub"); // strcpy(c,"sub");
break; // break;
case MUL: // case MUL:
strcpy(c,"mul"); // strcpy(c,"mul");
break; // break;
case DIV: // case DIV:
strcpy(c,"div"); // strcpy(c,"div");
break; // break;
case MOD: // case MOD:
strcpy(c,"mod"); // strcpy(c,"mod");
break; // break;
case RDINT: // case RDINT:
strcpy(c,"rdint"); // strcpy(c,"rdint");
break; // break;
case WRINT: // case WRINT:
strcpy(c,"wrint"); // strcpy(c,"wrint");
break; // break;
case RDCHR: // case RDCHR:
strcpy(c,"rdchr"); // strcpy(c,"rdchr");
break; // break;
case WRCHR: // case WRCHR:
strcpy(c,"wrchr"); // strcpy(c,"wrchr");
break; // break;
default: // default:
strcpy(c,"halt"); // strcpy(c,"halt");
break; // break;
} // }
IMMEDIATE(programmSpeicher[i])? printf("%03i:\t%s\t%i\n",i,c,IMMEDIATE(programmSpeicher[i])) : printf("%03i:\t%s\n",i,c); // IMMEDIATE(programmSpeicher[i])? printf("%03i:\t%s\t%i\n",i,c,IMMEDIATE(programmSpeicher[i])) : printf("%03i:\t%s\n",i,c);
i++; // i++;
} // }
printf("%03i:\thalt\n",i); printf("%03i:\thalt\n",i);
} }
void execute(void) { void execute(void) {
@ -106,39 +85,39 @@ void execute(void) {
goto end; goto end;
break; break;
case PUSHC: case PUSHC:
stackPush(IMMEDIATE(programmSpeicher[i])); push(stack,IMMEDIATE(programmSpeicher[i]));
break; break;
case ADD: case ADD:
stackPush(stackPop()+stackPop()); push(stack,pop(stack)+pop(stack));
break; break;
case SUB: case SUB:
temp = stackPop(); temp = pop(stack);
stackPush(stackPop() - temp); push(stack,pop(stack) - temp);
break; break;
case MUL: case MUL:
stackPush(stackPop()*stackPop()); push(stack,pop(stack)*pop(stack));
break; break;
case DIV: case DIV:
temp = stackPop(); temp = pop(stack);
stackPush(stackPop()/temp); push(stack,pop(stack)/temp);
break; break;
case MOD: case MOD:
temp = stackPop(); temp = pop(stack);
stackPush(stackPop()%temp); push(stack,pop(stack)%temp);
break; break;
case RDINT: case RDINT:
scanf("%i",&intInput); scanf("%i",&intInput);
stackPush(intInput); push(stack,intInput);
break; break;
case WRINT: case WRINT:
printf("%i",stackPop()); printf("%i",pop(stack));
break; break;
case RDCHR: case RDCHR:
scanf("%c",&charInput); scanf("%c",&charInput);
stackPush(charInput); push(stack,charInput);
break; break;
case WRCHR: case WRCHR:
printf("%c",stackPop()); printf("%c",pop(stack));
break; break;
} }
i++; i++;
@ -148,15 +127,6 @@ end:
} }
#ifdef DEBUG #ifdef DEBUG
void printStack(void){
if(current >= 0) return;
printf("----\n");
for (int i = 0; i < current; i++) {
printf("|%i| \n",stack[i]);
}
printf("----\n");
}
void tests(void){ void tests(void){
printf("Runnig debug mode\n"); printf("Runnig debug mode\n");
copyToProgramm(code1); copyToProgramm(code1);
@ -167,6 +137,12 @@ void tests(void){
#endif /* ifdef DEBUG */ #endif /* ifdef DEBUG */
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
int size = SIZE;
int current = 0;
unsigned int s[SIZE];
stack.size = &size;
stack.current = &current;
stack.stack = s;
#ifdef DEBUG #ifdef DEBUG
tests(); tests();
#endif /* ifdef DEBUG */ #endif /* ifdef DEBUG */
@ -192,7 +168,7 @@ int main(int argc, char *argv[]) {
// Started // Started
printf("Ninja Virtual Machine started\n"); printf("Ninja Virtual Machine started\n");
printProgramm(); printProgramm();
execute(); // execute();
// Stopped // Stopped
printf("Ninja Virtual Machine stopped\n"); printf("Ninja Virtual Machine stopped\n");
return 0; return 0;

47
stack.c Executable file
View File

@ -0,0 +1,47 @@
//
// Created by Nilss on 29.10.2023.
//
#ifndef STACK
#define STACK
#include <stdio.h>
#include <stdlib.h>
struct stack {
int* size;
int* current;
unsigned int *stack;
};
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 initStack(int size) {
unsigned int a[size];
int current = 0;
struct stack s1 = {&size, &current, a};
return s1;
}
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;
}
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];
}
#endif