Bug fix.

NicoNex · Jul 27, 2023 · 69e1dca · 69e1dca
1 parent 0ae3938
commit 69e1dca
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/internal/obj/native.c b/internal/obj/native.c
@@ -25,3 +25,8 @@ struct object native_getsetter_get(struct getsetter *gs) {
 struct object native_getsetter_set(struct getsetter *gs, struct object val) {
 	return errorf("cannot assign values to type %s", otype_str(gs->l.type));
 }
+
+void dispose_native_obj(struct object o) {
+	free(o.marked);
+	free(o.data.handle);
+}
diff --git a/internal/obj/object.h b/internal/obj/object.h
@@ -224,6 +224,7 @@ void dispose_getsetter_obj(struct object o);
 // Native object.
 struct object native_getsetter_get(struct getsetter *gs);
 struct object native_getsetter_set(struct getsetter *gs, struct object val);
+void dispose_native_obj(struct object o);
 
 // Util functions.
 char *otype_str(enum obj_type t);

diff --git a/internal/obj/utils.c b/internal/obj/utils.c
@@ -132,6 +132,9 @@ void free_obj(struct object o) {
 	case obj_getsetter:
 		dispose_getsetter_obj(o);
 		return;
+	case obj_native:
+		dispose_native_obj(o);
+		return;
 	default:
 		return;
 	}

diff --git a/internal/vm/vm.c b/internal/vm/vm.c
@@ -662,7 +662,7 @@ static inline void vm_call_native(struct vm * restrict vm, struct object *n, siz
 	void *arg_values[numargs];
 
 	// Convert Tau types to C types.
-	for (size_t i = 0; i < numargs; i++) {
+	for (int64_t i = numargs - 1; i >= 0; i--) {
 		struct object *o = unwrap(&vm_stack_pop(vm));
 
 		switch (o->type) {
@@ -691,6 +691,7 @@ static inline void vm_call_native(struct vm * restrict vm, struct object *n, siz
 			vm_errorf(vm, "unsupported argument type %s for native objects", otype_str(o->type));
 		}
 	}
+	vm->sp--;
 
 	if (ffi_prep_cif(&cif, FFI_DEFAULT_ABI, numargs, &ffi_type_pointer, arg_types) != FFI_OK) {
 		vm_stack_push(vm, errorf("failed to prepare the native function"));
@@ -700,12 +701,14 @@ static inline void vm_call_native(struct vm * restrict vm, struct object *n, siz
 	void *return_value = malloc(sizeof(&ffi_type_pointer));
 	ffi_call(&cif, n->data.handle, return_value, arg_values);
 
-	struct object ret = (struct object) {
+	struct object res = (struct object) {
 		.data.handle = return_value,
 		.type = obj_native,
 		.marked = MARKPTR()
 	};
-	vm_stack_push(vm, ret);
+	vm_stack_push(vm, res);
+	vm_heap_add(vm, res);
+	gc(vm);
 }
 
 static inline void vm_exec_call(struct vm * restrict vm, size_t numargs) {