justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[boot] Build, load, and pass initrd from boot to init

Browse Source 
The initrd image is now created by the build system, loaded by the
bootloader, and passed to srv.init, which loads it (but doesn't do
anything with it yet, so this is actually a functional regression).

This simplifies a lot of the modules code between boot and init as well:
Gone are the many subclasses of module and all the data being inline
with the module structs, except for any loaded files. Now the only
modules loaded and passed will be the initrd, and any devices only the
bootloader has knowledge of, like the UEFI framebuffer.
This commit is contained in:
Justin C. Miller
2023-01-17 19:12:40 -07:00
parent 6ef15a2721
commit 66abcc57a2
26 changed files with 399 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/user/srv.init/modules.cpp
View File

@@ -20,28 +20,24 @@ const module *
module_iterator::operator++()
{
do {
m_mod = util::offset_pointer(m_mod, m_mod->mod_length);
if (m_mod->mod_type == type::none) {
if (++m_idx >= modules_page::per_page) {
// We've reached the end of a page, see if there's another
const modules_page *page = get_page(m_mod);
if (!page->next) {
m_mod = nullptr;
if (!m_page->next) {
m_page = nullptr;
break;
}
m_mod = page->modules;
m_idx = 0;
m_page = reinterpret_cast<modules_page*>(m_page->next);
}
}
while (m_type != type::none && m_type != m_mod->mod_type);
return m_mod;
while (m_type != type::none && m_type != deref()->type);
return deref();
}
const module *
module_iterator::operator++(int)
{
const module *tmp = m_mod;
const module *tmp = deref();
operator++();
return tmp;
}
@@ -64,7 +60,7 @@ load_page(uintptr_t address, j6_handle_t system, j6_handle_t self)
modules
modules::load_modules(uintptr_t address, j6_handle_t system, j6_handle_t self)
{
const module *first = nullptr;
const modules_page *first = nullptr;
while (address) {
const modules_page *page = load_page(address, system, self);
@@ -73,7 +69,7 @@ modules::load_modules(uintptr_t address, j6_handle_t system, j6_handle_t self)
j6_log(message);
if (!first)
first = page->modules;
first = page;
address = page->next;
}