jack/kernel-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modify build.zig for 0.6.0

Browse source
This commit is contained in:
Jack Halford 2020-02-02 19:49:57 +01:00
parent 22f05324fa
commit 50ac72e24b
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build.zig
View file

@ -1,5 +1,6 @@
const Builder = @import("std").build.Builder;
const builtin = @import("builtin");
const std = @import("std");
pub fn build(b: *Builder) void {
const kernel = b.addExecutable("kernel", "src/main.zig");
@ -14,7 +15,18 @@ pub fn build(b: *Builder) void {
kernel.addAssemblyFile("src/arch/x86/switch_tasks.s");
kernel.setBuildMode(b.standardReleaseOptions());
kernel.setTarget(builtin.Arch.i386, builtin.Os.freestanding, builtin.Abi.none);
kernel.setTheTarget(builtin.Target{
.Cross = std.Target.Cross{
.arch = builtin.Target.Arch.i386,
.os = builtin.Target.Os.freestanding,
.abi = builtin.Target.Abi.none,
.cpu_features = builtin.Target.CpuFeatures.initFromCpu(
builtin.Arch.i386,
&builtin.Target.x86.cpu._i686,
),
},
});
kernel.setLinkerScriptPath("src/arch/x86/linker.ld");
b.default_step.dependOn(&kernel.step);
}

4
src/arch/x86/pmem.zig
View file

@ -86,9 +86,7 @@ pub fn initialize(info: *const kernel.multiboot.MultibootInfo) void {
}
const a = available();
kernel.println("available memory: {} MiB ", .{a});
// kernel.println("available memory: {d} MiB ", .{available() / 1024 / 1024});
hang();
kernel.println("available memory: {d} MiB ", .{available() / 1024 / 1024});
}
pub fn format() void {

1
src/main.zig
View file

@ -19,7 +19,6 @@ export const multiboot_header align(4) linksection(".multiboot") = multiboot: {
export fn kmain(magic: u32, info: *const multiboot.MultibootInfo) noreturn {
assert(magic == multiboot.MULTIBOOT_BOOTLOADER_MAGIC);
clear();
asm volatile ("movd %%edi, %%xmm0");
println("--- x86 initialization ---", .{});
x86.x86_main(info);
println("--- core initialization ---", .{});