Refactor function calls in order to allow varidic arguments or overwrite the arguments call size.

Author: viferga

source/loader/source/loader.c

@@ -68,7 +68,9 @@ struct loader_host_invoke_type
 
 static function_interface loader_register_interface_proxy(void);
 
-static value loader_register_invoke_proxy(function func, function_impl func_impl, function_args args);
+static value loader_register_invoke_proxy(function func, function_impl func_impl, function_args args, size_t size);
+
+static function_return loader_register_await_proxy(function func, function_impl impl, function_args args, size_t size, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void * context);
 
 static void loader_register_destroy_proxy(function func, function_impl func_impl);
 
@@ -157,26 +159,23 @@ int loader_is_initialized(const loader_naming_tag tag)
 	return loader_impl_is_initialized(impl);
 }
 
-function_return loader_register_invoke_proxy(function func, function_impl func_impl, function_args args)
+function_return loader_register_invoke_proxy(function func, function_impl func_impl, function_args args, size_t size)
 {
 	loader_host_invoke host_invoke = (loader_host_invoke)func_impl;
 
-	signature s = function_signature(func);
-
-	const size_t args_size = signature_count(s);
-
 	void * data = function_closure(func);
 
-	return host_invoke->invoke(args_size, args, data);
+	return host_invoke->invoke(size, args, data);
 }
 
