core+system+boot: Move all boot modules into the astryon/ subfolder and add that to .gitignore
Accidentally committed the memory binary as I forgot to add it to gitignore. Let's not do this in the future.
This commit is contained in:
parent
6390785c4b
commit
b5327891d8
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,6 +1,6 @@
|
|||||||
**/.zig-cache
|
**/.zig-cache
|
||||||
boot/core
|
boot/core
|
||||||
boot/init
|
boot/astryon/**
|
||||||
tools/bin/
|
tools/bin/
|
||||||
tools/include/
|
tools/include/
|
||||||
tools/share/
|
tools/share/
|
||||||
|
@ -4,5 +4,5 @@ default 1 1000
|
|||||||
|
|
||||||
menuentry Astryon default
|
menuentry Astryon default
|
||||||
kernel core
|
kernel core
|
||||||
module init
|
module astryon/init
|
||||||
module memory
|
module astryon/memory
|
||||||
|
BIN
boot/memory
BIN
boot/memory
Binary file not shown.
@ -88,8 +88,8 @@ export fn main(magic: u32, info: MultibootInfo) callconv(.C) noreturn {
|
|||||||
const stack = try elf.allocateStack(context.allocator, space, base - platform.PAGE_SIZE, default_stack_size);
|
const stack = try elf.allocateStack(context.allocator, space, base - platform.PAGE_SIZE, default_stack_size);
|
||||||
thread.arch.setStack(&module.regs, stack);
|
thread.arch.setStack(&module.regs, stack);
|
||||||
|
|
||||||
const init_name = "init";
|
const init_path = "astryon/init";
|
||||||
if (std.mem.eql(u8, init_name[0..init_name.len], mod.string()[0..init_name.len])) context.init = module;
|
if (std.mem.eql(u8, init_path[0..init_path.len], mod.string()[0..init_path.len])) context.init = module;
|
||||||
}
|
}
|
||||||
|
|
||||||
fn handler(mod: *easyboot.multiboot_tag_module_t, context: *anyopaque) void {
|
fn handler(mod: *easyboot.multiboot_tag_module_t, context: *anyopaque) void {
|
||||||
|
@ -33,7 +33,7 @@ pub fn buildAsSubmodule(b: *std.Build, build_step: *std.Build.Step, optimize: st
|
|||||||
|
|
||||||
const install = b.addInstallArtifact(init, .{
|
const install = b.addInstallArtifact(init, .{
|
||||||
.dest_dir = .{
|
.dest_dir = .{
|
||||||
.override = .{ .custom = "boot/" },
|
.override = .{ .custom = "boot/astryon/" },
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ pub fn buildAsSubmodule(b: *std.Build, build_step: *std.Build.Step, optimize: st
|
|||||||
|
|
||||||
const install = b.addInstallArtifact(memory, .{
|
const install = b.addInstallArtifact(memory, .{
|
||||||
.dest_dir = .{
|
.dest_dir = .{
|
||||||
.override = .{ .custom = "boot/" },
|
.override = .{ .custom = "boot/astryon/" },
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user