Max/nunuhara_xsystem4
1
0
Fork 0
mirror of https://github.com/nunuhara/xsystem4.git synced 2026-10-08 14:58:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Unify stack & string_stack

Browse Source 
Use an array of unions for the stack. I'm still not sure if System40.exe
uses separate stack for string operations or not. Need to check if POP
after S_PUSH removes the pushed string.
This commit is contained in:
Nunuhara Cabbage
2019-10-07 18:04:36 -07:00
parent 53dc8a7a44
commit 3925c8ea96
1 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vm.c
+30 -30
View File
@@ -23,22 +23,22 @@
#include "instructions.h"
#include "little_endian.h"
union vm_value {
int32_t i;
int64_t l;
float f;
struct string *s;
};
/*
* NOTE: The current implementation is a simple bytecode interpreter.
* System40.exe uses a JIT compiler, and we should too.
*/
static int32_t *stack = NULL;
static union vm_value *stack = NULL;
static size_t stack_size;
static int stack_ptr = 0;
// Separate stack for strings
// Not sure exactly how System40.exe handles strings.
// Further testing required to ensure this approach doesn't break anything.
static struct string *string_stack[1024];
static int string_stack_ptr = 0;
//static struct frame *frame_stack[1024];
static int32_t frame_stack[4096];
static int frame_ptr = 0;
@@ -74,13 +74,13 @@ static int32_t get_argument(int n)
static void stack_push(int32_t v)
{
stack[stack_ptr++] = v;
stack[stack_ptr++].i = v;
}
static int32_t stack_pop(void)
{
stack_ptr--;
return stack[stack_ptr];
return stack[stack_ptr].i;
}
// Pop a reference off the stack, returning the address of the referenced object.
@@ -93,29 +93,29 @@ static int32_t stack_pop_ref(void)
static void stack_push_string_literal(int32_t no)
{
string_stack[string_stack_ptr++] = ain->strings[no];
stack[stack_ptr++].s = ain->strings[no];
}
static void stack_push_string(struct string *str)
{
string_stack[string_stack_ptr++] = str;
stack[stack_ptr++].s = str;
}
static struct string *stack_pop_string(void)
{
string_stack_ptr--;
return string_stack[string_stack_ptr];
stack_ptr--;
return stack[stack_ptr].s;
}
static void stack_toss_string(void)
{
string_stack_ptr--;
free_string(string_stack[string_stack_ptr]);
stack_ptr--;
free_string(stack[stack_ptr].s);
}
static struct string *stack_peek_string(void)
{
return string_stack[string_stack_ptr-1];
return stack[stack_ptr-1].s;
}
/*
@@ -253,52 +253,52 @@ static void execute_instruction(int16_t opcode)
// --- Arithmetic ---
//
case INV:
stack[stack_ptr-1] = -stack[stack_ptr-1];
stack[stack_ptr-1].i = -stack[stack_ptr-1].i;
break;
case NOT:
stack[stack_ptr-1] = !stack[stack_ptr-1];
stack[stack_ptr-1].i = !stack[stack_ptr-1].i;
break;
case COMPL:
stack[stack_ptr-1] = ~stack[stack_ptr-1];
stack[stack_ptr-1].i = ~stack[stack_ptr-1].i;
break;
case ADD:
stack[stack_ptr-2] += stack[stack_ptr-1];
stack[stack_ptr-2].i += stack[stack_ptr-1].i;
stack_ptr--;
break;
case SUB:
stack[stack_ptr-2] -= stack[stack_ptr-1];
stack[stack_ptr-2].i -= stack[stack_ptr-1].i;
stack_ptr--;
break;
case MUL:
stack[stack_ptr-2] *= stack[stack_ptr-1];
stack[stack_ptr-2].i *= stack[stack_ptr-1].i;
stack_ptr--;
break;
case DIV:
stack[stack_ptr-2] /= stack[stack_ptr-1];
stack[stack_ptr-2].i /= stack[stack_ptr-1].i;
stack_ptr--;
break;
case MOD:
stack[stack_ptr-2] %= stack[stack_ptr-1];
stack[stack_ptr-2].i %= stack[stack_ptr-1].i;
stack_ptr--;
break;
case AND:
stack[stack_ptr-2] &= stack[stack_ptr-1];
stack[stack_ptr-2].i &= stack[stack_ptr-1].i;
stack_ptr--;
break;
case OR:
stack[stack_ptr-2] |= stack[stack_ptr-1];
stack[stack_ptr-2].i |= stack[stack_ptr-1].i;
stack_ptr--;
break;
case XOR:
stack[stack_ptr-2] ^= stack[stack_ptr-1];
stack[stack_ptr-2].i ^= stack[stack_ptr-1].i;
stack_ptr--;
break;
case LSHIFT:
stack[stack_ptr-2] <<= stack[stack_ptr-1];
stack[stack_ptr-2].i <<= stack[stack_ptr-1].i;
stack_ptr--;
break;
case RSHIFT:
stack[stack_ptr-2] >>= stack[stack_ptr-1];
stack[stack_ptr-2].i >>= stack[stack_ptr-1].i;
stack_ptr--;
break;
// Numeric Comparisons