X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fmodules.c;h=cbcf859b3dacee167704b997cf3bda34e0671543;hb=3c283c4831c40c14d308a54cefb997832a860bca;hp=98ca1a1eb43e40490214757dc73e28e4133d37c1;hpb=51ab5f489bc356940c95cc936fd0508e8f07ea97;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/modules.c b/KernelLand/Kernel/modules.c
index 98ca1a1e..cbcf859b 100644
--- a/KernelLand/Kernel/modules.c
+++ b/KernelLand/Kernel/modules.c
@@ -8,9 +8,11 @@
 
 #define	USE_EDI	0
 #define	USE_UDI	0
+#define MODULE_FLAG_LOADERROR	0x1
 
 // === PROTOTYPES ===
  int	Module_int_Initialise(tModule *Module, const char *ArgString);
+size_t	Modules_int_PopulateBuiltins(tModule **Array);
 void	Modules_int_GetBuiltinArray(void);
 void	Modules_LoadBuiltins(void);
 void	Modules_SetBuiltinParams(const char *Name, char *ArgString);
@@ -80,6 +82,15 @@ int Module_int_Initialise(tModule *Module, const char *ArgString)
 			"Module %p (%s) is for another architecture (%i)",
 			Module, Module->Name, Module->Arch
 			);
+		LEAVE('i', MODULE_ERR_BADMODULE);
+		return MODULE_ERR_BADMODULE;
+	}
+
+	LOG("Module->Flags = %x", Module->Flags);	
+	if(Module->Flags & MODULE_FLAG_LOADERROR ) {
+		Log_Warning("Module", "%s has already attempted to load and encountered errors", Module->Name);
+		LEAVE('i', MODULE_ERR_MISC);
+		return MODULE_ERR_MISC;
 	}
 	
 	deps = Module->Dependencies;
@@ -168,7 +179,7 @@ int Module_int_Initialise(tModule *Module, const char *ArgString)
 			Log_Warning("Module", "Unable to load, reason: Miscelanious");
 			break;
 		case MODULE_ERR_NOTNEEDED:
-			Log_Debug("Module", "Unable to load, reason: Module not needed");
+//			Log_Debug("Module", "Unable to load, reason: Module not needed");
 			break;
 		case MODULE_ERR_MALLOC:
 			Log_Warning("Module", "Unable to load, reason: Error in malloc/realloc/calloc, probably not good");
@@ -177,6 +188,7 @@ int Module_int_Initialise(tModule *Module, const char *ArgString)
 			Log_Warning("Module", "Unable to load reason - Unknown code %i", ret);
 			break;
 		}
+		Module->Flags |= MODULE_FLAG_LOADERROR;
 		LEAVE_RET('i', ret);
 		return ret;
 	}
@@ -191,59 +203,51 @@ int Module_int_Initialise(tModule *Module, const char *ArgString)
 	LEAVE_RET('i', 0);
 }
 
-/**
- * \brief Scans the builtin modules and creates an array of them
- */
-void Modules_int_GetBuiltinArray(void)
+size_t Modules_int_PopulateBuiltins(tModule **Array)
 {
-	 int	i;
-	tModule	*module;
-	
-	// Count
-	module = &gKernelModules;
-	i = 0;
-	while( (tVAddr)module < (tVAddr)&gKernelModulesEnd )
+	size_t	count = 0;
+	for( tModule *module = &gKernelModules; module < (tModule*)&gKernelModulesEnd; )
 	{
 		if(module->Magic == MODULE_MAGIC) {
-			i ++;
+			if( Array ) {
+				Array[count] = module;
+			}
+			count ++;
 			module ++;
 		}
-		else
+		else {
 			module = (void*)( (tVAddr)module + 4 );
+		}
 	}
-	
-	// Create
-	giNumBuiltinModules = i;
-	gasBuiltinModuleArgs = calloc( giNumBuiltinModules, sizeof(char*) );
-	gapBuiltinModules = malloc( giNumBuiltinModules * sizeof(tModule*) );
-	
-	
-	// Fill
-	module = &gKernelModules;
-	i = 0;
-	while( (tVAddr)module < (tVAddr)&gKernelModulesEnd )
+	return count;
+}
+
+/**
+ * \brief Scans the builtin modules and creates an array of them
+ */
+void Modules_int_GetBuiltinArray(void)
+{
+	if( !gapBuiltinModules )
 	{
-		if(module->Magic == MODULE_MAGIC) {
-			gapBuiltinModules[i] = module;
-			i ++;
-			module ++;
-		}
-		else
-			module = (void*)( (tVAddr)module + 4 );
+		// Count
+		giNumBuiltinModules = Modules_int_PopulateBuiltins(NULL);
+		
+		// Create
+		gasBuiltinModuleArgs = calloc( giNumBuiltinModules, sizeof(char*) );
+		gapBuiltinModules = malloc( giNumBuiltinModules * sizeof(tModule*) );
+		
+		// Fill
+		Modules_int_PopulateBuiltins(gapBuiltinModules);
 	}
 }
 
 /**
  * \brief Initialises builtin modules
  */
