Implement return values

Author: roastpiece

Makefile

@@ -39,7 +39,7 @@ UMKA_LIB_DYNAMIC = $(BUILD_PATH)/libumka.$(LIBEXT)
 UMKA_EXE = $(BUILD_PATH)/umka
 
 #CFLAGS = -s -fPIC -O3 -Wall -Wno-format-security -malign-double -fno-strict-aliasing -DUMKA_EXT_LIBS
-CFLAGS = -fPIC -O3 -ggdb -Wall -Wno-format-security -malign-double -fno-strict-aliasing -DUMKA_EXT_LIBS $(LIBS) $(INCLUDE)
+CFLAGS = -fPIC -ggdb -Wall -Wno-format-security -malign-double -fno-strict-aliasing -DUMKA_EXT_LIBS $(LIBS) $(INCLUDE)
 STATIC_CFLAGS  = $(CFLAGS) -DUMKA_STATIC
 DYNAMIC_CFLAGS = $(CFLAGS) -DUMKA_BUILD $(DYNAMIC_CFLAGS_EXTRA)
 

src/umka_gen.h

@@ -47,7 +47,6 @@ typedef struct
 typedef struct
 {
     void *entry;
-    int numArgs;
     ffi_cif cif;
 } DynamicCall;
 

src/umka_stmt.c

@@ -1,3 +1,4 @@
+#include "umka_common.h"
 #include "umka_gen.h"
 #include "umka_lexer.h"
 #include "umka_types.h"
@@ -124,7 +125,7 @@ ffi_type *mapToFfiType(Umka *umka,const struct tagType *type) {
     case TYPE_PTR:
         return &ffi_type_uint64;
     case TYPE_BOOL:
-        return &ffi_type_uchar;
+        return &ffi_type_uint8;
     case TYPE_CHAR:
         return &ffi_type_uchar;
 
@@ -133,7 +134,6 @@ ffi_type *mapToFfiType(Umka *umka,const struct tagType *type) {
         // probabbly should be only created once for each struct, then looked up here
         return mapToFfiStruct(umka, type->typeIdent->type);
 
-
         // float types
     case TYPE_REAL32:
         return &ffi_type_float;
@@ -171,7 +171,10 @@ int assignFfiTypes(Umka *umka, ffi_type **types, const Signature *sig)
     for(int i = 0; i < sig->numParams && i < 16; i++) {
         const Param *param = sig->param[i];
         ffi_type *type = mapToFfiType(umka, param->type);
-        if (type == NULL) continue;
+
+        if (strcmp(param->name, "#upvalues") == 0) continue;
+        if (strcmp(param->name, "#result") == 0) continue;
+
         types[numArgs++] = type;
     }
     return numArgs;
@@ -225,13 +228,13 @@ void doResolveExtern(Umka *umka)
 
                     // todo: free?
                     ffi_type **types = malloc(sizeof(ffi_type)*16);
-                    dynamicCall->numArgs = assignFfiTypes(umka, types, &ident->type->sig);
-
                     ffi_type *retType = mapToFfiType(umka, ident->type->sig.resultType);
+                    int numArgs = assignFfiTypes(umka, types, &ident->type->sig);
+
                     if (retType == NULL)
                         umka->error.handler(umka->error.context, "Unsupported return type for ffi function: %d", ident->type->sig.resultType->typeIdent->name);
 
-                    ffi_status status = ffi_prep_cif(&dynamicCall->cif, FFI_DEFAULT_ABI, dynamicCall->numArgs, retType, types);
+                    ffi_status status = ffi_prep_cif(&dynamicCall->cif, FFI_DEFAULT_ABI, numArgs, retType, types);
                     if (status != FFI_OK)
                         umka->error.handler(umka->error.context, "Error creating ffi_cif: %d", status);
 

src/umka_vm.c

@@ -3569,18 +3569,25 @@ static FORCE_INLINE void doCallExtern(Fiber *fiber, Error *error)
     fiber->ip++;
 }
 
-
-static void ffiEntry(UmkaStackSlot *params, UmkaStackSlot *result, const DynamicCall *dynamicCall)
+static FORCE_INLINE void ffiEntry(UmkaStackSlot *params, UmkaStackSlot *result, const DynamicCall *dynamicCall)
 {
     void* args[16] = {0};
-    void *retVal = NULL;
-
-    for (int i = 0; i < dynamicCall->numArgs; i++) {
+    for (unsigned int i = 0; i < dynamicCall->cif.nargs; i++) {
         args[i] = &umkaGetParam(params, i)->ptrVal;
     }
 
-    ffi_call((ffi_cif *)&dynamicCall->cif, dynamicCall->entry, retVal, args);
-    // todo retval
+    UmkaStackSlot *resultSlot = umkaGetResult(params, result);
+    void* retPtr = resultSlot;
+    if (dynamicCall->cif.rtype->type == FFI_TYPE_STRUCT) {
+        retPtr = resultSlot->ptrVal;
+    }
+
+    ffi_call((ffi_cif *)&dynamicCall->cif, dynamicCall->entry, retPtr, args);
+    // workaround for real32 -> cast float to double
+    if (dynamicCall->cif.rtype->type == FFI_TYPE_FLOAT) {
+        resultSlot->realVal = resultSlot->real32Val;
+    }
+
 }