X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=ee1230f3667267e8689a4ddfc2da73b589435b5a;hp=4d6e5c9f03ca4b1c093e2f7bd51982b667003510;hb=6e8b5c090b44299f82f4e748d8bf6b8bc5b66414;hpb=9f381458672347c0f303dc3b309dc299f998f4f6

diff --git a/src/module.c b/src/module.c
index 4d6e5c9..ee1230f 100644
--- a/src/module.c
+++ b/src/module.c
@@ -142,6 +142,80 @@ void psi_to_string(impl_val *ret_val, decl_arg *func, zval *return_value)
 	}
 }
 
+size_t psi_t_alignment(token_t t)
+{
+	size_t align;
+#define PSI_TAS_D(T) struct PSI_TAS_ ##T { \
+	char c; \
+	T x; \
+}
+#define PSI_TAS_P(T) struct PSI_TAS_ ## T ## _pointer { \
+	char c; \
+	T *x; \
+}
+#define PSI_TAS_C(T) align = offsetof(struct PSI_TAS_ ##T, x)
+#define PSI_TAS_CASE(T) { \
+	PSI_TAS_D(T); \
+	PSI_TAS_C(T); \
+}
+	switch (t) {
+	case PSI_T_CHAR:
+		PSI_TAS_CASE(char);
+		break;
+	case PSI_T_SINT8:
+		PSI_TAS_CASE(int8_t);
+		break;
+	case PSI_T_UINT8:
+		PSI_TAS_CASE(uint8_t);
+		break;
+	case PSI_T_SHORT:
+		PSI_TAS_CASE(short);
+		break;
+	case PSI_T_SINT16:
+		PSI_TAS_CASE(int16_t);
+		break;
+	case PSI_T_UINT16:
+		PSI_TAS_CASE(uint16_t);
+		break;
+	case PSI_T_INT:
+		PSI_TAS_CASE(int);
+		break;
+	case PSI_T_SINT32:
+		PSI_TAS_CASE(int32_t);
+		break;
+	case PSI_T_UINT32:
+		PSI_TAS_CASE(uint32_t);
+		break;
+	case PSI_T_LONG:
+		PSI_TAS_CASE(long);
+		break;
+	case PSI_T_SINT64:
+		PSI_TAS_CASE(int64_t);
+		break;
+	case PSI_T_UINT64:
+		PSI_TAS_CASE(uint64_t);
+		break;
+	case PSI_T_FLOAT:
+		PSI_TAS_CASE(float);
+		break;
+	case PSI_T_DOUBLE:
+		PSI_TAS_CASE(double);
+		break;
+	case PSI_T_SIZE_T:
+		PSI_TAS_CASE(size_t);
+		break;
+	case PSI_T_POINTER:
+		{
+			PSI_TAS_P(char);
+			PSI_TAS_C(char_pointer);
+		}
+		break;
+	EMPTY_SWITCH_DEFAULT_CASE();
+	}
+
+	return align;
+}
+
 size_t psi_t_size(token_t t)
 {
 	size_t size;
@@ -181,11 +255,23 @@ size_t psi_t_size(token_t t)
 	case PSI_T_DOUBLE:
 		size = sizeof(double);
 		break;
+	case PSI_T_SIZE_T:
+		size = sizeof(size_t);
+		break;
+	case PSI_T_POINTER:
+		size = sizeof(char *);
+		break;
 	EMPTY_SWITCH_DEFAULT_CASE();
 	}
 	return size;
 }
 
+size_t psi_t_align(token_t t, size_t s)
+{
+	size_t a = psi_t_alignment(t);
+	return ((s - 1) | (a - 1)) + 1;
+}
+
 static impl_val *iterate(impl_val *val, token_t t, unsigned i, impl_val *tmp)
 {
 	size_t size = psi_t_size(t);