-void Modules_LoadBuiltins()
+void Modules_LoadBuiltins(void)
 {
-	 int	i;
-	
-	if( !gapBuiltinModules )
-		Modules_int_GetBuiltinArray();
-	
-	for( i = 0; i < giNumBuiltinModules; i++ )
+	Modules_int_GetBuiltinArray();
+	for( int i = 0; i < giNumBuiltinModules; i++ )
 	{
 		Module_int_Initialise(
 			gapBuiltinModules[i],
@@ -330,7 +334,7 @@ int Module_LoadMem(void *Buffer, Uint Length, const char *ArgString)
 	
 	VFS_GetMemPath(path, Buffer, Length);
 	
-	return Module_LoadFile( path, ArgString );
+	return Module_LoadFile( path, ArgString ) == EOK;
 }
 
 /**
@@ -341,6 +345,7 @@ int Module_LoadFile(const char *Path, const char *ArgString)
 {
 	void	*base;
 	tModule	*info;
+	tModuleLoader	*loader = NULL;
 	
 	// Load Binary
 	base = Binary_LoadKernel(Path);
@@ -348,46 +353,58 @@ int Module_LoadFile(const char *Path, const char *ArgString)
 	// Error check
 	if(base == NULL) {
 		Log_Warning("Module", "Module_LoadFile - Unable to load '%s'", Path);
-		return 0;
+		return ENOENT;
+	}
+
+	// TODO: I need a way of relocating the dependencies before everything else, so
+	// they can be resolved before any other link errors
+	if( !Binary_Relocate(base) ) {
+		Log_Warning("Module", "Relocation of module %s failed", Path);
+		Binary_Unload(base);
+		return EINVAL;
 	}
 	
 	// Check for Acess Driver
 	if( Binary_FindSymbol(base, "DriverInfo", (Uint*)&info ) == 0 )
 	{
-		tModuleLoader	*tmp;
-		for( tmp = gModule_Loaders; tmp; tmp = tmp->Next)
+		for( loader = gModule_Loaders; loader; loader = loader->Next)
 		{
-			if( tmp->Detector(base) == 0 )	continue;
-			
-			return tmp->Loader(base);
+			if( loader->Detector(base) )
+				break;
 		}
 		
-		#if USE_EDI
-		// Check for EDI Driver
-		if( Binary_FindSymbol(base, "driver_init", NULL ) != 0 )
+		// Unknown module type?, return error
+		if( !loader ) {
+			Binary_Unload(base);
+			Log_Warning("Module", "Module '%s' does not have a Module Info struct", Path);
+			return EINVAL;
+		}
+	}
+
+	if( loader )
+	{
+		if( loader->Loader(base, ArgString) )
 		{
-			return Module_InitEDI( base );	// And intialise
+			Binary_Unload(base);
+			return EINVAL;
 		}
-		#endif
-		
-		// Unknown module type?, return error
-		Binary_Unload(base);
-		#if USE_EDI
-		Log_Warning("Module", "Module '%s' has neither a Module Info struct, nor an EDI entrypoint", Path);
-		#else
-		Log_Warning("Module", "Module '%s' does not have a Module Info struct", Path);
-		#endif
-		return 0;
 	}
-	
-	// Initialise (and register)
-	if( Module_int_Initialise( info, ArgString ) )
+	else
 	{
-		Binary_Unload(base);
-		return 0;
+		if( !Module_int_ResolveDeps(info) ) {
+			Log_Warning("Module", "Dependencies not met for '%s'", Path);
+			Binary_Unload(base);
+			return EINVAL;
+		}
+		
+		if( Module_int_Initialise(info, ArgString) )
+		{
+			Binary_Unload(base);
+			return EINVAL;
+		}
 	}
 	
-	return 1;
+	return 0;
 }
 
 /**