ソースを参照

Move ELFLoader code into Kernel/.

Andreas Kling 6 年 前
コミット
44036f32bc
10 ファイル変更5 行追加27 行削除
  1. 0 17
      Banner.txt
  2. 0 3
      ELFLoader/.gitignore
  3. 0 0
      Kernel/ELFImage.cpp
  4. 0 0
      Kernel/ELFImage.h
  5. 0 0
      Kernel/ELFLoader.cpp
  6. 0 0
      Kernel/ELFLoader.h
  7. 3 5
      Kernel/Makefile
  8. 1 1
      Kernel/Process.cpp
  9. 0 0
      Kernel/elf.h
  10. 1 1
      Kernel/init.cpp

+ 0 - 17
Banner.txt

@@ -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
-
-===============================================================================
-

+ 0 - 3
ELFLoader/.gitignore

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

+ 0 - 0
ELFLoader/ELFImage.cpp → Kernel/ELFImage.cpp


+ 0 - 0
ELFLoader/ELFImage.h → Kernel/ELFImage.h


+ 0 - 0
ELFLoader/ELFLoader.cpp → Kernel/ELFLoader.cpp


+ 0 - 0
ELFLoader/ELFLoader.h → Kernel/ELFLoader.h


+ 3 - 5
Kernel/Makefile

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

+ 1 - 1
Kernel/Process.cpp

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

+ 0 - 0
ELFLoader/elf.h → Kernel/elf.h


+ 1 - 1
Kernel/init.cpp

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