mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 14:27:35 +00:00
Kernel: Absorb LibBareMetal back into the kernel
This was supposed to be the foundation for some kind of pre-kernel environment, but nobody is working on it right now, so let's move everything back into the kernel and remove all the confusion.
This commit is contained in:
parent
c12cfdea87
commit
21d5f4ada1
75 changed files with 140 additions and 203 deletions
|
@ -34,8 +34,8 @@
|
|||
# include <Kernel/Thread.h>
|
||||
#endif
|
||||
|
||||
#if !defined(KERNEL) && !defined(BOOTSTRAPPER)
|
||||
#include <stdio.h>
|
||||
#if !defined(KERNEL)
|
||||
# include <stdio.h>
|
||||
#endif
|
||||
|
||||
namespace AK {
|
||||
|
@ -106,7 +106,7 @@ const LogStream& operator<<(const LogStream& stream, const void* value)
|
|||
return stream << buffer;
|
||||
}
|
||||
|
||||
#if defined(__serenity__) && !defined(KERNEL) && !defined(BOOTSTRAPPER)
|
||||
#if defined(__serenity__) && !defined(KERNEL)
|
||||
static TriState got_process_name = TriState::Unknown;
|
||||
static char process_name_buffer[256];
|
||||
#endif
|
||||
|
@ -114,7 +114,7 @@ static char process_name_buffer[256];
|
|||
DebugLogStream dbg()
|
||||
{
|
||||
DebugLogStream stream;
|
||||
#if defined(__serenity__) && !defined(KERNEL) && !defined(BOOTSTRAPPER)
|
||||
#if defined(__serenity__) && !defined(KERNEL)
|
||||
if (got_process_name == TriState::Unknown) {
|
||||
if (get_process_name(process_name_buffer, sizeof(process_name_buffer)) == 0)
|
||||
got_process_name = TriState::True;
|
||||
|
@ -124,19 +124,16 @@ DebugLogStream dbg()
|
|||
if (got_process_name == TriState::True)
|
||||
stream << "\033[33;1m" << process_name_buffer << '(' << getpid() << ")\033[0m: ";
|
||||
#endif
|
||||
#if defined(__serenity__) && defined(KERNEL) && !defined(BOOTSTRAPPER)
|
||||
#if defined(__serenity__) && defined(KERNEL)
|
||||
if (Kernel::Thread::current)
|
||||
stream << "\033[34;1m[" << *Kernel::Thread::current << "]\033[0m: ";
|
||||
else
|
||||
stream << "\033[36;1m[Kernel]\033[0m: ";
|
||||
#endif
|
||||
#if defined(BOOTSTRAPPER) && !defined(__serenity__) && !defined(KERNEL)
|
||||
stream << "\033[36;1m[Bootstrapper]\033[0m: ";
|
||||
#endif
|
||||
return stream;
|
||||
}
|
||||
|
||||
#if defined(KERNEL)
|
||||
#ifdef KERNEL
|
||||
KernelLogStream klog()
|
||||
{
|
||||
KernelLogStream stream;
|
||||
|
@ -146,14 +143,14 @@ KernelLogStream klog()
|
|||
stream << "\033[36;1m[Kernel]\033[0m: ";
|
||||
return stream;
|
||||
}
|
||||
#elif !defined(BOOTSTRAPPER)
|
||||
#else
|
||||
DebugLogStream klog()
|
||||
{
|
||||
return dbg();
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(KERNEL)
|
||||
#ifdef KERNEL
|
||||
KernelLogStream::~KernelLogStream()
|
||||
{
|
||||
char newline = '\n';
|
||||
|
@ -167,7 +164,7 @@ DebugLogStream::~DebugLogStream()
|
|||
write(&newline, 1);
|
||||
}
|
||||
|
||||
#if !defined(KERNEL) && !defined(BOOTSTRAPPER)
|
||||
#ifndef KERNEL
|
||||
StdLogStream::~StdLogStream()
|
||||
{
|
||||
char newline = '\n';
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue