#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);
"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;
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");
Log_Warning("Module", "Unable to load reason - Unknown code %i", ret);
break;
}
+ Module->Flags |= MODULE_FLAG_LOADERROR;
LEAVE_RET('i', ret);
return ret;
}
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],
VFS_GetMemPath(path, Buffer, Length);
- return Module_LoadFile( path, ArgString );
+ return Module_LoadFile( path, ArgString ) == EOK;
}
/**
{
void *base;
tModule *info;
+ tModuleLoader *loader = NULL;
// Load Binary
base = Binary_LoadKernel(Path);
// 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;
}
/**