beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-29 16:21:29 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Kernel: Absorb LibBareMetal back into the kernel

Browse source 
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:
Andreas Kling 2020-05-16 12:00:04 +02:00
parent c12cfdea87
commit 21d5f4ada1
Notes: sideshowbarker 2024-07-19 06:36:47 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/21d5f4ada1a
75 changed files with 140 additions and 203 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AK/Assertions.h
View file

@ -30,8 +30,6 @@
# if defined(KERNEL) # if defined(KERNEL)
# include <Kernel/Assertions.h> # include <Kernel/Assertions.h>
# elif defined(BOOTSTRAPPER)
# include <Bootstrapper/Output/Assertions.h>
# else # else
# include <assert.h> # include <assert.h>
# ifndef __serenity__ # ifndef __serenity__

2
AK/JsonObject.h
View file

@ -148,7 +148,7 @@ inline void JsonValue::serialize(Builder& builder) const
case Type::Bool: case Type::Bool:
builder.append(m_value.as_bool ? "true" : "false"); builder.append(m_value.as_bool ? "true" : "false");
break; break;
#if !defined(KERNEL) && !defined(BOOTSTRAPPER) #if !defined(KERNEL)
case Type::Double: case Type::Double:
builder.appendf("%g", m_value.as_double); builder.appendf("%g", m_value.as_double);
break; break;

4
AK/JsonValue.cpp
View file

