RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 13:57:35 +00:00
Code Issues Activity Actions

Move ELFLoader code into Kernel/.

Browse source
This commit is contained in:
Andreas Kling 2018-12-02 20:27:08 +01:00
parent ac7a60225e
commit 44036f32bc
10 changed files with 5 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Banner.txt
View file

@ -1,17 +0,0 @@
.oooooo..o o8o .
d8P' `Y8 `"' .o8
Y88bo. .ooooo. oooo d8b .ooooo. ooo. .oo. oooo .o888oo oooo ooo
`"Y8888o. d88' `88b `888""8P d88' `88b `888P"Y88b `888 888 `88. .8'
`"Y88b 888ooo888 888 888ooo888 888 888 888 888 `88..8'
oo .d8P 888 .o 888 888 .o 888 888 888 888 . `888'
8""88888P' `Y8bod8P' d888b `Y8bod8P' o888o o888o o888o "888" .8'
.o..P'
`Y8P'
God, grant me the SERENITY
to accept the things I cannot change
COURAGE to accept the things I can
and WISDOM to know the difference
===============================================================================

3
ELFLoader/.gitignore vendored
View file

@ -1,3 +0,0 @@
run
*.o
AK

0
ELFLoader/ELFImage.cpp → Kernel/ELFImage.cpp
View file

0
ELFLoader/ELFImage.h → Kernel/ELFImage.h
View file

0
ELFLoader/ELFLoader.cpp → Kernel/ELFLoader.cpp
View file

0
ELFLoader/ELFLoader.h → Kernel/ELFLoader.h
View file

8
Kernel/Makefile
View file

@ -20,7 +20,9 @@ KERNEL_OBJS = \
TTY.o \ TTY.o \
VirtualConsole.o \ VirtualConsole.o \
FIFO.o \ FIFO.o \
Scheduler.o Scheduler.o \
ELFImage.o \
ELFLoader.o
VFS_OBJS = \ VFS_OBJS = \
../VirtualFileSystem/DiskDevice.o \ ../VirtualFileSystem/DiskDevice.o \
@ -37,10 +39,6 @@ VFS_OBJS = \
../VirtualFileSystem/FileDescriptor.o \ ../VirtualFileSystem/FileDescriptor.o \
../VirtualFileSystem/SyntheticFileSystem.o ../VirtualFileSystem/SyntheticFileSystem.o
ELFLOADER_OBJS = \
../ELFLoader/ELFImage.o \
../ELFLoader/ELFLoader.o
AK_OBJS = \ AK_OBJS = \
../AK/String.o \ ../AK/String.o \
../AK/StringImpl.o \ ../AK/StringImpl.o \

2
Kernel/Process.cpp
View file

@ -6,7 +6,7 @@
#include "system.h" #include "system.h"
#include <VirtualFileSystem/FileDescriptor.h> #include <VirtualFileSystem/FileDescriptor.h>
#include <VirtualFileSystem/VirtualFileSystem.h> #include <VirtualFileSystem/VirtualFileSystem.h>
#include <ELFLoader/ELFLoader.h> #include "ELFLoader.h"
#include "MemoryManager.h" #include "MemoryManager.h"
#include "errno.h" #include "errno.h"
#include "i8253.h" #include "i8253.h"

0
ELFLoader/elf.h → Kernel/elf.h
View file

2
Kernel/init.cpp
View file

@ -19,7 +19,7 @@
#include <VirtualFileSystem/FileDescriptor.h> #include <VirtualFileSystem/FileDescriptor.h>
#include <AK/OwnPtr.h> #include <AK/OwnPtr.h>
#include "MemoryManager.h" #include "MemoryManager.h"
#include <ELFLoader/ELFLoader.h> #include "ELFLoader.h"
#include "Console.h" #include "Console.h"
#include "ProcFileSystem.h" #include "ProcFileSystem.h"
#include "RTC.h" #include "RTC.h"