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

Merge branch 'BetterTerm' into cpu

This commit is contained in:
Adrien Bourmault 2019-05-11 00:17:18 +02:00
parent 20cc9ab4be 7f27ead23b
commit cef3c37b89
10 changed files with 111 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/kernel/pwmgnt.h
View File

@ -31,6 +31,7 @@
//----------------------------------------------------------------------------//
noreturn void PoShutdown(void);
noreturn void PoShutdownQemu(void);
noreturn void PoShutdownVirtualbox(void);
noreturn void PoShutdownBochs(void);

3
kaleid/kernel/init/init.c
View File

@ -64,6 +64,5 @@ noreturn void BtStartKern(multiboot_info_t *mbInfo, uint mbMagic, void *codeSeg)
KeStartShell();
KernLog("End of input reached\n");
PoShutdownQemu();
PoShutdown();
}

2
kaleid/kernel/io/rtc.c
View File

@ -151,7 +151,7 @@ void RtcHandler(ISRFrame_t *regs)
void IoPrintRtcTime(void)
{
Time_t* RtcTime = IoGetRtcTime();
KernLog("[RTC Time] %02d/%02d/%04d ; %02d:%02d:%02d \n\n",
KernLog("[RTC Time] %02d/%02d/%04d ; %02d:%02d:%02d \n",
RtcTime->day,
RtcTime->month,
RtcTime->year + RtcTime->century*100,

2
kaleid/kernel/mm/map.c
View File

@ -195,7 +195,7 @@ void MmPrintMemoryMap(void) {
ulong len = memoryMap.entry[i].length;
KernLog("Mem zone : %lp\t%s\twith length: %luMB + %luKB + %luB\n",
KernLog("mem zone: %lp\t%s\twith length: %04luMB + %04luKB + %04luB\n",
memoryMap.entry[i].addr, avStr,
_ADDR_TO_MB(len), _ADDR_TO_KB(len), _ADDR_TO_B(len)
);

5
kaleid/kernel/po/shtdwn.c
View File

@ -59,3 +59,8 @@ noreturn void PoShutdownBochs(void)
__builtin_unreachable();
}
noreturn void PoShutdown(void)
{
PoShutdownQemu();
}

2
kaleid/kernel/ps/sched.c
View File

@ -390,7 +390,7 @@ void pstest(void)
while (tick < 100) {
//if (tick%25==0)ClearTerm(StdOut);
if (tick > 0 && tick != 50 && tick % 10 == 0) {
if (tick > 0 && tick != 50 && tick % 10 == 0 && PsCurProc) {
KernLog("Blocking current process\n");
PsBlockCurProc();
}

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

@ -44,7 +44,7 @@ error_t CmdStarWars(int argc, char **argv, char *cmdline)
error_t CmdQuit(int argc, char **argv, char *cmdline)
{
PoShutdownQemu();
PoShutdown();
return EOK;
}
@ -80,42 +80,114 @@ error_t CmdMemMap(int argc, char **argv, char *cmdline)
return EOK;
}
extern ulong realKernelEnd;
error_t CmdMemUsage(int argc, char **argv, char *cmdline)
{
size_t start, end;
size_t diff, max;
size_t stack_cur;
size_t img_diff, stack_diff;
size_t heap_start, heap_end;
size_t heap_diff, heap_max;
ulong flags = KePauseIRQs();
start = (size_t)_heap_start;
end = (size_t)_heap_end;
max = _heap_max;
heap_start = (size_t)_heap_start;
heap_end = (size_t)_heap_end;
heap_max = _heap_max;
KeRestoreIRQs(flags);
diff = (size_t)end - (size_t)start;
img_diff = realKernelEnd - (size_t)BtLoaderInfo.kernelAddr;
stack_diff = (size_t)BtLoaderInfo.kernelEndAddr - (realKernelEnd + 1);
heap_diff = (size_t)heap_end - (size_t)heap_start;
KernLog("Heap start:\t\t%p (%luMB + %luKB + %luB)\n",
start, _ADDR_TO_MB(start),
_ADDR_TO_KB(start),
_ADDR_TO_B(start));
KernLog("Kernel image\n");
KernLog("Heap end:\t\t%p (%luMB + %luKB + %luB)\n",
end, _ADDR_TO_MB(end),
_ADDR_TO_KB(end),
_ADDR_TO_B(end));
KernLog("\tstarts at:\t\t%p (%04luMB + %04luKB + %04luB)\n",
BtLoaderInfo.kernelAddr,
_ADDR_TO_MB((size_t)BtLoaderInfo.kernelAddr),
_ADDR_TO_KB((size_t)BtLoaderInfo.kernelAddr),
_ADDR_TO_B((size_t)BtLoaderInfo.kernelAddr));
KernLog("Heap size:\t\t%luMB + %luKB + %luB (%#lx)\n",
_ADDR_TO_MB(diff),
_ADDR_TO_KB(diff),
_ADDR_TO_B(diff),
diff);
KernLog("\tends at:\t\t%p (%04luMB + %04luKB + %04luB)\n",
realKernelEnd,
_ADDR_TO_MB(realKernelEnd),
_ADDR_TO_KB(realKernelEnd),
_ADDR_TO_B(realKernelEnd));
KernLog("Max heap size:\t%luMB + %luKB + %luB (%#lx)\n",
_ADDR_TO_MB(max),
_ADDR_TO_KB(max),
_ADDR_TO_B(max),
max);
KernLog("\tsize:\t\t\t%04luMB + %04luKB + %04luB (%p)\n",
_ADDR_TO_MB(img_diff),
_ADDR_TO_KB(img_diff),
_ADDR_TO_B(img_diff),
img_diff);
KernLog("Kernel stack\n");
KernLog("\tstarts at:\t\t%p (%04luMB + %04luKB + %04luB)\n",
BtLoaderInfo.kernelEndAddr,
_ADDR_TO_MB((size_t)BtLoaderInfo.kernelEndAddr),
_ADDR_TO_KB((size_t)BtLoaderInfo.kernelEndAddr),
_ADDR_TO_B((size_t)BtLoaderInfo.kernelEndAddr));
BARRIER();
char var;
(void)var;
stack_cur = (size_t)BtLoaderInfo.kernelEndAddr - (size_t)&var;
KernLog("\tends at:\t\t%p (%04luMB + %04luKB + %04luB)\n",
stack_cur,
_ADDR_TO_MB(stack_cur),
_ADDR_TO_KB(stack_cur),
_ADDR_TO_B(stack_cur));
KernLog("\tmin addr:\t\t%p (%04luMB + %04luKB + %04luB)\n",
realKernelEnd+1,
_ADDR_TO_MB(realKernelEnd+1),
_ADDR_TO_KB(realKernelEnd+1),
_ADDR_TO_B(realKernelEnd+1));
KernLog("\tsize (cur):\t\t%04luMB + %04luKB + %04luB (%p)\n",
_ADDR_TO_MB(stack_cur),
_ADDR_TO_KB(stack_cur),
_ADDR_TO_B(stack_cur),
stack_cur);
KernLog("\tsize (max):\t\t%04luMB + %04luKB + %04luB (%p)\n",
_ADDR_TO_MB(stack_diff),
_ADDR_TO_KB(stack_diff),
_ADDR_TO_B(stack_diff),
stack_diff);
KernLog("Kernel heap\n");
KernLog("\tstarts at:\t\t%p (%04luMB + %04luKB + %04luB)\n",
heap_start, _ADDR_TO_MB(heap_start),
_ADDR_TO_KB(heap_start),
_ADDR_TO_B(heap_start));
KernLog("\tends at:\t\t%p (%04luMB + %04luKB + %04luB)\n",
heap_end, _ADDR_TO_MB(heap_end),
_ADDR_TO_KB(heap_end),
_ADDR_TO_B(heap_end));
KernLog("\tmax addr:\t\t%p (%04luMB + %04luKB + %04luB)\n",
heap_start + heap_max,
_ADDR_TO_MB(heap_start + heap_max),
_ADDR_TO_KB(heap_start + heap_max),
_ADDR_TO_B(heap_start + heap_max));
KernLog("\tsize (cur):\t\t%04luMB + %04luKB + %04luB (%p)\n",
_ADDR_TO_MB(heap_diff),
_ADDR_TO_KB(heap_diff),
_ADDR_TO_B(heap_diff),
heap_diff);
KernLog("\tsize (max):\t\t%04luMB + %04luKB + %04luB (%p)\n",
_ADDR_TO_MB(heap_max),
_ADDR_TO_KB(heap_max),
_ADDR_TO_B(heap_max),
heap_max);
return EOK;
}

4
kaleid/kernel/sh/shell.c
View File

@ -67,7 +67,7 @@ void KeStartShell(void)
memzero(argv0, ARG_MAX);
shargv = &argv0;
KernLog("shell> ");
KernLog("\nshell> ");
BFlushBuf(BStdOut);
while ((rc = BGetFromBuf(BStdIn, &ch)) == EOK || rc == EENDF) {
@ -111,7 +111,7 @@ void KeStartShell(void)
break;
case KEY_ESC:
PoShutdownQemu();
PoShutdown();
break;
default:

1
kaleid/kernel/sh/shell.h
View File

@ -26,6 +26,7 @@
#include <extras/argv.h>
#include <kernel/mm.h>
#include <kernel/boot.h>
#include <kernel/heap.h>
#include <kernel/time.h>
#include <kernel/speaker.h>