mirror of
https://github.com/EnderIce2/Fennix.git
synced 2025-07-01 18:39:16 +00:00
refactor: Fix build on i386
Some checks failed
CodeQL Advanced / Analyze (${{ matrix.language }}) (manual, c-cpp) (push) Has been cancelled
Deploy Documentation / Deploy Documentation to GitHub Pages (push) Has been cancelled
Build OS / Build Cross-Compiler & Toolchain (push) Has been cancelled
Build OS / Build amd64 (push) Has been cancelled
Build OS / Build i386 (push) Has been cancelled
Build OS / Build aarch64 (push) Has been cancelled
Some checks failed
CodeQL Advanced / Analyze (${{ matrix.language }}) (manual, c-cpp) (push) Has been cancelled
Deploy Documentation / Deploy Documentation to GitHub Pages (push) Has been cancelled
Build OS / Build Cross-Compiler & Toolchain (push) Has been cancelled
Build OS / Build amd64 (push) Has been cancelled
Build OS / Build i386 (push) Has been cancelled
Build OS / Build aarch64 (push) Has been cancelled
Signed-off-by: EnderIce2 <enderice2@protonmail.com>
This commit is contained in:
@ -95,17 +95,6 @@ x86ExceptionName x86Exceptions[] = {
|
||||
/*31*/ {"#r7", "Reserved", "Reserved"},
|
||||
};
|
||||
|
||||
static const char *x86PageFaultDescriptions[9] = {
|
||||
"Supervisor tried to read a non-present page entry\n",
|
||||
"Supervisor tried to read a page and caused a protection fault\n",
|
||||
"Supervisor tried to write to a non-present page entry\n",
|
||||
"Supervisor tried to write a page and caused a protection fault\n",
|
||||
"User tried to read a non-present page entry\n",
|
||||
"User tried to read a page and caused a protection fault\n",
|
||||
"User tried to write to a non-present page entry\n",
|
||||
"User tried to write a page and caused a protection fault\n",
|
||||
"One or more page directory entries contain reserved bits which are set to 1.\n"};
|
||||
|
||||
int ActiveScreen = 0;
|
||||
|
||||
char __modSym[20];
|
||||
@ -139,9 +128,19 @@ nsa const char *ExGetKSymbolByAddress(uintptr_t Address)
|
||||
|
||||
nsa const char *ExGetKSymbol(CPU::ExceptionFrame *Frame)
|
||||
{
|
||||
#if defined(__amd64__)
|
||||
if (Frame->rip < (uintptr_t)&_kernel_start &&
|
||||
Frame->rip > (uintptr_t)&_kernel_end)
|
||||
return "<OUTSIDE KERNEL>";
|
||||
#elif defined(__i386__)
|
||||
if (Frame->eip < (uintptr_t)&_kernel_start &&
|
||||
Frame->eip > (uintptr_t)&_kernel_end)
|
||||
return "<OUTSIDE KERNEL>";
|
||||
#elif defined(__aarch64__)
|
||||
if (Frame->pc < (uintptr_t)&_kernel_start &&
|
||||
Frame->pc > (uintptr_t)&_kernel_end)
|
||||
return "<OUTSIDE KERNEL>";
|
||||
#endif
|
||||
|
||||
#if defined(__amd64__)
|
||||
return ExGetKSymbolByAddress(Frame->rip);
|
||||
@ -338,94 +337,7 @@ nsa void DisplayMainScreen(CPU::ExceptionFrame *Frame)
|
||||
ExPrint("\nUse command 'diag' to create a diagnostic report.\n");
|
||||
}
|
||||
|
||||
nsa void DisplayDetailsScreen(CPU::ExceptionFrame *Frame)
|
||||
{
|
||||
ExPrint("\nException Frame:\n");
|
||||
ExPrint(" General Purpose Registers:\n");
|
||||
ExPrint(" RAX: %#lx RBX: %#lx RCX: %#lx RDX: %#lx\n",
|
||||
Frame->rax, Frame->rbx, Frame->rcx, Frame->rdx);
|
||||
ExPrint(" RSI: %#lx RDI: %#lx R8: %#lx R9: %#lx\n",
|
||||
Frame->rsi, Frame->rdi, Frame->r8, Frame->r9);
|
||||
ExPrint(" R10: %#lx R11: %#lx R12: %#lx R13: %#lx\n",
|
||||
Frame->r10, Frame->r11, Frame->r12, Frame->r13);
|
||||
ExPrint(" R14: %#lx R15: %#lx\n", Frame->r14, Frame->r15);
|
||||
|
||||
ExPrint(" Control Registers:\n");
|
||||
ExPrint(" CR0: %#lx CR2: %#lx CR3: %#lx CR4: %#lx\n",
|
||||
Frame->cr0, Frame->cr2, Frame->cr3, Frame->cr4);
|
||||
ExPrint(" CR8: %#lx\n", Frame->cr8);
|
||||
|
||||
ExPrint(" Segment Registers:\n");
|
||||
ExPrint(" CS: %#lx SS: %#lx DS: %#lx ES: %#lx FS: %#lx GS: %#lx\n",
|
||||
Frame->cs, Frame->ss, Frame->ds, Frame->es, Frame->fs, Frame->gs);
|
||||
|
||||
ExPrint(" Debug Registers:\n");
|
||||
ExPrint(" DR0: %#lx DR1: %#lx DR2: %#lx DR3: %#lx\n",
|
||||
Frame->dr0, Frame->dr1, Frame->dr2, Frame->dr3);
|
||||
ExPrint(" DR6: %#lx DR7: %#lx\n", Frame->dr6, Frame->dr7);
|
||||
|
||||
ExPrint(" Other:\n");
|
||||
ExPrint(" INT: %#lx ERR: %#lx RIP: %#lx RFLAGS: %#lx\n",
|
||||
Frame->InterruptNumber, Frame->ErrorCode,
|
||||
Frame->rip, Frame->rflags.raw);
|
||||
ExPrint(" RSP: %#lx RBP: %#lx\n",
|
||||
Frame->rsp, Frame->rbp);
|
||||
|
||||
ExPrint("Exception Details:\n");
|
||||
switch (Frame->InterruptNumber)
|
||||
{
|
||||
case CPU::x86::PageFault:
|
||||
{
|
||||
CPU::x64::PageFaultErrorCode pfCode = {.raw = (uint32_t)Frame->ErrorCode};
|
||||
ExPrint("PFEC: P:%d W:%d U:%d R:%d I:%d PK:%d SS:%d SGX:%d\n",
|
||||
pfCode.P, pfCode.W, pfCode.U, pfCode.R,
|
||||
pfCode.I, pfCode.PK, pfCode.SS, pfCode.SGX);
|
||||
|
||||
{
|
||||
Memory::Virtual vmm((Memory::PageTable *)Frame->cr3);
|
||||
if (vmm.GetMapType((void *)Frame->cr2) != Memory::Virtual::FourKiB)
|
||||
ExPrint("Can't display page %#lx\n", Frame->cr2);
|
||||
else
|
||||
{
|
||||
Memory::PageTableEntry *pte = vmm.GetPTE((void *)Frame->cr2);
|
||||
ExPrint("Page %#lx: P:%d W:%d U:%d G:%d CoW:%d KRsv:%d NX:%d\n",
|
||||
ALIGN_DOWN(Frame->cr2, 0x1000), pte->Present, pte->ReadWrite,
|
||||
pte->UserSupervisor, pte->Global, pte->CopyOnWrite,
|
||||
pte->KernelReserve, pte->ExecuteDisable);
|
||||
}
|
||||
}
|
||||
|
||||
ExPrint("%s", x86PageFaultDescriptions[Frame->ErrorCode & 0b111]);
|
||||
if (Frame->ErrorCode & 0x8)
|
||||
ExPrint("%s", x86PageFaultDescriptions[8]);
|
||||
break;
|
||||
}
|
||||
case CPU::x86::StackSegmentFault:
|
||||
case CPU::x86::GeneralProtectionFault:
|
||||
{
|
||||
CPU::x64::SelectorErrorCode sCode = {.raw = Frame->ErrorCode};
|
||||
ExPrint("Kernel performed an illegal operation.\n");
|
||||
ExPrint("External: %d\n", sCode.External);
|
||||
ExPrint("Table: %d\n", sCode.Table);
|
||||
ExPrint("Index: %#x\n", sCode.Idx);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
ExPrint("No additional information available for this exception.\n");
|
||||
break;
|
||||
}
|
||||
|
||||
if (!TaskManager)
|
||||
return;
|
||||
|
||||
CPUData *core = GetCurrentCPU();
|
||||
Tasking::PCB *proc = core->CurrentProcess.load();
|
||||
Tasking::TCB *thread = core->CurrentThread.load();
|
||||
ExPrint("Exception in %s process %s(%d) thread %s(%d)\n",
|
||||
proc->Security.ExecutionMode == Tasking::User ? "user" : "kernel",
|
||||
proc->Name, proc->ID,
|
||||
thread->Name, thread->ID);
|
||||
}
|
||||
arch void DisplayDetailsScreen(CPU::ExceptionFrame *Frame);
|
||||
|
||||
nsa void DisplayStackScreen(CPU::ExceptionFrame *Frame)
|
||||
{
|
||||
|
Reference in New Issue
Block a user