fix: make compt with asm

SpideyZac · Jun 16, 2024 · 6379ebc · 6379ebc
1 parent fb32b10
commit 6379ebc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/compiler/target/vm/core.c b/src/compiler/target/vm/core.c
@@ -56,7 +56,7 @@ machine *machine_new(int stack_size, int heap_size) {
     result->heap_size  = heap_size;
     result->stack      = malloc(sizeof(float) * stack_size);
     result->heap       = malloc(sizeof(char)  * heap_size);
-    result->allocated  = malloc(sizeof(bool)  * heap_size / 4); // 4 bytes per float
+    result->allocated  = malloc(sizeof(bool)  * heap_size);
     result->return_register = 0;
     result->stack_pointer = 0;
     result->hooks = 0;
@@ -114,9 +114,9 @@ void machine_access_return_register(machine *vm) {
 }
 
 int machine_allocate(machine *vm) {
-    int size = machine_pop(vm), addr = -1, consecutive_free_calls = 0;
+    int size = machine_pop(vm) * 4, addr = -1, consecutive_free_calls = 0;
 
-    for (int i = 0; i < vm->heap_size / 4; i++) {
+    for (int i = 0; i < vm->heap_size; i++) {
         if (!vm->allocated[i]) consecutive_free_calls++;
         else consecutive_free_calls = 0;
 
@@ -139,7 +139,7 @@ int machine_allocate(machine *vm) {
 }
 
 void machine_free(machine *vm) {
-    int addr = machine_pop(vm), size = machine_pop(vm);
+    int addr = machine_pop(vm), size = machine_pop(vm) * 4;
 
     for (int i = 0; i < size; i++) {
         vm->allocated[addr + i] = false;
@@ -166,7 +166,7 @@ float bytes2Float(unsigned char bytes_temp[4]) {
 }
 
 void machine_store(machine *vm, int floats) {
-    int addr = machine_pop(vm) * 4;
+    int addr = machine_pop(vm);
 
     // store value in heap by breaking it into bytes
     for (int i = floats - 1; i >= 0; i--) {
@@ -182,7 +182,7 @@ void machine_store(machine *vm, int floats) {
 }
 
 void machine_load(machine *vm, int floats) {
-    int addr = machine_pop(vm) * 4;
+    int addr = machine_pop(vm);
 
     // load value from heap by combining bytes
     for (int i = 0; i < floats; i++) {

diff --git a/src/compiler/visit.rs b/src/compiler/visit.rs
@@ -1225,12 +1225,12 @@ impl<'a> Visitor<'a> {
                             self.add_statements(vec![
                                 ir::IRStatement::RefHook(left.hook),
                                 ir::IRStatement::Copy,
-                                ir::IRStatement::Push(i as f32),
+                                ir::IRStatement::Push(i as f32 * 4.0),
                                 ir::IRStatement::Add,
                                 ir::IRStatement::Load(1),
                                 ir::IRStatement::RefHook(right.hook),
                                 ir::IRStatement::Copy,
-                                ir::IRStatement::Push(i as f32),
+                                ir::IRStatement::Push(i as f32 * 4.0),
                                 ir::IRStatement::Add,
                                 ir::IRStatement::Load(1),
                                 ir::IRStatement::Subtract,
@@ -1319,12 +1319,12 @@ impl<'a> Visitor<'a> {
                             self.add_statements(vec![
                                 ir::IRStatement::RefHook(left.hook),
                                 ir::IRStatement::Copy,
-                                ir::IRStatement::Push(i as f32),
+                                ir::IRStatement::Push(i as f32 * 4.0),
                                 ir::IRStatement::Add,
                                 ir::IRStatement::Load(1),
                                 ir::IRStatement::RefHook(right.hook),
                                 ir::IRStatement::Copy,
-                                ir::IRStatement::Push(i as f32),
+                                ir::IRStatement::Push(i as f32 * 4.0),
                                 ir::IRStatement::Add,
                                 ir::IRStatement::Load(1),
                                 ir::IRStatement::Subtract,