RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-19 00:45:08 +00:00
Code Issues Activity Actions

Rename "kernel map" concept to just "ksyms"

Browse source
This commit is contained in:
Andreas Kling 2018-10-27 15:02:39 +02:00
parent 9a71c7759a
commit de2fb183cc
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
Kernel/_fs_contents
View file

Binary file not shown.

8
Kernel/init.cpp
View file

@ -27,7 +27,7 @@
#include "RTC.h" #include "RTC.h"
#define TEST_VFS #define TEST_VFS
#define KERNEL_MAP #define KSYMS
//#define STRESS_TEST_SPAWNING //#define STRESS_TEST_SPAWNING
//#define TEST_ELF_LOADER //#define TEST_ELF_LOADER
@ -74,7 +74,7 @@ const KSym* ksymbolicate(dword address)
return nullptr; return nullptr;
} }
static void loadKernelMap(const ByteBuffer& buffer) static void loadKsyms(const ByteBuffer& buffer)
{ {
s_ksyms = new Vector<KSym>; s_ksyms = new Vector<KSym>;
auto* bufptr = (const char*)buffer.pointer(); auto* bufptr = (const char*)buffer.pointer();
@ -139,7 +139,7 @@ static void init_stage2()
vfs->mountRoot(e2fs.copyRef()); vfs->mountRoot(e2fs.copyRef());
#ifdef KERNEL_MAP #ifdef KSYMS
{ {
auto handle = vfs->open("/kernel.map"); auto handle = vfs->open("/kernel.map");
if (!handle) { if (!handle) {
@ -147,7 +147,7 @@ static void init_stage2()
} else { } else {
auto buffer = handle->readEntireFile(); auto buffer = handle->readEntireFile();
ASSERT(buffer); ASSERT(buffer);
loadKernelMap(buffer); loadKsyms(buffer);
} }
} }
#endif #endif