@ -100,7 +100,7 @@ bool JsonValue::equals(const JsonValue& other) const
if (is_string() && other.is_string() && as_string() == other.as_string()) if (is_string() && other.is_string() && as_string() == other.as_string())
return true; return true;
#if !defined(KERNEL) && !defined(BOOTSTRAPPER) #if !defined(KERNEL)
if (is_number() && other.is_number() && to_number<double>() == other.to_number<double>()) { if (is_number() && other.is_number() && to_number<double>() == other.to_number<double>()) {
return true; return true;
} }
@ -158,7 +158,7 @@ JsonValue::JsonValue(const char* cstring)
{ {
} }
#if !defined(BOOTSTRAPPER) && !defined(KERNEL) #if !defined(KERNEL)
JsonValue::JsonValue(double value) JsonValue::JsonValue(double value)
: m_type(Type::Double) : m_type(Type::Double)
{ {

14
AK/JsonValue.h
View file

@ -43,7 +43,7 @@ public:
UnsignedInt32, UnsignedInt32,
Int64, Int64,
UnsignedInt64, UnsignedInt64,
#if !defined(KERNEL) && !defined(BOOTSTRAPPER) #if !defined(KERNEL)
Double, Double,
#endif #endif
Bool, Bool,
@ -68,7 +68,7 @@ public:
JsonValue(i64); JsonValue(i64);
JsonValue(u64); JsonValue(u64);
#if !defined(KERNEL) && !defined(BOOTSTRAPPER) #if !defined(KERNEL)
JsonValue(double); JsonValue(double);
#endif #endif
JsonValue(bool); JsonValue(bool);
@ -172,7 +172,7 @@ public:
return *m_value.as_array; return *m_value.as_array;
} }
#if !defined(KERNEL) && !defined(BOOTSTRAPPER) #if !defined(KERNEL)
double as_double() const double as_double() const
{ {
ASSERT(is_double()); ASSERT(is_double());
@ -193,7 +193,7 @@ public:
bool is_u32() const { return m_type == Type::UnsignedInt32; } bool is_u32() const { return m_type == Type::UnsignedInt32; }
bool is_i64() const { return m_type == Type::Int64; } bool is_i64() const { return m_type == Type::Int64; }
bool is_u64() const { return m_type == Type::UnsignedInt64; } bool is_u64() const { return m_type == Type::UnsignedInt64; }
#if !defined(KERNEL) && !defined(BOOTSTRAPPER) #if !defined(KERNEL)
bool is_double() const bool is_double() const
{ {
return m_type == Type::Double; return m_type == Type::Double;
@ -211,7 +211,7 @@ public:
case Type::UnsignedInt32: case Type::UnsignedInt32:
case Type::Int64: case Type::Int64:
case Type::UnsignedInt64: case Type::UnsignedInt64:
#if !defined(KERNEL) && !defined(BOOTSTRAPPER) #if !defined(KERNEL)
case Type::Double: case Type::Double:
#endif #endif
return true; return true;
@ -223,7 +223,7 @@ public:
template<typename T> template<typename T>
T to_number(T default_value = 0) const T to_number(T default_value = 0) const
{ {
#if !defined(KERNEL) && !defined(BOOTSTRAPPER) #if !defined(KERNEL)
if (is_double()) if (is_double())
return (T)as_double(); return (T)as_double();
#endif #endif
@ -250,7 +250,7 @@ private:
StringImpl* as_string { nullptr }; StringImpl* as_string { nullptr };
JsonArray* as_array; JsonArray* as_array;
JsonObject* as_object; JsonObject* as_object;
#if !defined(KERNEL) && !defined(BOOTSTRAPPER) #if !defined(KERNEL)
double as_double; double as_double;
#endif #endif
i32 as_i32; i32 as_i32;

21
AK/LogStream.cpp
View file

@ -34,8 +34,8 @@
# include <Kernel/Thread.h> # include <Kernel/Thread.h>
#endif #endif
#if !defined(KERNEL) && !defined(BOOTSTRAPPER) #if !defined(KERNEL)
#include <stdio.h> # include <stdio.h>
#endif #endif
namespace AK { namespace AK {
@ -106,7 +106,7 @@ const LogStream& operator<<(const LogStream& stream, const void* value)
return stream << buffer; return stream << buffer;
} }
#if defined(__serenity__) && !defined(KERNEL) && !defined(BOOTSTRAPPER) #if defined(__serenity__) && !defined(KERNEL)
static TriState got_process_name = TriState::Unknown; static TriState got_process_name = TriState::Unknown;
static char process_name_buffer[256]; static char process_name_buffer[256];
#endif #endif
@ -114,7 +114,7 @@ static char process_name_buffer[256];
DebugLogStream dbg() DebugLogStream dbg()
{ {
DebugLogStream stream; DebugLogStream stream;
#if defined(__serenity__) && !defined(KERNEL) && !defined(BOOTSTRAPPER) #if defined(__serenity__) && !defined(KERNEL)
if (got_process_name == TriState::Unknown) { if (got_process_name == TriState::Unknown) {
if (get_process_name(process_name_buffer, sizeof(process_name_buffer)) == 0) if (get_process_name(process_name_buffer, sizeof(process_name_buffer)) == 0)
got_process_name = TriState::True; got_process_name = TriState::True;
@ -124,19 +124,16 @@ DebugLogStream dbg()
if (got_process_name == TriState::True) if (got_process_name == TriState::True)
stream << "\033[33;1m" << process_name_buffer << '(' << getpid() << ")\033[0m: "; stream << "\033[33;1m" << process_name_buffer << '(' << getpid() << ")\033[0m: ";
#endif #endif
#if defined(__serenity__) && defined(KERNEL) && !defined(BOOTSTRAPPER) #if defined(__serenity__) && defined(KERNEL)
if (Kernel::Thread::current) if (Kernel::Thread::current)
stream << "\033[34;1m[" << *Kernel::Thread::current << "]\033[0m: "; stream << "\033[34;1m[" << *Kernel::Thread::current << "]\033[0m: ";
else else
stream << "\033[36;1m[Kernel]\033[0m: "; stream << "\033[36;1m[Kernel]\033[0m: ";
#endif
#if defined(BOOTSTRAPPER) && !defined(__serenity__) && !defined(KERNEL)
stream << "\033[36;1m[Bootstrapper]\033[0m: ";
#endif #endif
return stream; return stream;
} }
#if defined(KERNEL) #ifdef KERNEL
KernelLogStream klog() KernelLogStream klog()
{ {
KernelLogStream stream; KernelLogStream stream;
@ -146,14 +143,14 @@ KernelLogStream klog()
stream << "\033[36;1m[Kernel]\033[0m: "; stream << "\033[36;1m[Kernel]\033[0m: ";
return stream; return stream;
} }
#elif !defined(BOOTSTRAPPER) #else
DebugLogStream klog() DebugLogStream klog()
{ {
return dbg(); return dbg();
} }
#endif #endif
#if defined(KERNEL) #ifdef KERNEL
KernelLogStream::~KernelLogStream() KernelLogStream::~KernelLogStream()
{ {
char newline = '\n'; char newline = '\n';
@ -167,7 +164,7 @@ DebugLogStream::~DebugLogStream()
write(&newline, 1); write(&newline, 1);
} }
#if !defined(KERNEL) && !defined(BOOTSTRAPPER) #ifndef KERNEL
StdLogStream::~StdLogStream() StdLogStream::~StdLogStream()
{ {
char newline = '\n'; char newline = '\n';

18
AK/LogStream.h
View file

@ -30,7 +30,7 @@
#include <AK/Types.h> #include <AK/Types.h>
#include <AK/kstdio.h> #include <AK/kstdio.h>
#if !defined(KERNEL) && !defined(BOOTSTRAPPER) #if !defined(KERNEL)
# include <AK/ScopedValueRollback.h> # include <AK/ScopedValueRollback.h>
# include <AK/StringView.h> # include <AK/StringView.h>
# include <errno.h> # include <errno.h>
@ -42,7 +42,7 @@ namespace AK {
class LogStream { class LogStream {
public: public:
LogStream() LogStream()
#if !defined(KERNEL) && !defined(BOOTSTRAPPER) #if !defined(KERNEL)
: m_errno_restorer(errno) : m_errno_restorer(errno)
#endif #endif
{ {
@ -52,7 +52,7 @@ public:
virtual void write(const char*, int) const = 0; virtual void write(const char*, int) const = 0;
private: private:
#if !defined(KERNEL) && !defined(BOOTSTRAPPER) #if !defined(KERNEL)
ScopedValueRollback<int> m_errno_restorer; ScopedValueRollback<int> m_errno_restorer;
#endif #endif
}; };
@ -68,7 +68,7 @@ public:
} }
}; };
#if !defined(KERNEL) && !defined(BOOTSTRAPPER) #if !defined(KERNEL)
class StdLogStream final : public LogStream { class StdLogStream final : public LogStream {
public: public:
StdLogStream(int fd) StdLogStream(int fd)
@ -86,7 +86,7 @@ inline StdLogStream out() { return StdLogStream(STDOUT_FILENO); }
inline StdLogStream warn() { return StdLogStream(STDERR_FILENO); } inline StdLogStream warn() { return StdLogStream(STDERR_FILENO); }
#endif #endif
#if !defined(BOOTSTRAPPER) && defined(KERNEL) #ifdef KERNEL
class KernelLogStream final : public LogStream { class KernelLogStream final : public LogStream {
public: public:
KernelLogStream() {} KernelLogStream() {}
@ -121,7 +121,7 @@ const LogStream& operator<<(const LogStream&, long long);
const LogStream& operator<<(const LogStream&, unsigned long); const LogStream& operator<<(const LogStream&, unsigned long);
const LogStream& operator<<(const LogStream&, unsigned long long); const LogStream& operator<<(const LogStream&, unsigned long long);
#if !defined(KERNEL) && !defined(BOOTSTRAPPER) #if !defined(KERNEL)
const LogStream& operator<<(const LogStream&, double); const LogStream& operator<<(const LogStream&, double);
const LogStream& operator<<(const LogStream&, float); const LogStream& operator<<(const LogStream&, float);
#endif #endif
@ -141,9 +141,9 @@ inline const LogStream& operator<<(const LogStream& stream, bool value)
DebugLogStream dbg(); DebugLogStream dbg();
#if defined(KERNEL) #ifdef KERNEL
KernelLogStream klog(); KernelLogStream klog();
#elif !defined(BOOTSTRAPPER) #else
DebugLogStream klog(); DebugLogStream klog();
#endif #endif
@ -153,7 +153,7 @@ using AK::dbg;
using AK::klog; using AK::klog;
using AK::LogStream; using AK::LogStream;
#if !defined(KERNEL) && !defined(BOOTSTRAPPER) #if !defined(KERNEL)
using AK::out; using AK::out;
using AK::warn; using AK::warn;
#endif #endif

8
AK/Memory.h
View file

@ -28,20 +28,20 @@
#include <AK/Types.h> #include <AK/Types.h>
#if defined(KERNEL) || defined(BOOTSTRAPPER) #if defined(KERNEL)
# include <LibBareMetal/StdLib.h> # include <Kernel/StdLib.h>
#else #else
# include <stdlib.h> # include <stdlib.h>
# include <string.h> # include <string.h>
#endif #endif
#if defined(__serenity__) && !defined(KERNEL) && !defined(BOOTSTRAPPER) #if defined(__serenity__) && !defined(KERNEL)
extern "C" void* mmx_memcpy(void* to, const void* from, size_t); extern "C" void* mmx_memcpy(void* to, const void* from, size_t);
#endif #endif
ALWAYS_INLINE void fast_u32_copy(u32* dest, const u32* src, size_t count) ALWAYS_INLINE void fast_u32_copy(u32* dest, const u32* src, size_t count)
{ {
#if defined(__serenity__) && !defined(KERNEL) && !defined(BOOTSTRAPPER) #if defined(__serenity__) && !defined(KERNEL)
if (count >= 256) { if (count >= 256) {
mmx_memcpy(dest, src, count * sizeof(count)); mmx_memcpy(dest, src, count * sizeof(count));
return; return;

2
AK/PrintfImplementation.h
View file

@ -388,7 +388,7 @@ ALWAYS_INLINE int printf_internal(PutChFunc putch, char* buffer, const char*& fm
ret += print_hex(putch, bufptr, va_arg(ap, u64), false, false, left_pad, zero_pad, 16); ret += print_hex(putch, bufptr, va_arg(ap, u64), false, false, left_pad, zero_pad, 16);
break; break;
#if !defined(BOOTSTRAPPER) && !defined(KERNEL) #if !defined(KERNEL)
case 'g': case 'g':
case 'f': case 'f':
ret += print_double(putch, bufptr, va_arg(ap, double), left_pad, zero_pad, field_width, fraction_length); ret += print_double(putch, bufptr, va_arg(ap, double), left_pad, zero_pad, field_width, fraction_length);

2
AK/kmalloc.h
View file

@ -42,8 +42,6 @@
#if defined(KERNEL) #if defined(KERNEL)
# include <Kernel/Heap/kmalloc.h> # include <Kernel/Heap/kmalloc.h>
#elif defined(BOOTSTRAPPER)
# include <Bootstrapper/Memory/malloc.h>
#else #else
# include <stdlib.h> # include <stdlib.h>

4
AK/kstdio.h
View file

@ -27,8 +27,8 @@
#pragma once #pragma once
#ifdef __serenity__ #ifdef __serenity__
# if defined(KERNEL) || defined(BOOTSTRAPPER) # ifdef KERNEL
# include <LibBareMetal/Output/kstdio.h> # include <Kernel/kstdio.h>
# else # else
# include <AK/Types.h> # include <AK/Types.h>
extern "C" { extern "C" {

2
Kernel/ACPI/DMIDecoder.cpp
View file

@ -27,7 +27,7 @@
#include <AK/StringView.h> #include <AK/StringView.h>
#include <Kernel/ACPI/DMIDecoder.h> #include <Kernel/ACPI/DMIDecoder.h>
#include <Kernel/VM/MemoryManager.h> #include <Kernel/VM/MemoryManager.h>
#include <LibBareMetal/StdLib.h> #include <Kernel/StdLib.h>
namespace Kernel { namespace Kernel {

4
Kernel/ACPI/DMIDecoder.h
View file

@ -30,8 +30,8 @@
#include <AK/Types.h> #include <AK/Types.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <Kernel/VM/Region.h> #include <Kernel/VM/Region.h>
#include <LibBareMetal/Memory/PhysicalAddress.h> #include <Kernel/PhysicalAddress.h>
#include <LibBareMetal/Memory/VirtualAddress.h> #include <Kernel/VirtualAddress.h>
namespace Kernel { namespace Kernel {

2
Kernel/ACPI/Definitions.h
View file

@ -29,7 +29,7 @@
#include <AK/RefCounted.h> #include <AK/RefCounted.h>
#include <AK/Types.h> #include <AK/Types.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibBareMetal/Memory/PhysicalAddress.h> #include <Kernel/PhysicalAddress.h>
namespace Kernel { namespace Kernel {

2
Kernel/ACPI/DynamicParser.h
View file

@ -31,7 +31,7 @@
#include <Kernel/Interrupts/IRQHandler.h> #include <Kernel/Interrupts/IRQHandler.h>
#include <Kernel/Lock.h> #include <Kernel/Lock.h>
#include <Kernel/VM/PhysicalPage.h> #include <Kernel/VM/PhysicalPage.h>
#include <LibBareMetal/Memory/PhysicalAddress.h> #include <Kernel/PhysicalAddress.h>
namespace Kernel { namespace Kernel {
namespace ACPI { namespace ACPI {

2
Kernel/ACPI/MultiProcessorParser.cpp
View file

@ -28,7 +28,7 @@
#include <Kernel/ACPI/MultiProcessorParser.h> #include <Kernel/ACPI/MultiProcessorParser.h>
#include <Kernel/Interrupts/IOAPIC.h> #include <Kernel/Interrupts/IOAPIC.h>
#include <Kernel/VM/MemoryManager.h> #include <Kernel/VM/MemoryManager.h>
#include <LibBareMetal/StdLib.h> #include <Kernel/StdLib.h>
//#define MULTIPROCESSOR_DEBUG //#define MULTIPROCESSOR_DEBUG

4
Kernel/ACPI/MultiProcessorParser.h
View file

@ -28,8 +28,8 @@
#include <AK/Types.h> #include <AK/Types.h>
#include <Kernel/VM/Region.h> #include <Kernel/VM/Region.h>
#include <LibBareMetal/Memory/PhysicalAddress.h> #include <Kernel/PhysicalAddress.h>
#include <LibBareMetal/Memory/VirtualAddress.h> #include <Kernel/VirtualAddress.h>
namespace Kernel { namespace Kernel {
namespace MultiProcessor { namespace MultiProcessor {

4
Kernel/ACPI/Parser.cpp
View file

@ -30,8 +30,8 @@
#include <Kernel/PCI/Access.h> #include <Kernel/PCI/Access.h>
#include <Kernel/VM/MemoryManager.h> #include <Kernel/VM/MemoryManager.h>
#include <Kernel/VM/TypedMapping.h> #include <Kernel/VM/TypedMapping.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
#include <LibBareMetal/StdLib.h> #include <Kernel/StdLib.h>
namespace Kernel { namespace Kernel {
namespace ACPI { namespace ACPI {

4
Kernel/ACPI/Parser.h
View file

@ -31,8 +31,8 @@
#include <Kernel/ACPI/Initialize.h> #include <Kernel/ACPI/Initialize.h>
#include <Kernel/FileSystem/File.h> #include <Kernel/FileSystem/File.h>
#include <Kernel/VM/Region.h> #include <Kernel/VM/Region.h>
#include <LibBareMetal/Memory/PhysicalAddress.h> #include <Kernel/PhysicalAddress.h>
#include <LibBareMetal/Memory/VirtualAddress.h> #include <Kernel/VirtualAddress.h>
namespace Kernel { namespace Kernel {
namespace ACPI { namespace ACPI {

2
Kernel/Arch/i386/CPU.cpp
View file

@ -39,7 +39,7 @@
#include <Kernel/KSyms.h> #include <Kernel/KSyms.h>
#include <Kernel/Process.h> #include <Kernel/Process.h>
#include <Kernel/VM/MemoryManager.h> #include <Kernel/VM/MemoryManager.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
#include <LibC/mallocdefs.h> #include <LibC/mallocdefs.h>
//#define PAGE_FAULT_DEBUG //#define PAGE_FAULT_DEBUG

4
Kernel/Arch/i386/CPU.h
View file

@ -28,8 +28,8 @@
#include <AK/Badge.h> #include <AK/Badge.h>
#include <AK/Noncopyable.h> #include <AK/Noncopyable.h>
#include <LibBareMetal/Memory/PhysicalAddress.h> #include <Kernel/PhysicalAddress.h>
#include <LibBareMetal/Memory/VirtualAddress.h> #include <Kernel/VirtualAddress.h>
#define PAGE_SIZE 4096 #define PAGE_SIZE 4096
#define GENERIC_INTERRUPT_HANDLERS_COUNT 128 #define GENERIC_INTERRUPT_HANDLERS_COUNT 128

2
Kernel/CMOS.cpp
View file

@ -25,7 +25,7 @@
*/ */
#include <Kernel/CMOS.h> #include <Kernel/CMOS.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
namespace CMOS { namespace CMOS {

48
Kernel/CMakeLists.txt
View file

@ -7,8 +7,9 @@ set(KERNEL_SOURCES
Arch/i386/CPU.cpp Arch/i386/CPU.cpp
CMOS.cpp CMOS.cpp
CommandLine.cpp CommandLine.cpp
Devices/BlockDevice.cpp Console.cpp
Devices/BXVGADevice.cpp Devices/BXVGADevice.cpp
Devices/BlockDevice.cpp
Devices/CharacterDevice.cpp Devices/CharacterDevice.cpp
Devices/Device.cpp Devices/Device.cpp
Devices/DiskPartition.cpp Devices/DiskPartition.cpp
@ -33,8 +34,8 @@ set(KERNEL_SOURCES
FileSystem/DevPtsFS.cpp FileSystem/DevPtsFS.cpp
FileSystem/Ext2FileSystem.cpp FileSystem/Ext2FileSystem.cpp
FileSystem/FIFO.cpp FileSystem/FIFO.cpp
FileSystem/FileBackedFileSystem.cpp
FileSystem/File.cpp FileSystem/File.cpp
FileSystem/FileBackedFileSystem.cpp
FileSystem/FileDescription.cpp FileSystem/FileDescription.cpp
FileSystem/FileSystem.cpp FileSystem/FileSystem.cpp
FileSystem/Inode.cpp FileSystem/Inode.cpp
@ -43,14 +44,13 @@ set(KERNEL_SOURCES
FileSystem/ProcFS.cpp FileSystem/ProcFS.cpp
FileSystem/TmpFS.cpp FileSystem/TmpFS.cpp
FileSystem/VirtualFileSystem.cpp FileSystem/VirtualFileSystem.cpp
Heap/kmalloc.cpp
Heap/SlabAllocator.cpp Heap/SlabAllocator.cpp
init.cpp Heap/kmalloc.cpp
Interrupts/APIC.cpp Interrupts/APIC.cpp
Interrupts/GenericInterruptHandler.cpp Interrupts/GenericInterruptHandler.cpp
Interrupts/InterruptManagement.cpp
Interrupts/IOAPIC.cpp Interrupts/IOAPIC.cpp
Interrupts/IRQHandler.cpp Interrupts/IRQHandler.cpp
Interrupts/InterruptManagement.cpp
Interrupts/PIC.cpp Interrupts/PIC.cpp
Interrupts/SharedIRQHandler.cpp Interrupts/SharedIRQHandler.cpp
Interrupts/SpuriousInterruptHandler.cpp Interrupts/SpuriousInterruptHandler.cpp
@ -64,41 +64,42 @@ set(KERNEL_SOURCES
Net/LoopbackAdapter.cpp Net/LoopbackAdapter.cpp
Net/NetworkAdapter.cpp Net/NetworkAdapter.cpp
Net/NetworkTask.cpp Net/NetworkTask.cpp
Net/Routing.cpp
Net/RTL8139NetworkAdapter.cpp Net/RTL8139NetworkAdapter.cpp
Net/Routing.cpp
Net/Socket.cpp Net/Socket.cpp
Net/TCPSocket.cpp Net/TCPSocket.cpp
Net/UDPSocket.cpp Net/UDPSocket.cpp
PCI/Access.cpp PCI/Access.cpp
PCI/Device.cpp PCI/Device.cpp
PCI/Initializer.cpp
PCI/IOAccess.cpp PCI/IOAccess.cpp
PCI/Initializer.cpp
PCI/MMIOAccess.cpp PCI/MMIOAccess.cpp
PerformanceEventBuffer.cpp PerformanceEventBuffer.cpp
Process.cpp Process.cpp
Profiling.cpp Profiling.cpp
Ptrace.cpp Ptrace.cpp
Random.cpp
RTC.cpp RTC.cpp
Random.cpp
Scheduler.cpp Scheduler.cpp
SharedBuffer.cpp SharedBuffer.cpp
StdLib.cpp
Syscall.cpp Syscall.cpp
Tasks/FinalizerTask.cpp
Tasks/SyncTask.cpp
Thread.cpp
ThreadTracer.cpp
Time/HardwareTimer.cpp
Time/HPETComparator.cpp
Time/HPET.cpp
Time/PIT.cpp
TimerQueue.cpp
Time/RTC.cpp
Time/TimeManagement.cpp
TTY/MasterPTY.cpp TTY/MasterPTY.cpp
TTY/PTYMultiplexer.cpp TTY/PTYMultiplexer.cpp
TTY/SlavePTY.cpp TTY/SlavePTY.cpp
TTY/TTY.cpp TTY/TTY.cpp
TTY/VirtualConsole.cpp TTY/VirtualConsole.cpp
Tasks/FinalizerTask.cpp
Tasks/SyncTask.cpp
Thread.cpp
ThreadTracer.cpp
Time/HPET.cpp
Time/HPETComparator.cpp
Time/HardwareTimer.cpp
Time/PIT.cpp
Time/RTC.cpp
Time/TimeManagement.cpp
TimerQueue.cpp
VM/AnonymousVMObject.cpp VM/AnonymousVMObject.cpp
VM/ContiguousVMObject.cpp VM/ContiguousVMObject.cpp
VM/InodeVMObject.cpp VM/InodeVMObject.cpp
@ -114,6 +115,8 @@ set(KERNEL_SOURCES
VM/SharedInodeVMObject.cpp VM/SharedInodeVMObject.cpp
VM/VMObject.cpp VM/VMObject.cpp
WaitQueue.cpp WaitQueue.cpp
init.cpp
kprintf.cpp
) )
set(AK_SOURCES set(AK_SOURCES
@ -135,17 +138,10 @@ set(ELF_SOURCES
../Libraries/LibELF/Validation.cpp ../Libraries/LibELF/Validation.cpp
) )
set(BARE_METAL_SOURCES
../Libraries/LibBareMetal/Output/Console.cpp
../Libraries/LibBareMetal/Output/kprintf.cpp
../Libraries/LibBareMetal/StdLib.cpp
)
set(SOURCES set(SOURCES
${KERNEL_SOURCES} ${KERNEL_SOURCES}
${AK_SOURCES} ${AK_SOURCES}
${ELF_SOURCES} ${ELF_SOURCES}
${BARE_METAL_SOURCES}
) )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DKERNEL") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DKERNEL")

10
Libraries/LibBareMetal/Output/Console.cpp → Kernel/Console.cpp
View file

@ -24,9 +24,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <LibBareMetal/IO.h> #include <Kernel/Console.h>
#include <LibBareMetal/Output/Console.h> #include <Kernel/IO.h>
#include <LibBareMetal/Output/kstdio.h> #include <Kernel/kstdio.h>
// Bytes output to 0xE9 end up on the Bochs console. It's very handy. // Bytes output to 0xE9 end up on the Bochs console. It's very handy.
#define CONSOLE_OUT_TO_E9 #define CONSOLE_OUT_TO_E9
@ -45,9 +45,7 @@ bool Console::is_initialized()
} }
Console::Console() Console::Console()
#if defined(KERNEL)
: CharacterDevice(5, 1) : CharacterDevice(5, 1)
#endif
{ {
s_the = this; s_the = this;
} }
@ -56,7 +54,6 @@ Console::~Console()
{ {
} }
#if defined(KERNEL)
bool Console::can_read(const Kernel::FileDescription&, size_t) const bool Console::can_read(const Kernel::FileDescription&, size_t) const
{ {
return false; return false;
@ -79,7 +76,6 @@ ssize_t Console::write(Kernel::FileDescription&, size_t, const u8* data, ssize_t
put_char(data[i]); put_char(data[i]);
return size; return size;
} }
#endif
void Console::put_char(char ch) void Console::put_char(char ch)
{ {

15
Libraries/LibBareMetal/Output/Console.h → Kernel/Console.h
View file

@ -28,9 +28,7 @@
#include <AK/CircularQueue.h> #include <AK/CircularQueue.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#if defined(KERNEL) #include <Kernel/Devices/CharacterDevice.h>
# include <Kernel/Devices/CharacterDevice.h>
#endif
class ConsoleImplementation { class ConsoleImplementation {
public: public:
@ -38,31 +36,22 @@ public:
virtual void on_sysconsole_receive(u8) = 0; virtual void on_sysconsole_receive(u8) = 0;
}; };
#if defined(KERNEL)
class Console final : public Kernel::CharacterDevice { class Console final : public Kernel::CharacterDevice {
AK_MAKE_ETERNAL AK_MAKE_ETERNAL
#elif defined(BOOTSTRAPPER)
class Console {
#endif
public: public:
static Console& the(); static Console& the();
static bool is_initialized(); static bool is_initialized();
Console(); Console();
#if defined(KERNEL)
virtual ~Console() override; virtual ~Console() override;
#elif defined(BOOTSTRAPPER)
virtual ~Console();
#endif
#if defined(KERNEL)
// ^CharacterDevice // ^CharacterDevice
virtual bool can_read(const Kernel::FileDescription&, size_t) const override; virtual bool can_read(const Kernel::FileDescription&, size_t) const override;
virtual bool can_write(const Kernel::FileDescription&, size_t) const override { return true; } virtual bool can_write(const Kernel::FileDescription&, size_t) const override { return true; }
virtual ssize_t read(Kernel::FileDescription&, size_t, u8*, ssize_t) override; virtual ssize_t read(Kernel::FileDescription&, size_t, u8*, ssize_t) override;
virtual ssize_t write(Kernel::FileDescription&, size_t, const u8*, ssize_t) override; virtual ssize_t write(Kernel::FileDescription&, size_t, const u8*, ssize_t) override;
virtual const char* class_name() const override { return "Console"; } virtual const char* class_name() const override { return "Console"; }
#endif
void set_implementation(ConsoleImplementation* implementation) void set_implementation(ConsoleImplementation* implementation)
{ {
m_implementation = implementation; m_implementation = implementation;

2
Kernel/Devices/BXVGADevice.cpp
View file

@ -30,7 +30,7 @@
#include <Kernel/Process.h> #include <Kernel/Process.h>
#include <Kernel/VM/AnonymousVMObject.h> #include <Kernel/VM/AnonymousVMObject.h>
#include <Kernel/VM/MemoryManager.h> #include <Kernel/VM/MemoryManager.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
#include <LibC/errno_numbers.h> #include <LibC/errno_numbers.h>
#include <LibC/sys/ioctl_numbers.h> #include <LibC/sys/ioctl_numbers.h>

2
Kernel/Devices/BXVGADevice.h
View file

@ -29,7 +29,7 @@
#include <AK/String.h> #include <AK/String.h>
#include <AK/Types.h> #include <AK/Types.h>
#include <Kernel/Devices/BlockDevice.h> #include <Kernel/Devices/BlockDevice.h>
#include <LibBareMetal/Memory/PhysicalAddress.h> #include <Kernel/PhysicalAddress.h>
namespace Kernel { namespace Kernel {

2
Kernel/Devices/KeyboardDevice.cpp
View file

@ -31,7 +31,7 @@
#include <Kernel/Arch/i386/CPU.h> #include <Kernel/Arch/i386/CPU.h>
#include <Kernel/Devices/KeyboardDevice.h> #include <Kernel/Devices/KeyboardDevice.h>
#include <Kernel/TTY/VirtualConsole.h> #include <Kernel/TTY/VirtualConsole.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
//#define KEYBOARD_DEBUG //#define KEYBOARD_DEBUG

2
Kernel/Devices/MBVGADevice.h
View file

@ -29,7 +29,7 @@
#include <AK/String.h> #include <AK/String.h>
#include <AK/Types.h> #include <AK/Types.h>
#include <Kernel/Devices/BlockDevice.h> #include <Kernel/Devices/BlockDevice.h>
#include <LibBareMetal/Memory/PhysicalAddress.h> #include <Kernel/PhysicalAddress.h>
namespace Kernel { namespace Kernel {

2
Kernel/Devices/PATAChannel.cpp
View file

@ -31,7 +31,7 @@
#include <Kernel/FileSystem/ProcFS.h> #include <Kernel/FileSystem/ProcFS.h>
#include <Kernel/Process.h> #include <Kernel/Process.h>
#include <Kernel/VM/MemoryManager.h> #include <Kernel/VM/MemoryManager.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
namespace Kernel { namespace Kernel {

4
Kernel/Devices/PATAChannel.h
View file

@ -43,8 +43,8 @@
#include <Kernel/PCI/Device.h> #include <Kernel/PCI/Device.h>
#include <Kernel/VM/PhysicalPage.h> #include <Kernel/VM/PhysicalPage.h>
#include <Kernel/WaitQueue.h> #include <Kernel/WaitQueue.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
#include <LibBareMetal/Memory/PhysicalAddress.h> #include <Kernel/PhysicalAddress.h>
namespace Kernel { namespace Kernel {

2
Kernel/Devices/PCSpeaker.cpp
View file

@ -27,7 +27,7 @@
#include <Kernel/Arch/i386/CPU.h> #include <Kernel/Arch/i386/CPU.h>
#include <Kernel/Devices/PCSpeaker.h> #include <Kernel/Devices/PCSpeaker.h>
#include <Kernel/Time/PIT.h> #include <Kernel/Time/PIT.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
void PCSpeaker::tone_on(int frequency) void PCSpeaker::tone_on(int frequency)
{ {

2
Kernel/Devices/PS2MouseDevice.cpp
View file

@ -27,7 +27,7 @@
#include <AK/Memory.h> #include <AK/Memory.h>
#include <Kernel/Devices/PS2MouseDevice.h> #include <Kernel/Devices/PS2MouseDevice.h>
#include <Kernel/Devices/VMWareBackdoor.h> #include <Kernel/Devices/VMWareBackdoor.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
namespace Kernel { namespace Kernel {

2
Kernel/Devices/SB16.cpp
View file

@ -30,7 +30,7 @@
#include <Kernel/Thread.h> #include <Kernel/Thread.h>
#include <Kernel/VM/AnonymousVMObject.h> #include <Kernel/VM/AnonymousVMObject.h>
#include <Kernel/VM/MemoryManager.h> #include <Kernel/VM/MemoryManager.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
//#define SB16_DEBUG //#define SB16_DEBUG

2
Kernel/Devices/SB16.h
View file

@ -30,7 +30,7 @@
#include <Kernel/Interrupts/IRQHandler.h> #include <Kernel/Interrupts/IRQHandler.h>
#include <Kernel/VM/PhysicalPage.h> #include <Kernel/VM/PhysicalPage.h>
#include <Kernel/WaitQueue.h> #include <Kernel/WaitQueue.h>
#include <LibBareMetal/Memory/PhysicalAddress.h> #include <Kernel/PhysicalAddress.h>
namespace Kernel { namespace Kernel {

2
Kernel/Devices/SerialDevice.cpp
View file

@ -25,7 +25,7 @@
*/ */
#include <Kernel/Devices/SerialDevice.h> #include <Kernel/Devices/SerialDevice.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
namespace Kernel { namespace Kernel {

2
Kernel/Devices/VMWareBackdoor.cpp
View file

@ -30,7 +30,7 @@
#include <Kernel/CommandLine.h> #include <Kernel/CommandLine.h>
#include <Kernel/Devices/VMWareBackdoor.h> #include <Kernel/Devices/VMWareBackdoor.h>
#include <Kernel/MousePacket.h> #include <Kernel/MousePacket.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
namespace Kernel { namespace Kernel {

2
Kernel/FileSystem/File.h
View file

@ -33,7 +33,7 @@
#include <Kernel/Forward.h> #include <Kernel/Forward.h>
#include <Kernel/KResult.h> #include <Kernel/KResult.h>
#include <Kernel/UnixTypes.h> #include <Kernel/UnixTypes.h>
#include <LibBareMetal/Memory/VirtualAddress.h> #include <Kernel/VirtualAddress.h>
namespace Kernel { namespace Kernel {

2
Kernel/FileSystem/FileDescription.h
View file

@ -34,7 +34,7 @@
#include <Kernel/FileSystem/InodeMetadata.h> #include <Kernel/FileSystem/InodeMetadata.h>
#include <Kernel/FileSystem/VirtualFileSystem.h> #include <Kernel/FileSystem/VirtualFileSystem.h>
#include <Kernel/KBuffer.h> #include <Kernel/KBuffer.h>
#include <LibBareMetal/Memory/VirtualAddress.h> #include <Kernel/VirtualAddress.h>
namespace Kernel { namespace Kernel {

4
Kernel/FileSystem/ProcFS.cpp
View file

@ -54,8 +54,8 @@
#include <Kernel/TTY/TTY.h> #include <Kernel/TTY/TTY.h>
#include <Kernel/VM/MemoryManager.h> #include <Kernel/VM/MemoryManager.h>
#include <Kernel/VM/PurgeableVMObject.h> #include <Kernel/VM/PurgeableVMObject.h>
#include <LibBareMetal/Output/Console.h> #include <Kernel/Console.h>
#include <LibBareMetal/StdLib.h> #include <Kernel/StdLib.h>
#include <LibC/errno_numbers.h> #include <LibC/errno_numbers.h>
namespace Kernel { namespace Kernel {

2
Kernel/Heap/kmalloc.cpp
View file

@ -38,7 +38,7 @@
#include <Kernel/KSyms.h> #include <Kernel/KSyms.h>
#include <Kernel/Process.h> #include <Kernel/Process.h>
#include <Kernel/Scheduler.h> #include <Kernel/Scheduler.h>
#include <LibBareMetal/StdLib.h> #include <Kernel/StdLib.h>
#define SANITIZE_KMALLOC #define SANITIZE_KMALLOC

7
Libraries/LibBareMetal/IO.h → Kernel/IO.h
View file

@ -30,10 +30,7 @@
#include <AK/LogStream.h> #include <AK/LogStream.h>
#include <AK/String.h> #include <AK/String.h>
#include <AK/Types.h> #include <AK/Types.h>
#include <Kernel/Arch/i386/CPU.h>
#if defined(KERNEL)
# include <Kernel/Arch/i386/CPU.h>
#endif
namespace IO { namespace IO {
@ -104,7 +101,7 @@ inline void delay(size_t microseconds)
class IOAddress { class IOAddress {
public: public:
IOAddress() {} IOAddress() { }
explicit IOAddress(u16 address) explicit IOAddress(u16 address)
: m_address(address) : m_address(address)
{ {

2
Kernel/Interrupts/APIC.cpp
View file

@ -31,7 +31,7 @@
#include <Kernel/Interrupts/APIC.h> #include <Kernel/Interrupts/APIC.h>
#include <Kernel/Interrupts/SpuriousInterruptHandler.h> #include <Kernel/Interrupts/SpuriousInterruptHandler.h>
#include <Kernel/VM/MemoryManager.h> #include <Kernel/VM/MemoryManager.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
#define IRQ_APIC_SPURIOUS 0x7f #define IRQ_APIC_SPURIOUS 0x7f

2
Kernel/Interrupts/InterruptManagement.cpp
View file

@ -37,7 +37,7 @@
#include <Kernel/Interrupts/UnhandledInterruptHandler.h> #include <Kernel/Interrupts/UnhandledInterruptHandler.h>
#include <Kernel/Syscall.h> #include <Kernel/Syscall.h>
#include <Kernel/VM/MemoryManager.h> #include <Kernel/VM/MemoryManager.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
#define PCAT_COMPAT_FLAG 0x1 #define PCAT_COMPAT_FLAG 0x1

2
Kernel/Interrupts/PIC.cpp
View file

@ -29,7 +29,7 @@
#include <Kernel/Arch/i386/CPU.h> #include <Kernel/Arch/i386/CPU.h>
#include <Kernel/Interrupts/GenericInterruptHandler.h> #include <Kernel/Interrupts/GenericInterruptHandler.h>
#include <Kernel/Interrupts/PIC.h> #include <Kernel/Interrupts/PIC.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
namespace Kernel { namespace Kernel {

2
Kernel/Net/E1000NetworkAdapter.cpp
View file

@ -26,7 +26,7 @@
#include <Kernel/Net/E1000NetworkAdapter.h> #include <Kernel/Net/E1000NetworkAdapter.h>
#include <Kernel/Thread.h> #include <Kernel/Thread.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
//#define E1000_DEBUG //#define E1000_DEBUG

2
Kernel/Net/E1000NetworkAdapter.h
View file

@ -32,7 +32,7 @@
#include <Kernel/Net/NetworkAdapter.h> #include <Kernel/Net/NetworkAdapter.h>
#include <Kernel/PCI/Access.h> #include <Kernel/PCI/Access.h>
#include <Kernel/PCI/Device.h> #include <Kernel/PCI/Device.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
namespace Kernel { namespace Kernel {

2
Kernel/Net/LocalSocket.cpp
View file

@ -30,7 +30,7 @@
#include <Kernel/Net/LocalSocket.h> #include <Kernel/Net/LocalSocket.h>
#include <Kernel/Process.h> #include <Kernel/Process.h>
#include <Kernel/UnixTypes.h> #include <Kernel/UnixTypes.h>
#include <LibBareMetal/StdLib.h> #include <Kernel/StdLib.h>
#include <LibC/errno_numbers.h> #include <LibC/errno_numbers.h>
//#define DEBUG_LOCAL_SOCKET //#define DEBUG_LOCAL_SOCKET

2
Kernel/Net/NetworkAdapter.cpp
View file

@ -33,7 +33,7 @@
#include <Kernel/Net/LoopbackAdapter.h> #include <Kernel/Net/LoopbackAdapter.h>
#include <Kernel/Net/NetworkAdapter.h> #include <Kernel/Net/NetworkAdapter.h>
#include <Kernel/Random.h> #include <Kernel/Random.h>
#include <LibBareMetal/StdLib.h> #include <Kernel/StdLib.h>
namespace Kernel { namespace Kernel {

2
Kernel/Net/RTL8139NetworkAdapter.cpp
View file

@ -25,7 +25,7 @@
*/ */
#include <Kernel/Net/RTL8139NetworkAdapter.h> #include <Kernel/Net/RTL8139NetworkAdapter.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
//#define RTL8139_DEBUG //#define RTL8139_DEBUG

2
Kernel/Net/RTL8139NetworkAdapter.h
View file

@ -30,7 +30,7 @@
#include <Kernel/Net/NetworkAdapter.h> #include <Kernel/Net/NetworkAdapter.h>
#include <Kernel/PCI/Access.h> #include <Kernel/PCI/Access.h>
#include <Kernel/PCI/Device.h> #include <Kernel/PCI/Device.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
namespace Kernel { namespace Kernel {

2
Kernel/PCI/IOAccess.cpp
View file

@ -25,7 +25,7 @@
*/ */
#include <Kernel/PCI/IOAccess.h> #include <Kernel/PCI/IOAccess.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
namespace Kernel { namespace Kernel {
namespace PCI { namespace PCI {

2
Kernel/PCI/Initializer.cpp
View file

@ -31,7 +31,7 @@
#include <Kernel/PCI/IOAccess.h> #include <Kernel/PCI/IOAccess.h>
#include <Kernel/PCI/Initializer.h> #include <Kernel/PCI/Initializer.h>
#include <Kernel/PCI/MMIOAccess.h> #include <Kernel/PCI/MMIOAccess.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
namespace Kernel { namespace Kernel {
namespace PCI { namespace PCI {

0
Libraries/LibBareMetal/Memory/PhysicalAddress.h → Kernel/PhysicalAddress.h
View file

6
Kernel/Process.cpp
View file

@ -73,9 +73,9 @@
#include <Kernel/VM/ProcessPagingScope.h> #include <Kernel/VM/ProcessPagingScope.h>
#include <Kernel/VM/PurgeableVMObject.h> #include <Kernel/VM/PurgeableVMObject.h>
#include <Kernel/VM/SharedInodeVMObject.h> #include <Kernel/VM/SharedInodeVMObject.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
#include <LibBareMetal/Output/Console.h> #include <Kernel/Console.h>
#include <LibBareMetal/StdLib.h> #include <Kernel/StdLib.h>
#include <LibC/errno_numbers.h> #include <LibC/errno_numbers.h>
#include <LibC/limits.h> #include <LibC/limits.h>
#include <LibC/signal_numbers.h> #include <LibC/signal_numbers.h>

2
Kernel/Process.h
View file

@ -39,7 +39,7 @@
#include <Kernel/Thread.h> #include <Kernel/Thread.h>
#include <Kernel/UnixTypes.h> #include <Kernel/UnixTypes.h>
#include <Kernel/VM/RangeAllocator.h> #include <Kernel/VM/RangeAllocator.h>
#include <LibBareMetal/StdLib.h> #include <Kernel/StdLib.h>
#include <LibC/signal_numbers.h> #include <LibC/signal_numbers.h>
namespace ELF { namespace ELF {

19
Libraries/LibBareMetal/StdLib.cpp → Kernel/StdLib.cpp
View file

@ -27,26 +27,20 @@
#include <AK/Assertions.h> #include <AK/Assertions.h>
#include <AK/String.h> #include <AK/String.h>
#include <AK/Types.h> #include <AK/Types.h>
#include <LibBareMetal/StdLib.h> #include <Kernel/Arch/i386/CPU.h>
#include <Kernel/Heap/kmalloc.h>
#include <Kernel/StdLib.h>
#include <Kernel/VM/MemoryManager.h>
#ifdef KERNEL
# include <Kernel/Arch/i386/CPU.h>
# include <Kernel/Heap/kmalloc.h>
# include <Kernel/VM/MemoryManager.h>
#endif
#ifdef KERNEL
String copy_string_from_user(const char* user_str, size_t user_str_size) String copy_string_from_user(const char* user_str, size_t user_str_size)
{ {
Kernel::SmapDisabler disabler; Kernel::SmapDisabler disabler;
size_t length = strnlen(user_str, user_str_size); size_t length = strnlen(user_str, user_str_size);
return String(user_str, length); return String(user_str, length);
} }
#endif
extern "C" { extern "C" {
#ifdef KERNEL
void copy_to_user(void* dest_ptr, const void* src_ptr, size_t n) void copy_to_user(void* dest_ptr, const void* src_ptr, size_t n)
{ {
ASSERT(Kernel::is_user_range(VirtualAddress(dest_ptr), n)); ASSERT(Kernel::is_user_range(VirtualAddress(dest_ptr), n));
@ -62,7 +56,6 @@ void copy_from_user(void* dest_ptr, const void* src_ptr, size_t n)
Kernel::SmapDisabler disabler; Kernel::SmapDisabler disabler;
memcpy(dest_ptr, src_ptr, n); memcpy(dest_ptr, src_ptr, n);
} }
#endif
void* memcpy(void* dest_ptr, const void* src_ptr, size_t n) void* memcpy(void* dest_ptr, const void* src_ptr, size_t n)
{ {
@ -117,14 +110,12 @@ char* strncpy(char* dest, const char* src, size_t n)
return dest; return dest;
} }
#ifdef KERNEL
void memset_user(void* dest_ptr, int c, size_t n) void memset_user(void* dest_ptr, int c, size_t n)
{ {
ASSERT(Kernel::is_user_range(VirtualAddress(dest_ptr), n)); ASSERT(Kernel::is_user_range(VirtualAddress(dest_ptr), n));
Kernel::SmapDisabler disabler; Kernel::SmapDisabler disabler;
memset(dest_ptr, c, n); memset(dest_ptr, c, n);
} }
#endif
void* memset(void* dest_ptr, int c, size_t n) void* memset(void* dest_ptr, int c, size_t n)
{ {
@ -243,12 +234,10 @@ char* strstr(const char* haystack, const char* needle)
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
#ifdef KERNEL
void* realloc(void* p, size_t s) void* realloc(void* p, size_t s)
{ {
return krealloc(p, s); return krealloc(p, s);
} }
#endif
void free(void* p) void free(void* p)
{ {

18
Libraries/LibBareMetal/StdLib.h → Kernel/StdLib.h
View file

@ -26,31 +26,21 @@
#pragma once #pragma once
#include <AK/Types.h> #include <AK/Forward.h>
#if defined(KERNEL)
namespace AK {
class String;
}
namespace Syscall { namespace Syscall {
struct StringArgument; struct StringArgument;
} }
AK::String copy_string_from_user(const char*, size_t); String copy_string_from_user(const char*, size_t);
#endif
extern "C" { extern "C" {
static_assert(sizeof(size_t) == 4); static_assert(sizeof(size_t) == 4);
#if defined(KERNEL)
void copy_to_user(void*, const void*, size_t); void copy_to_user(void*, const void*, size_t);
void copy_from_user(void*, const void*, size_t); void copy_from_user(void*, const void*, size_t);
void memset_user(void*, int, size_t); void memset_user(void*, int, size_t);
#endif
void* memcpy(void*, const void*, size_t); void* memcpy(void*, const void*, size_t);
char* strcpy(char*, const char*); char* strcpy(char*, const char*);
@ -70,8 +60,6 @@ inline u16 ntohs(u16 w) { return (w & 0xff) << 8 | ((w >> 8) & 0xff); }
inline u16 htons(u16 w) { return (w & 0xff) << 8 | ((w >> 8) & 0xff); } inline u16 htons(u16 w) { return (w & 0xff) << 8 | ((w >> 8) & 0xff); }
} }
#if defined(KERNEL)
template<typename T> template<typename T>
inline void copy_from_user(T* dest, const T* src) inline void copy_from_user(T* dest, const T* src)
{ {
@ -83,5 +71,3 @@ inline void copy_to_user(T* dest, const T* src)
{ {
copy_to_user(dest, src, sizeof(T)); copy_to_user(dest, src, sizeof(T));
} }
#endif

4
Kernel/TTY/VirtualConsole.cpp
View file

@ -29,8 +29,8 @@
#include <Kernel/Arch/i386/CPU.h> #include <Kernel/Arch/i386/CPU.h>
#include <Kernel/Devices/KeyboardDevice.h> #include <Kernel/Devices/KeyboardDevice.h>
#include <Kernel/Heap/kmalloc.h> #include <Kernel/Heap/kmalloc.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
#include <LibBareMetal/StdLib.h> #include <Kernel/StdLib.h>
namespace Kernel { namespace Kernel {

2
Kernel/TTY/VirtualConsole.h
View file

@ -28,7 +28,7 @@
#include <Kernel/Devices/KeyboardDevice.h> #include <Kernel/Devices/KeyboardDevice.h>
#include <Kernel/TTY/TTY.h> #include <Kernel/TTY/TTY.h>
#include <LibBareMetal/Output/Console.h> #include <Kernel/Console.h>
namespace Kernel { namespace Kernel {

2
Kernel/Time/HPET.h
View file

@ -31,8 +31,8 @@
#include <AK/OwnPtr.h> #include <AK/OwnPtr.h>
#include <AK/Types.h> #include <AK/Types.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <Kernel/PhysicalAddress.h>
#include <Kernel/VM/Region.h> #include <Kernel/VM/Region.h>
#include <LibBareMetal/Memory/PhysicalAddress.h>
namespace Kernel { namespace Kernel {

2
Kernel/Time/PIT.cpp
View file

@ -30,7 +30,7 @@
#include <Kernel/Thread.h> #include <Kernel/Thread.h>
#include <Kernel/Time/PIT.h> #include <Kernel/Time/PIT.h>
#include <Kernel/Time/TimeManagement.h> #include <Kernel/Time/TimeManagement.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
#define IRQ_TIMER 0 #define IRQ_TIMER 0
namespace Kernel { namespace Kernel {

2
Kernel/Time/RTC.cpp
View file

@ -28,7 +28,7 @@
#include <Kernel/CMOS.h> #include <Kernel/CMOS.h>
#include <Kernel/Time/RTC.h> #include <Kernel/Time/RTC.h>
#include <Kernel/Time/TimeManagement.h> #include <Kernel/Time/TimeManagement.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
namespace Kernel { namespace Kernel {
#define IRQ_TIMER 8 #define IRQ_TIMER 8

2
Kernel/VM/AnonymousVMObject.h
View file

@ -27,7 +27,7 @@
#pragma once #pragma once
#include <Kernel/VM/VMObject.h> #include <Kernel/VM/VMObject.h>
#include <LibBareMetal/Memory/PhysicalAddress.h> #include <Kernel/PhysicalAddress.h>
namespace Kernel { namespace Kernel {

2
Kernel/VM/ContiguousVMObject.h
View file

@ -27,7 +27,7 @@
#pragma once #pragma once
#include <Kernel/VM/VMObject.h> #include <Kernel/VM/VMObject.h>
#include <LibBareMetal/Memory/PhysicalAddress.h> #include <Kernel/PhysicalAddress.h>
namespace Kernel { namespace Kernel {

2
Kernel/VM/MemoryManager.cpp
View file

@ -39,7 +39,7 @@
#include <Kernel/VM/PhysicalRegion.h> #include <Kernel/VM/PhysicalRegion.h>
#include <Kernel/VM/PurgeableVMObject.h> #include <Kernel/VM/PurgeableVMObject.h>
#include <Kernel/VM/SharedInodeVMObject.h> #include <Kernel/VM/SharedInodeVMObject.h>
#include <LibBareMetal/StdLib.h> #include <Kernel/StdLib.h>
//#define MM_DEBUG //#define MM_DEBUG
//#define PAGE_FAULT_DEBUG //#define PAGE_FAULT_DEBUG

2
Kernel/VM/PhysicalPage.h
View file

@ -29,7 +29,7 @@
#include <AK/NonnullRefPtr.h> #include <AK/NonnullRefPtr.h>
#include <Kernel/Assertions.h> #include <Kernel/Assertions.h>
#include <Kernel/Heap/SlabAllocator.h> #include <Kernel/Heap/SlabAllocator.h>
#include <LibBareMetal/Memory/PhysicalAddress.h> #include <Kernel/PhysicalAddress.h>
namespace Kernel { namespace Kernel {

2
Kernel/VM/RangeAllocator.h
View file

@ -29,7 +29,7 @@
#include <AK/String.h> #include <AK/String.h>
#include <AK/Traits.h> #include <AK/Traits.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibBareMetal/Memory/VirtualAddress.h> #include <Kernel/VirtualAddress.h>
namespace Kernel { namespace Kernel {

0
Libraries/LibBareMetal/Memory/VirtualAddress.h → Kernel/VirtualAddress.h
View file

11
Libraries/LibBareMetal/Output/kprintf.cpp → Kernel/kprintf.cpp
View file

@ -26,16 +26,13 @@
#include <AK/PrintfImplementation.h> #include <AK/PrintfImplementation.h>
#include <AK/Types.h> #include <AK/Types.h>
#include <LibBareMetal/IO.h> #include <Kernel/Console.h>
#include <LibBareMetal/Output/Console.h> #include <Kernel/IO.h>
#include <LibBareMetal/Output/kstdio.h> #include <Kernel/Process.h>
#include <Kernel/kstdio.h>
#include <LibC/stdarg.h> #include <LibC/stdarg.h>
#if defined(KERNEL)
# include <Kernel/Process.h>
#endif
static bool serial_debug; static bool serial_debug;
void set_serial_debug(bool on_or_off) void set_serial_debug(bool on_or_off)

8
Libraries/LibBareMetal/Output/kstdio.h → Kernel/kstdio.h
View file

@ -38,13 +38,7 @@ void set_serial_debug(bool on_or_off);
int get_serial_debug(); int get_serial_debug();
} }
#if defined(KERNEL) || defined(BOOTSTRAPPER) #define printf dbgprintf
# define printf dbgprintf
#endif
#ifndef __serenity__
# define dbgprintf printf
#endif
#ifdef __cplusplus #ifdef __cplusplus

2
Libraries/LibC/stdarg.h
View file

@ -26,7 +26,7 @@
#pragma once #pragma once
#if defined(KERNEL) || defined(BOOTSTRAPPER) #if defined(KERNEL)
# define __BEGIN_DECLS # define __BEGIN_DECLS
# define __END_DECLS # define __END_DECLS
#else #else

2
Libraries/LibELF/DynamicObject.h
View file

@ -27,7 +27,7 @@
#pragma once #pragma once
#include <AK/Assertions.h> #include <AK/Assertions.h>
#include <LibBareMetal/Memory/VirtualAddress.h> #include <Kernel/VirtualAddress.h>
#include <LibELF/exec_elf.h> #include <LibELF/exec_elf.h>
namespace ELF { namespace ELF {

2
Libraries/LibELF/Image.h
View file

@ -30,7 +30,7 @@
#include <AK/HashMap.h> #include <AK/HashMap.h>
#include <AK/OwnPtr.h> #include <AK/OwnPtr.h>
#include <AK/String.h> #include <AK/String.h>
#include <LibBareMetal/Memory/VirtualAddress.h> #include <Kernel/VirtualAddress.h>
#include <LibELF/exec_elf.h> #include <LibELF/exec_elf.h>
namespace ELF { namespace ELF {

2
Libraries/LibELF/Loader.h
View file

@ -35,7 +35,7 @@
#include <LibELF/Image.h> #include <LibELF/Image.h>
#ifdef KERNEL #ifdef KERNEL
# include <LibBareMetal/Memory/VirtualAddress.h> # include <Kernel/VirtualAddress.h>
namespace Kernel { namespace Kernel {
class Region; class Region;
} }

2
Userland/crash.cpp
View file

@ -28,7 +28,7 @@
#include <AK/Function.h> #include <AK/Function.h>
#include <AK/String.h> #include <AK/String.h>
#include <Kernel/Syscall.h> #include <Kernel/Syscall.h>
#include <LibBareMetal/IO.h> #include <Kernel/IO.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>