Compare commits

..

2 Commits

Author SHA1 Message Date
cd6983e2cd Generate HULK binary 2022-03-18 22:01:27 -04:00
8df1646c61 Add initial HULK source and linker script 2022-03-18 21:55:38 -04:00
3 changed files with 66 additions and 22 deletions

View File

@ -45,32 +45,10 @@ class FontGen < Builder
end end
end end
# FontGen Environment
fontgen_env = env "fontgen", use: "freetype" do |env| fontgen_env = env "fontgen", use: "freetype" do |env|
env.Program("^/fontgen", glob("src/fontgen/**/*.c")) env.Program("^/fontgen", glob("src/fontgen/**/*.c"))
end end
## Kernel Environment
#kernel_env = env "kernel" do |env|
# env.add_builder(Image)
# env.add_builder(FontGen)
# env["OBJDUMP"] = "x86_64-elf-objdump"
# env["SIZE"] = "x86_64-elf-size"
# env["CCFLAGS"] += %w[-ffreestanding -Wall -O2]
# env["LDFLAGS"] += %w[-ffreestanding -nostdlib -T src/link.ld]
# env["LDFLAGS"] += %W[-Wl,-Map,${_TARGET}.map]
# env["LIBS"] += %w[gcc]
# env.FontGen("^/kfont/kfont.c", "font/Hack-Regular.ttf",
# "fontgen" => fontgen_env.expand("^/fontgen"))
# env.barrier
# env["CPPPATH"] += ["#{env.build_root}/kfont"]
# env.Program("^/hos.elf", glob("src/**/*.{S,c}") + ["^/kfont/kfont.c"])
# env.depends("#{env.build_root}/hos.elf", "src/link.ld")
# env.Disassemble("^/hos.elf.txt", "^/hos.elf")
# env.Size("^/hos.elf.size", "^/hos.elf")
# env.Image("^/hos.img", %w[^/hos.elf])
#end
hello_env = env "hello", use: %w[ldc2 x86_64-w64-mingw32-gcc] do |env| hello_env = env "hello", use: %w[ldc2 x86_64-w64-mingw32-gcc] do |env|
env.add_builder(Image) env.add_builder(Image)
env["sources"] = glob("src/hello/**/*.d") env["sources"] = glob("src/hello/**/*.d")
@ -86,6 +64,23 @@ hello_env = env "hello", use: %w[ldc2 x86_64-w64-mingw32-gcc] do |env|
env.Image("^/hos.img", "^/BOOTX64.EFI") env.Image("^/hos.img", "^/BOOTX64.EFI")
end end
hulk_env = env "hulk", use: %w[ldc2 x86_64-elf-gcc] do |env|
env["sources"] = glob("src/hulk/**/*.d")
env["DFLAGS"] += %w[-mtriple=x86_64-unknown-elf --betterC -release -O3 --wi --enable-cross-module-inlining]
env["D_IMPORT_PATH"] += %w[src/hulk src/common]
env["LD"] = "x86_64-elf-gcc"
env["LDFLAGS"] += %w[-nostdlib -Tsrc/hulk/hulk.ld -Wl,-Map,${_TARGET}.map]
env["LDCMD"] = %w[${LD} -o ${_TARGET} ${LDFLAGS} ${_SOURCES} ${LIBDIRPREFIX}${LIBPATH} ${LIBLINKPREFIX}${LIBS}]
env["OBJDUMP"] = "x86_64-elf-objdump"
env["OBJCOPY"] = "x86_64-elf-objcopy"
env.Program("^/hulk.elf", "${sources}")
env.depends("^/hulk.elf", "src/hulk/hulk.ld")
env.Disassemble("^/hulk.txt", "^/hulk.elf")
env.Command("^/hulk.bin", "^/hulk.elf",
"CMD" => %W[${OBJCOPY} -O binary ${_SOURCES} ${_TARGET}],
"CMD_DESC" => "Convert ELF to binary:")
end
task "run", desc: "Run HOS in QEMU" do task "run", desc: "Run HOS in QEMU" do
Dir.mktmpdir do |tmpdir| Dir.mktmpdir do |tmpdir|
img = hello_env.expand("^/hos.img") img = hello_env.expand("^/hos.img")

16
src/hulk/hulk.d Normal file
View File

@ -0,0 +1,16 @@
import hulk.bootinfo;
import hos.memory;
import ldc.attributes;
@(ldc.attributes.section(".hulk_start"))
extern(C) void hulk_start(BootInfo * bootinfo)
{
for (size_t y = 100u; y < 120u; y++)
{
memset32(&bootinfo.fb.buffer[y * bootinfo.fb.stride + 20u], 0xFF8800u, 20u);
}
for (;;)
{
}
}

33
src/hulk/hulk.ld Normal file
View File

@ -0,0 +1,33 @@
ENTRY(hulk_start)
SECTIONS
{
. = 0x0000800000000000;
_hulk_mem_start = .;
.text BLOCK(4K) : ALIGN(4K)
{
*(.hulk_start)
*(.text)
}
.rodata BLOCK(4K) : ALIGN(4K)
{
*(.rodata)
}
.data BLOCK(4K) : ALIGN(4K)
{
*(.data)
}
.bss BLOCK(4K) : ALIGN(4K)
{
*(COMMON)
*(.bss)
}
. = ALIGN(4K);
_hulk_mem_end = .;
}