From: Michael Wallner <mike@php.net>
Date: Mon, 18 Jan 2016 13:56:38 +0000 (+0100)
Subject: passing structs
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=b0a8b273be0744ed445fbe6c935a04ee7a749f14;p=m6w6%2Fext-psi

passing structs
---

diff --git a/m4/stdlib.m4 b/m4/stdlib.m4
index c7654b6..de4c688 100644
--- a/m4/stdlib.m4
+++ b/m4/stdlib.m4
@@ -22,7 +22,7 @@ PSI_CHECK_STDLIB() {
 	PSI_DECL(double atof, [(char *str)])
 	PSI_DECL(int atoi, [(char *str)])
 	PSI_DECL(long atol, [(char *str)])
-	dnl PSI_DECL(div_t div, [(int numerator, int denominator)])
+	PSI_DECL(div_t div, [(int numerator, int denominator)])
 	PSI_DECL(double drand48, [()])
 	PSI_DECL(double erand48, [(unsigned short xsubi@<:@3@:>@)])
 	PSI_DECL(void exit, [(int status)])
diff --git a/psi.d/stdlib.psi b/psi.d/stdlib.psi
index 2400614..1229c9e 100644
--- a/psi.d/stdlib.psi
+++ b/psi.d/stdlib.psi
@@ -2,3 +2,9 @@ function psi\abs(int $i) : int {
 	let n = intval($i);
 	return to_int(abs);
 }
+
+function psi\div(int $numerator, int $denominator) : array {
+	let numerator = intval($numerator);
+	let denominator = intval($denominator);
+	return to_array(div, to_int(quot), to_int(rem));
+}
\ No newline at end of file
diff --git a/src/libffi.c b/src/libffi.c
index 776e98c..ac018a1 100644
--- a/src/libffi.c
+++ b/src/libffi.c
@@ -109,8 +109,45 @@ static inline ffi_type *psi_ffi_impl_type(token_t impl_type) {
 	EMPTY_SWITCH_DEFAULT_CASE();
 	}
 }
+static void psi_ffi_struct_type_dtor(void *type) {
+	ffi_type *strct = type;
+
+	if (strct->elements) {
+		free(strct->elements);
+	}
+	free(strct);
+}
+static inline ffi_type *psi_ffi_decl_arg_type(decl_arg *darg);
+static ffi_type **psi_ffi_struct_type_elements(decl_struct *strct) {
+	ffi_type **els = calloc(strct->args->count + 1, sizeof(*els));
+	size_t i;
+
+	for (i = 0; i < strct->args->count; ++i) {
+		els[i] = psi_ffi_decl_arg_type(strct->args->args[i]);
+	}
+	els[i] = NULL;
+
+	return els;
+}
 static inline ffi_type *psi_ffi_decl_type(decl_type *type) {
-	return psi_ffi_token_type(real_decl_type(type)->type);
+	decl_type *real = real_decl_type(type);
+
+	if (real->type == PSI_T_STRUCT) {
+		if (!real->strct->engine.type) {
+			ffi_type *strct = calloc(1, sizeof(ffi_type));
+
+			strct->type = FFI_TYPE_STRUCT;
+			strct->size = real->strct->size;
+			strct->alignment = 0;
+			strct->elements = psi_ffi_struct_type_elements(real->strct);
+
+			real->strct->engine.type = strct;
+			real->strct->engine.dtor = psi_ffi_struct_type_dtor;
+		}
+
+		return real->strct->engine.type;
+	}
+	return psi_ffi_token_type(real->type);
 }
 static inline ffi_type *psi_ffi_decl_arg_type(decl_arg *darg) {
 	if (darg->var->pointer_level) {
diff --git a/src/parser.h b/src/parser.h
index b27fdaf..29bf9d3 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -377,6 +377,10 @@ typedef struct decl_struct {
 	char *name;
 	decl_args *args;
 	size_t size;
+	struct {
+		void *type;
+		void (*dtor)(void *type);
+	} engine;
 } decl_struct;
 
 static inline decl_struct *init_decl_struct(const char *name, decl_args *args) {