os-k-team/os-k
os-k-team
/
os-k
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Stuff

This commit is contained in:
Julian Barathieu 2019-05-08 20:54:40 +02:00
parent 0abbf67bc2
commit b91f21fafb
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kaleid/kernel/cpu/idt.c
View File

@ -277,13 +277,13 @@ void IdtEarlyExceptionHandler(ISRFrame_t *regs)
if (!recoverable) { if (!recoverable) {
KeStartPanic("[ISR 0x%x] Irrecoverable Kernel %s\n\n" KeStartPanic("[ISR 0x%x] Irrecoverable Kernel %s\n\n"
" Error code : %p\n\n" " Error code : %p\n\n"
" RIP: %p CS: %p RSP: %p\n" " RIP: %#016lx CS: %#016lx RSP: %#016lx\n"
" SS: %p RAX: %p RBX: %p\n" " SS: %#016lx RAX: %#016lx RBX: %#016lx\n"
" RCX: %p RDX: %p RSI: %p\n" " RCX: %#016lx RDX: %#016lx RSI: %#016lx\n"
" RDI: %p RBP: %p R8: %p\n" " RDI: %#016lx RBP: %#016lx R8: %#016lx\n"
" R9: %p R10: %p R11: %p\n" " R9: %#016lx R10: %#016lx R11: %#016lx\n"
" R12: %p R13: %p R14: %p\n" " R12: %#016lx R13: %#016lx R14: %#016lx\n"
" R15: %p RFLAGS: %022b", " R15: %#016lx RFLAGS: %#022b (%#06x)",
regs->intNo, regs->intNo,
ExceptionsChar[regs->intNo], ExceptionsChar[regs->intNo],
regs->ErrorCode, regs->ErrorCode,
@ -306,6 +306,7 @@ void IdtEarlyExceptionHandler(ISRFrame_t *regs)
regs->regs[12], regs->regs[12],
regs->regs[13], regs->regs[13],
regs->regs[14], regs->regs[14],
regs->rflags,
regs->rflags regs->rflags
); );

7
kaleid/kernel/sh/shcmds.c
View File

@ -117,12 +117,19 @@ error_t CmdPsTest(int argc, char **argv, char *cmdline)
return EOK; return EOK;
} }
error_t CmdDie(int argc, char **argv, char *cmdline)
{
*(char *)NULL += 1;
return EOK;
}
//----------------------------------------------------------------------------// //----------------------------------------------------------------------------//
Command_t cmdtable[] = Command_t cmdtable[] =
{ {
{ "beep", CmdBeep, "Make a beep" }, { "beep", CmdBeep, "Make a beep" },
{ "date", CmdDate, "Print date" }, { "date", CmdDate, "Print date" },
{ "die", CmdDie, "Die painfully" },
{ "exit", CmdQuit, "Initiate shutdown" }, { "exit", CmdQuit, "Initiate shutdown" },
{ "help", CmdHelp, "Show this message" }, { "help", CmdHelp, "Show this message" },
{ "mmap", CmdMemMap, "Show memory map" }, { "mmap", CmdMemMap, "Show memory map" },