c1d9b35e7c
This is a rather large commit that is widely focused on cleaning things out of the 'junk drawer' that is src/include. Most notably, several things that were put in there because they needed somewhere where both the kernel, boot, and init could read them have been moved to a new lib, 'bootproto'. - Moved kernel_args.h and init_args.h to bootproto as kernel.h and init.h, respectively. - Moved counted.h and pointer_manipulation.h into util, renaming the latter to util/pointers.h. - Created a new src/include/arch for very arch-dependent definitions, and moved some kernel_memory.h constants like frame size, page table entry count, etc to arch/amd64/memory.h. Also created arch/memory.h which detects platform and includes the former. - Got rid of kernel_memory.h entirely in favor of a new, cog-based approach. The new definitions/memory_layout.csv lists memory regions in descending order from the top of memory, their sizes, and whether they are shared outside the kernel (ie, boot needs to know them). The new header bootproto/memory.h exposes the addresses of the shared regions, while the kernel's memory.h gains the start and size of all the regions. Also renamed the badly-named page-offset area the linear area. - The python build scripts got a few new features: the ability to parse the csv mentioned above in a new memory.py module; the ability to add dependencies to existing source files (The list of files that I had to pull out of the main list just to add them with the dependency on memory.h was getting too large. So I put them back into the sources list, and added the dependency post-hoc.); and the ability to reference 'source_root', 'build_root', and 'module_root' variables in .module files. - Some utility functions that were in the kernel's memory.h got moved to util/pointers.h and util/misc.h, and misc.h's byteswap was renamed byteswap32 to be more specific.
71 lines
2.2 KiB
Python
Executable File
71 lines
2.2 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
|
|
def generate(output, config, manifest):
|
|
from os import makedirs, walk
|
|
from pathlib import Path
|
|
from bonnibel.module import Module
|
|
from bonnibel.project import Project
|
|
|
|
root = Path(__file__).parent.resolve()
|
|
project = Project(root)
|
|
|
|
output = root / output
|
|
sources = root / "src"
|
|
manifest = root / manifest
|
|
|
|
modules = {}
|
|
for base, dirs, files in walk(sources):
|
|
path = Path(base)
|
|
for f in files:
|
|
if f.endswith(".module"):
|
|
fullpath = path / f
|
|
|
|
def module_init(name, **kwargs):
|
|
m = Module(name, fullpath, path, **kwargs)
|
|
modules[m.name] = m
|
|
return m
|
|
|
|
glo = {
|
|
"module": module_init,
|
|
"source_root": root,
|
|
"built_root": output,
|
|
"module_root": path,
|
|
}
|
|
code = compile(open(fullpath, 'r').read(), fullpath, "exec")
|
|
|
|
loc = {}
|
|
exec(code, glo, loc)
|
|
|
|
Module.update(modules)
|
|
|
|
makedirs(output.resolve(), exist_ok=True)
|
|
project.generate(root, output, modules, config, manifest)
|
|
for mod in modules.values():
|
|
mod.generate(output)
|
|
|
|
if __name__ == "__main__":
|
|
import sys
|
|
from pathlib import Path
|
|
sys.path.insert(0, str(Path(__file__).parent / "scripts"))
|
|
|
|
from argparse import ArgumentParser
|
|
from bonnibel import BonnibelError
|
|
|
|
p = ArgumentParser(description="Generate jsix build files")
|
|
p.add_argument("--manifest", "-m", metavar="FILE", default="assets/manifests/default.yaml",
|
|
help="File to use as the system manifest")
|
|
p.add_argument("--config", "-c", metavar="NAME", default="debug",
|
|
help="Configuration to build (eg, 'debug' or 'release')")
|
|
p.add_argument("output", metavar="DIR", default="build", nargs='?',
|
|
help="Where to create the build root")
|
|
|
|
args = p.parse_args()
|
|
|
|
try:
|
|
generate(args.output, args.config, args.manifest)
|
|
|
|
except BonnibelError as be:
|
|
import sys
|
|
print(f"Error: {be}", file=sys.stderr)
|
|
sys.exit(1)
|