-function_return loader_register_await_proxy(function func, function_impl impl, function_args args, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void * context)
+function_return loader_register_await_proxy(function func, function_impl impl, function_args args, size_t size, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void * context)
 {
 	/* TODO */
 
 	(void)func;
 	(void)impl;
 	(void)args;
+	(void)size;
 	(void)resolve_callback;
 	(void)reject_callback;
 	(void)context;

source/loader/source/loader_impl.c

@@ -556,9 +556,9 @@ int loader_impl_function_hook_call(context ctx, const char func_name[])
 
 	if (func_init != NULL)
 	{
-		void * unused[1] = { NULL };
+		void * null_args[1] = { NULL };
 
-		function_return ret = function_call(func_init, unused);
+		function_return ret = function_call(func_init, null_args, 0);
 
 		if (ret != NULL)
 		{

source/loaders/c_loader/source/c_loader_impl.cpp

@@ -78,24 +78,26 @@ int function_c_interface_create(function func, function_impl impl)
 	return 0;
 }
 
-function_return function_c_interface_invoke(function func, function_impl impl, function_args args)
+function_return function_c_interface_invoke(function func, function_impl impl, function_args args, size_t size)
 {
 	/* TODO */
 
 	(void)func;
 	(void)impl;
 	(void)args;
+	(void)size;
 
 	return NULL;
 }
 
-function_return function_c_interface_await(function func, function_impl impl, function_args args, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void * context)
+function_return function_c_interface_await(function func, function_impl impl, function_args args, size_t size, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void * context)
 {
 	/* TODO */
 
 	(void)func;
 	(void)impl;
 	(void)args;
+	(void)size;
 	(void)resolve_callback;
 	(void)reject_callback;
 	(void)context;

source/loaders/cs_loader/include/cs_loader/simple_netcore.h

@@ -28,28 +28,29 @@ extern "C" {
 #include <stdlib.h>
 
 #define MAX_FILES 0xFF
-	struct netcore_handle_type;
-	typedef struct netcore_handle_type * netcore_handle;
 
-	typedef char source_file[512];
+struct netcore_handle_type;
+typedef struct netcore_handle_type * netcore_handle;
 
-	netcore_handle simple_netcore_create(char * dotnet_root, char * dotnet_loader_assembly_path);
+typedef char source_file[512];
 
-	reflect_function * simple_netcore_get_functions(netcore_handle, int*);
+netcore_handle simple_netcore_create(char * dotnet_root, char * dotnet_loader_assembly_path);
 
-	void  simple_netcore_load_script_from_files(netcore_handle handle, char * files[MAX_FILES], size_t size);
+reflect_function * simple_netcore_get_functions(netcore_handle, int *);
 
-	void  simple_netcore_load_script_from_assembly(netcore_handle handle, char * file);
+void simple_netcore_load_script_from_files(netcore_handle handle, char * files[MAX_FILES], size_t size);
 
-	void   simple_netcore_load_script_from_memory(netcore_handle handle, const char * buffer, size_t size);
+void simple_netcore_load_script_from_assembly(netcore_handle handle, char * file);
 
-	execution_result* simple_netcore_invoke(netcore_handle, const char *);
+void simple_netcore_load_script_from_memory(netcore_handle handle, const char * buffer, size_t size);
 
-	void simple_netcore_destroy(netcore_handle);
+execution_result * simple_netcore_invoke(netcore_handle, const char *);
 
-	execution_result* simple_netcore_invoke_with_params(netcore_handle handle, const char *func, parameters * params);
+void simple_netcore_destroy(netcore_handle);
 
-	void simple_netcore_destroy_execution_result(netcore_handle handle, execution_result* er);
+execution_result* simple_netcore_invoke_with_params(netcore_handle handle, const char * func, parameters * params);
+
+void simple_netcore_destroy_execution_result(netcore_handle handle, execution_result * er);
 
 #ifdef __cplusplus
 }

source/loaders/cs_loader/source/cs_loader_impl.c

@@ -48,11 +48,10 @@ int function_cs_interface_create(function func, function_impl impl)
 	return 0;
 }
 
-function_return function_cs_interface_invoke(function func, function_impl impl, function_args args)
+function_return function_cs_interface_invoke(function func, function_impl impl, function_args args, size_t size)
 {
 	(void)func;
-	(void)impl;
-	(void)args;
+	(void)size; /* TODO: Assert size and param_count are equal, varidic not allowed in C# yet */
 
 	cs_function * cs_f = (cs_function*)impl;
 	execution_result * result;
@@ -135,13 +134,14 @@ function_return function_cs_interface_invoke(function func, function_impl impl,
 	return v;
 }
 
-function_return function_cs_interface_await(function func, function_impl impl, function_args args, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void * context)
+function_return function_cs_interface_await(function func, function_impl impl, function_args args, size_t size, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void * context)
 {
 	/* TODO */
 
 	(void)func;
 	(void)impl;
 	(void)args;
+	(void)size;
 	(void)resolve_callback;
 	(void)reject_callback;
 	(void)context;

source/loaders/cs_loader/source/simple_netcore.cpp

@@ -21,21 +21,21 @@
 #include <cs_loader/simple_netcore.h>
 
 #include <cs_loader/netcore.h>
-#if defined(__linux) | defined( linux)
-#include <cs_loader/netcore_linux.h>
+#if defined(__linux) | defined(linux)
+#	include <cs_loader/netcore_linux.h>
 #else
-#include <cs_loader/netcore_win.h>
+#	include <cs_loader/netcore_win.h>
 #endif
 
 netcore_handle simple_netcore_create(char * dotnet_root, char * dotnet_loader_assembly_path)
 {
-	#if defined(__linux) | defined( linux)
+	#if defined(__linux) | defined(linux)
 		netcore_linux * netcore_impl = new netcore_linux(dotnet_root, dotnet_loader_assembly_path);
 	#else
 		netcore_win * netcore_impl = new netcore_win(dotnet_root, dotnet_loader_assembly_path);
 	#endif
 
-    bool result = netcore_impl->start();
+	bool result = netcore_impl->start();
 
 	if (result == false)
 	{
@@ -60,7 +60,7 @@ void simple_netcore_destroy(netcore_handle handle)
 	delete core;
 }
 
-void  simple_netcore_load_script_from_files(netcore_handle handle, char * files[MAX_FILES], size_t size)
+void simple_netcore_load_script_from_files(netcore_handle handle, char * files[MAX_FILES], size_t size)
 {
 	netcore * core = (netcore*)handle;
 
@@ -70,7 +70,7 @@ void  simple_netcore_load_script_from_files(netcore_handle handle, char * files[
 	}
 }
 
-void  simple_netcore_load_script_from_assembly(netcore_handle handle, char * file)
+void simple_netcore_load_script_from_assembly(netcore_handle handle, char * file)
 {
 	netcore * core = (netcore*)handle;
 
@@ -80,7 +80,7 @@ void  simple_netcore_load_script_from_assembly(netcore_handle handle, char * fil
 	}
 }
 
-void  simple_netcore_load_script_from_memory(netcore_handle handle, const char * buffer, size_t size)
+void simple_netcore_load_script_from_memory(netcore_handle handle, const char * buffer, size_t size)
 {
 	netcore * core = (netcore*)handle;
 
@@ -91,14 +91,14 @@ void  simple_netcore_load_script_from_memory(netcore_handle handle, const char *
 
 	}
 }
-execution_result *  simple_netcore_invoke(netcore_handle handle, const char * func)
+execution_result * simple_netcore_invoke(netcore_handle handle, const char * func)
 {
 	netcore * core = (netcore*)handle;
 
 	return core->execute((char*)func);
 }
 
-execution_result *  simple_netcore_invoke_with_params(netcore_handle handle, const char * func, parameters * params)
+execution_result * simple_netcore_invoke_with_params(netcore_handle handle, const char * func, parameters * params)
 {
 	netcore * core = (netcore*)handle;
 

source/loaders/file_loader/source/file_loader_impl.c

@@ -105,23 +105,25 @@ int function_file_interface_create(function func, function_impl impl)
 	return 0;
 }
 
-function_return function_file_interface_invoke(function func, function_impl impl, function_args args)
+function_return function_file_interface_invoke(function func, function_impl impl, function_args args, size_t size)
 {
 	loader_impl_file_function file_function = (loader_impl_file_function)impl;
 
 	(void)func;
 	(void)args;
+	(void)size;
 
 	return value_create_string(file_function->descriptor->path, file_function->descriptor->length);
 }
 
-function_return function_file_interface_await(function func, function_impl impl, function_args args, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void * context)
+function_return function_file_interface_await(function func, function_impl impl, function_args args, size_t size, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void * context)
 {
 	/* TODO */
 
 	(void)func;
 	(void)impl;
 	(void)args;
+	(void)size;
 	(void)resolve_callback;
 	(void)reject_callback;
 	(void)context;

source/loaders/js_loader/source/js_loader_impl.cpp

@@ -317,25 +317,23 @@ int function_js_interface_create(function func, function_impl impl)
 	return 0;
 }
 
-function_return function_js_interface_invoke(function func, function_impl impl, function_args args)
+function_return function_js_interface_invoke(function func, function_impl impl, function_args args, size_t size)
 {
 	loader_impl_js_function js_func = static_cast<loader_impl_js_function>(impl);
 
 	Local<Function> func_impl_local = js_func->materialize_handle();
 
 	signature s = function_signature(func);
 
-	const size_t args_size = signature_count(s);
-
 	Local<Value> result;
 
-	if (args_size > 0)
+	if (size > 0)
 	{
-		std::vector<Local<Value>> value_args(args_size);
+		std::vector<Local<Value>> value_args(size);
 
 		size_t args_count;
 
-		for (args_count = 0; args_count < args_size; ++args_count)
+		for (args_count = 0; args_count < size; ++args_count)
 		{
 			type t = signature_get_type(s, args_count);
 
@@ -529,13 +527,14 @@ function_return function_js_interface_invoke(function func, function_impl impl,
 	return NULL;
 }
 
-function_return function_js_interface_await(function func, function_impl impl, function_args args, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void * context)
+function_return function_js_interface_await(function func, function_impl impl, function_args args, size_t size, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void * context)
 {
 	/* TODO */
 
 	(void)func;
 	(void)impl;
 	(void)args;
+	(void)size;
 	(void)resolve_callback;
 	(void)reject_callback;
 	(void)context;

source/loaders/jsm_loader/source/jsm_loader_impl.cpp

@@ -67,24 +67,26 @@ int function_jsm_interface_create(function func, function_impl impl)
 	return 0;
 }
 
-function_return function_jsm_interface_invoke(function func, function_impl impl, function_args args)
+function_return function_jsm_interface_invoke(function func, function_impl impl, function_args args, size_t size)
 {
 	/* TODO */
 
 	(void)func;
 	(void)impl;
 	(void)args;
+	(void)size;
 
 	return NULL;
 }
 
-function_return function_jsm_interface_await(function func, function_impl impl, function_args args, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void * context)
+function_return function_jsm_interface_await(function func, function_impl impl, function_args args, size_t size, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void * context)
 {
 	/* TODO */
 
 	(void)func;
 	(void)impl;
 	(void)args;
+	(void)size;
 	(void)resolve_callback;
 	(void)reject_callback;
 	(void)context;

source/loaders/mock_loader/source/mock_loader_function_interface.c

@@ -30,9 +30,9 @@ function_interface function_mock_singleton(void);
 
 int function_mock_interface_create(function func, function_impl impl);
 
-function_return function_mock_interface_invoke(function func, function_impl impl, function_args args);
+function_return function_mock_interface_invoke(function func, function_impl impl, function_args args, size_t size);
 
-void function_mock_interface_await(function func, function_impl impl, function_args args, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void * context);
+void function_mock_interface_await(function func, function_impl impl, function_args args, size_t size, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void * context);
 
 void function_mock_interface_destroy(function func, function_impl impl);
 
@@ -62,23 +62,21 @@ int function_mock_interface_create(function func, function_impl impl)
 	return 0;
 }
 
-function_return function_mock_interface_invoke(function func, function_impl impl, function_args args)
+function_return function_mock_interface_invoke(function func, function_impl impl, function_args args, size_t size)
 {
 	loader_impl_mock_function mock_function = (loader_impl_mock_function)impl;
 
 	signature s = function_signature(func);
 
 	type ret_type = signature_get_return(s);
 
-	const size_t args_size = signature_count(s);
-
 	(void)mock_function;
 
-	if (args_size > 0)
+	if (size > 0)
 	{
 		size_t args_count;
 
-		for (args_count = 0; args_count < args_size; ++args_count)
+		for (args_count = 0; args_count < size; ++args_count)
 		{
 			type t = signature_get_type(s, args_count);
 
@@ -140,7 +138,7 @@ function_return function_mock_interface_invoke(function func, function_impl impl
 			}
 		}
 
-		log_write("metacall", LOG_LEVEL_DEBUG, "Calling mock function with arguments (%lu)", args_size);
+		log_write("metacall", LOG_LEVEL_DEBUG, "Calling mock function with arguments (%lu)", size);
 	}
 	else
 	{
@@ -198,13 +196,14 @@ function_return function_mock_interface_invoke(function func, function_impl impl
 	return NULL;
 }
 
-function_return function_mock_interface_await(function func, function_impl impl, function_args args, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void * context)
+function_return function_mock_interface_await(function func, function_impl impl, function_args args, size_t size, function_resolve_callback resolve_callback, function_reject_callback reject_callback, void * context)
 {
 	/* TODO */
 
 	(void)func;
 	(void)impl;
 	(void)args;
+	(void)size;
 	(void)resolve_callback;
 	(void)reject_callback;
 	(void)context;