#define VGA_ERRORS 0
+#define MAX_ARGSTR_POS (0x400000-0x2000)
+
// === IMPORTS ===
extern void Heap_Install(void);
extern void Desctab_Install(void);
for( i = 0; i < mbInfo->ModuleCount; i ++ )
{
int ofs;
- // TODO: Handle this better by using MM_MapHW/MM_MapTemp
- // Adjust into higher half
- //mods[i].Start += KERNEL_BASE;
- //mods[i].End += KERNEL_BASE;
- mods[i].String += KERNEL_BASE;
+ // Always HW map the module data
gaArch_BootModules[i].Size = mods[i].End - mods[i].Start;
ofs = mods[i].Start&0xFFF;
gaArch_BootModules[i].Base = (void*)( MM_MapHWPages(mods[i].Start,
(gaArch_BootModules[i].Size+ofs+0xFFF) / 0x1000
) + ofs );
- //gaArch_BootModules[i].ArgString = MM_MapHW(mods[i].String, 1)
- // + (mods[i].String&0xFFF);
- //gaArch_BootModules[i].Base = (void *)mods[i].Start;
- gaArch_BootModules[i].ArgString = (char *)mods[i].String + KERNEL_BASE;
+ // Only map the string if needed
+ if( (tVAddr)mods[i].String > MAX_ARGSTR_POS )
+ {
+ // Assumes the string is < 4096 bytes long)
+ gaArch_BootModules[i].ArgString = (void*)(
+ MM_MapHWPages((tVAddr)mods[i].String, 2)
+ + ((tVAddr)mods[i].String&0xFFF)
+ );
+ }
+ else
+ gaArch_BootModules[i].ArgString = (char *)mods[i].String + KERNEL_BASE;
}
// Pass on to Independent Loader
(tVAddr)gaArch_BootModules[i].Base,
(gaArch_BootModules[i].Size + ((Uint)gaArch_BootModules[i].Base&0xFFF) + 0xFFF) >> 12
);
+
+ if( (tVAddr) gaArch_BootModules[i].ArgString > MAX_ARGSTR_POS )
+ MM_UnmapHWPages( (tVAddr)gaArch_BootModules[i].ArgString, 2 );
}
Log_Log("Arch", "Boot modules loaded");
free( gaArch_BootModules );