justin/jsix
1
1
Fork 0
mirror of https://github.com/justinian/jsix.git synced 2025-12-09 16:04:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

[boot] Go back to loading symbol table in boot

Browse Source 
The symbol table needs to be passed to the panic handler very early in
the kernel, loading it in init is far less useful. Return it to the boot
directory and remove it from the initrd.
This commit is contained in:
Justin C. Miller
2023-02-04 00:00:59 -08:00
parent 86d458fc6c
commit aba45b9b67
11 changed files with 50 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
scripts/bonnibel/manifest.py
View File

@@ -39,6 +39,8 @@ class Manifest:
self.flags = config.get("flags", tuple())
self.symbols = ""
initrd = config.get("initrd", dict())
self.initrd = {
"name": initrd.get("name", "initrd.dat"),
@@ -110,52 +112,7 @@ class Manifest:
write_ent(self.kernel)
write_ent(self.init)
write_path(self.initrd["name"])
write_path(self.symbols)
for p in self.panics:
write_ent(p)
def write_init_config(self, path, modules):
from os.path import join
import struct
with open(path, 'wb') as outfile:
magic = "jsixinit".encode("utf-8") # magic string
version = 1
reserved = 0
string_data = bytearray()
outfile.write(struct.pack("<8s BBH HH",
magic,
version, reserved, len(self.services),
len(self.data), len(self.drivers)))
offset_ptr = outfile.tell()
outfile.write(struct.pack("<H", 0)) # filled in later
def write_str(s):
pos = len(string_data)
string_data.extend(s.encode("utf-8") + b"\0")
outfile.write(struct.pack("<H", pos))
def write_driver(ent):
write_str(ent.output)
drivers = modules[ent.module].drivers
outfile.write(struct.pack("<H", len(drivers)))
for driver in drivers:
write_str(driver)
for p in self.services:
write_str(p.output)
for p in self.data:
write_str(p.output)
for p in self.drivers:
write_driver(p)
offset = outfile.tell()
outfile.write(string_data)
outfile.seek(offset_ptr)
outfile.write(struct.pack("<H", offset))

9
scripts/bonnibel/project.py
View File

@@ -157,13 +157,16 @@ class Project:
syms = manifest.add_data("symbol_table.dat",
"Symbol table", ("symbols",))
sym_out = f"${{build_root}}/symbol_table.dat"
syms_file = "jsix.symbols"
syms_path = join(manifest.location, syms_file );
syms_out = join(fatroot, syms_path)
build.build(
rule = "makest",
outputs = [sym_out],
outputs = [syms_out],
inputs = [f"${{build_root}}/kernel/{modules['kernel'].output}"],
)
add_initrd_content("jsix/data", "symbol_table.dat")
fatroot_content.append(syms_out)
manifest.symbols = syms_file
bootloader = "${build_root}/fatroot/efi/boot/bootx64.efi"
build.build(