krgamestudios/Toy
1
0
Fork 0
mirror of https://github.com/krgamestudios/Toy.git synced 2026-04-15 14:54:07 +10:00
Code Issues Packages Projects Releases Wiki Activity

Tweaked 4-byte alignment function

Browse Source 
Fixed #140

Thanks @8051enthusiast
This commit is contained in:
Kayne Ruse
2024-10-14 02:07:24 +11:00
parent a51c5591ee
commit 694e262ee2
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/toy_vm.c
View File

@@ -15,24 +15,23 @@
vm->routine[vm->routineCounter++]
#define READ_UNSIGNED_INT(vm) \
*((unsigned int*)(vm->routine + _read_postfix(&(vm->routineCounter), 4)))
*((unsigned int*)(vm->routine + readPostfixUtil(&(vm->routineCounter), 4)))
#define READ_INT(vm) \
*((int*)(vm->routine + _read_postfix(&(vm->routineCounter), 4)))
*((int*)(vm->routine + readPostfixUtil(&(vm->routineCounter), 4)))
#define READ_FLOAT(vm) \
*((float*)(vm->routine + _read_postfix(&(vm->routineCounter), 4)))
*((float*)(vm->routine + readPostfixUtil(&(vm->routineCounter), 4)))
static inline int _read_postfix(unsigned int* ptr, int amount) {
static inline int readPostfixUtil(unsigned int* ptr, int amount) {
int ret = *ptr;
*ptr += amount;
return ret;
}
static inline void fix_alignment(Toy_VM* vm) {
if (vm->routineCounter % 4 != 0) {
vm->routineCounter += (4 - vm->routineCounter % 4);
}
static inline void fixAlignment(Toy_VM* vm) {
//NOTE: It's a tilde, not a negative sign
vm->routineCounter = (vm->routineCounter + 3) & ~0b11;
}
//instruction handlers
@@ -53,19 +52,19 @@ static void processRead(Toy_VM* vm) {
}
case TOY_VALUE_INTEGER: {
fix_alignment(vm);
fixAlignment(vm);
value = TOY_VALUE_FROM_INTEGER(READ_INT(vm));
break;
}
case TOY_VALUE_FLOAT: {
fix_alignment(vm);
fixAlignment(vm);
value = TOY_VALUE_FROM_FLOAT(READ_FLOAT(vm));
break;
}
case TOY_VALUE_STRING: {
fix_alignment(vm);
fixAlignment(vm);
//grab the jump as an integer
unsigned int jump = *(unsigned int*)(vm->routine + vm->jumpsAddr + READ_INT(vm));
@@ -107,13 +106,13 @@ static void processRead(Toy_VM* vm) {
Toy_pushStack(&vm->stack, value);
//leave the counter in a good spot
fix_alignment(vm);
fixAlignment(vm);
}
static void processDeclare(Toy_VM* vm) {
Toy_ValueType type = READ_BYTE(vm); //variable type
unsigned int len = READ_BYTE(vm); //name length
fix_alignment(vm); //one spare byte
fixAlignment(vm); //one spare byte
//grab the jump
unsigned int jump = *(unsigned int*)(vm->routine + vm->jumpsAddr + READ_INT(vm));
@@ -412,7 +411,7 @@ static void process(Toy_VM* vm) {
}
//prepare for the next instruction
fix_alignment(vm);
fixAlignment(vm);
}
}