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

[init] Go back to boot modules having inline data

Browse Source 
In order to pass along arguments like the framebuffer, it's far simpler
to have that data stored along with the modules than mapping new pages
for every structure. Also now optionally pass a module's data to a
driver as init starts it.
This commit is contained in:
Justin C. Miller
2023-02-10 01:01:01 -08:00
parent 0eddb002f0
commit ea587076ed
14 changed files with 132 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,78 +1,40 @@
#include <stdlib.h>
#include <stdio.h>
#include <utility>
#include <arch/memory.h>
#include <j6/errors.h>
#include <j6/syscalls.h>
#include "loader.h"
#include "modules.h"
using module = bootproto::module;
using modules_page = bootproto::modules_page;
static const modules_page *
get_page(const module *mod)
void
load_modules(
uintptr_t address,
j6_handle_t system,
j6_handle_t self,
std::vector<const bootproto::module *> &modules)
{
return reinterpret_cast<const modules_page*>(
reinterpret_cast<uintptr_t>(mod) & ~0xfffull);
}
using bootproto::module;
using bootproto::modules_page;
const module *
module_iterator::operator++()
{
do {
if (++m_idx >= modules_page::per_page) {
// We've reached the end of a page, see if there's another
if (!m_page->next) {
m_page = nullptr;
break;
}
m_idx = 0;
m_page = reinterpret_cast<modules_page*>(m_page->next);
modules_page const *p = reinterpret_cast<const modules_page*>(address);
while (p) {
j6_handle_t mod_vma = map_phys(system, p, arch::frame_size);
if (mod_vma == j6_handle_invalid) {
j6_log(" ** error loading modules: mapping physical vma");
return;
}
module const *m = reinterpret_cast<module const*>(p+1);
while (m->bytes) {
modules.push_back(m);
m = util::offset_pointer(m, m->bytes);
}
p = p->next;
}
while (m_type != type::none && m_type != deref()->type);
return deref();
}
const module *
module_iterator::operator++(int)
{
const module *tmp = deref();
operator++();
return tmp;
}
const modules_page *
load_page(uintptr_t address, j6_handle_t system, j6_handle_t self)
{
j6_handle_t mods_vma = j6_handle_invalid;
j6_status_t s = j6_system_map_phys(system, &mods_vma, address, 0x1000, 0);
if (s != j6_status_ok)
exit(s);
s = j6_vma_map(mods_vma, self, address);
if (s != j6_status_ok)
exit(s);
return reinterpret_cast<const modules_page*>(address);
}
modules
modules::load_modules(uintptr_t address, j6_handle_t system, j6_handle_t self)
{
const modules_page *first = nullptr;
while (address) {
const modules_page *page = load_page(address, system, self);
char message[100];
sprintf(message, "srv.init found %d modules from page at 0x%lx", page->count, address);
j6_log(message);
if (!first)
first = page;
address = page->next;
}
return modules {first};
}