From f778f38d9c5a61016d1c83928904851225a864d2 Mon Sep 17 00:00:00 2001 From: Ben Date: Sat, 27 Apr 2019 15:57:17 +0100 Subject: [PATCH] terminal --- build/OwOS.bin | Bin 10184 -> 10184 bytes kernel.asm | 1 + kernel.cpp | 10 +++++++++- lib/kernel/logger/logger.cpp | 0 lib/kernel/logger/logger.h | 4 ++++ 5 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 lib/kernel/logger/logger.cpp create mode 100644 lib/kernel/logger/logger.h diff --git a/build/OwOS.bin b/build/OwOS.bin index 1ee74e18c6259070ba3dc0c6c87c4eaea2c0d54c..9e41ad3165ef3be5a40c58f5eb11703034c435fc 100755 GIT binary patch delta 673 zcmYk3PfJ2U6vgkTPpyomHen@6iV+kMxCkl;DoUs{A&L;9MG&prvOj54%=z7W=FH5SO0*KqP8$giQQ|hzB2yJ2Qd0)e z{+nmpro2#(j$q9#N%`z`{muHsQP*wk{(x3_TfN|FLi4?$yI3pe)wQiJEXqs={h3L3 zNj1mRl8flj5mZkNYmlw?(Bs&wl|!#MG=Yj*;UUh$fMr?e53~6Mh5ZM4d>4Y7jtl)5 zO-s(Wjh|1;D(52JZZT(WdNa;b|7bg(pFcZc8NRR?@n48k)-GvJ5Ot6sJLVp0*q9|) z8j{vwXZC?F!6TZ7z*XlTPk{YG(xL9pfS=*-)VvJNyJYA#-wJAmd*{A;m%K|B#>|ADC~-c~AhQ=lr20&v zt#|*5p}bJHPOIvXqymnbR;)LjHQmVW7id*BYK3oZKG(I+3;hT^JHPyfdVb6b=Z8Jl z%9m0jZlaviQkQjW3tLa1yYR69hZZ?Bfr^UrYqahQv2PoC>qhRa+Ko-)9@GE*^JACh z+S*0T&a~xS#e&=q4>a+}{5S}9JeEBXJ`&jthop5u)J%dLSUae0lVAxZQ_=z!?gzmI zaIfZW@RjS2hrm)u%IW?%_yPV_%`@P#Th<2Pyd^`!RE7p2$E&g>N;g1Yp?k+3Xj{^AIX z5ZCO--#f#|F3myk;=d7l!9Dn=Dcv6gr~mc&3Wu?OTK6e7Y41cn3{fp*q9K!SsaiUW OMobG=YuVRPxA+AQb!$QZ diff --git a/kernel.asm b/kernel.asm index d7db94a..df88945 100644 --- a/kernel.asm +++ b/kernel.asm @@ -38,6 +38,7 @@ _start: .global ASM_INIT_FPU +.type ASM_INIT_FPU, @function ASM_INIT_FPU: # FPU Config diff --git a/kernel.cpp b/kernel.cpp index 4dad3a6..016c514 100644 --- a/kernel.cpp +++ b/kernel.cpp @@ -1,9 +1,14 @@ #include #include -#include +#include #include +extern "C" { + extern void ASM_INIT_FPU(void); +} + extern "C" + int kernel_main(uint32_t magic, multibootInfo_t* multiboot) { cls(); showCursor(); @@ -22,6 +27,9 @@ int kernel_main(uint32_t magic, multibootInfo_t* multiboot) { nline(); nline(); nline(); + ASM_INIT_FPU(); + + write("~#"); for (;;) diff --git a/lib/kernel/logger/logger.cpp b/lib/kernel/logger/logger.cpp new file mode 100644 index 0000000..e69de29 diff --git a/lib/kernel/logger/logger.h b/lib/kernel/logger/logger.h new file mode 100644 index 0000000..269272f --- /dev/null +++ b/lib/kernel/logger/logger.h @@ -0,0 +1,4 @@ +// [FAILED] +// [ OK ] + +