X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fmm_virt.c;h=4c2455e159740258f495a552b114840fbcc85c76;hb=3998cfbbadb005bf3ad52ea2538dc21f82864ddc;hp=aaec06ea1ae93355acd4de050cfc0bf70329700f;hpb=fed0a8f469f7b187d26c0c8cb109bfd6930efaee;p=tpg%2Facess2.git diff --git a/Kernel/arch/x86/mm_virt.c b/Kernel/arch/x86/mm_virt.c index aaec06ea..4c2455e1 100644 --- a/Kernel/arch/x86/mm_virt.c +++ b/Kernel/arch/x86/mm_virt.c @@ -74,8 +74,8 @@ extern void Threads_SegFault(tVAddr Addr); extern void Error_Backtrace(Uint eip, Uint ebp); // === PROTOTYPES === -void MM_PreinitVirtual(); -void MM_InstallVirtual(); +void MM_PreinitVirtual(void); +void MM_InstallVirtual(void); void MM_PageFault(tVAddr Addr, Uint ErrorCode, tRegs *Regs); void MM_DumpTables(tVAddr Start, tVAddr End); tPAddr MM_DuplicatePage(tVAddr VAddr); @@ -102,10 +102,10 @@ Uint32 gWorkerStacks[(NUM_WORKER_STACKS+31)/32]; // === CODE === /** - * \fn void MM_PreinitVirtual() + * \fn void MM_PreinitVirtual(void) * \brief Maps the fractal mappings */ -void MM_PreinitVirtual() +void MM_PreinitVirtual(void) { #if USE_PAE gaInitPageDir[ ((PAGE_TABLE_ADDR >> TAB)-3*512+3)*2 ] = ((tTabEnt)&gaInitPageDir - KERNEL_BASE) | 3; @@ -116,10 +116,10 @@ void MM_PreinitVirtual() } /** - * \fn void MM_InstallVirtual() + * \fn void MM_InstallVirtual(void) * \brief Sets up the constant page mappings */ -void MM_InstallVirtual() +void MM_InstallVirtual(void) { int i; @@ -158,7 +158,6 @@ void MM_InstallVirtual() // Unset kernel on the User Text pages for( i = ((tVAddr)&_UsertextEnd-(tVAddr)&_UsertextBase+0xFFF)/4096; i--; ) { - Log("MM_SetFlags( 0x%08x, 0, MM_PFLAG_KERNEL)", (tVAddr)&_UsertextBase + i*4096); MM_SetFlags( (tVAddr)&_UsertextBase + i*4096, 0, MM_PFLAG_KERNEL ); } } @@ -166,7 +165,7 @@ void MM_InstallVirtual() /** * \brief Cleans up the SMP required mappings */ -void MM_FinishVirtualInit() +void MM_FinishVirtualInit(void) { #if USE_PAE gaInitPDPT[ 0 ] = 0; @@ -247,6 +246,13 @@ void MM_PageFault(tVAddr Addr, Uint ErrorCode, tRegs *Regs) //MM_DumpTables(0, -1); + // Register Dump + Log("EAX %08x ECX %08x EDX %08x EBX %08x", Regs->eax, Regs->ecx, Regs->edx, Regs->ebx); + Log("ESP %08x EBP %08x ESI %08x EDI %08x", Regs->esp, Regs->ebp, Regs->esi, Regs->edi); + //Log("SS:ESP %04x:%08x", Regs->ss, Regs->esp); + Log("CS:EIP %04x:%08x", Regs->cs, Regs->eip); + Log("DS %04x ES %04x FS %04x GS %04x", Regs->ds, Regs->es, Regs->fs, Regs->gs); + Panic("Page Fault at 0x%x (Accessed 0x%x)", Regs->eip, Addr); } @@ -479,7 +485,7 @@ int MM_Map(tVAddr VAddr, tPAddr PAddr) * \fn tVAddr MM_ClearUser() * \brief Clear user's address space */ -tVAddr MM_ClearUser() +tVAddr MM_ClearUser(void) { Uint i, j; @@ -510,10 +516,10 @@ tVAddr MM_ClearUser() } /** - * \fn tPAddr MM_Clone() + * \fn tPAddr MM_Clone(void) * \brief Clone the current address space */ -tPAddr MM_Clone() +tPAddr MM_Clone(void) { Uint i, j; tVAddr ret; @@ -636,10 +642,10 @@ tPAddr MM_Clone() } /** - * \fn tVAddr MM_NewKStack() + * \fn tVAddr MM_NewKStack(void) * \brief Create a new kernel stack */ -tVAddr MM_NewKStack() +tVAddr MM_NewKStack(void) { tVAddr base = KERNEL_STACKS; Uint i;