diff --git a/Rsconscript b/Rsconscript index a24adbf..b06e9d7 100644 --- a/Rsconscript +++ b/Rsconscript @@ -71,12 +71,12 @@ end # env.Image("^/hos.img", %w[^/hos.elf]) #end -hel_env = env "hel", 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["sources"] = glob("src/hel/**/*.d", "src/kernel/hos/bootinfo.d") + env["sources"] = glob("src/hello/**/*.d", "src/kernel/hos/bootinfo.d") env["sources"] += glob("uefi-d/source/**/*.d") env["DFLAGS"] += %w[-mtriple=x86_64-unknown-windows-coff --betterC -release -O3 --wi] - env["D_IMPORT_PATH"] += %w[src/hel src/kernel uefi-d/source] + env["D_IMPORT_PATH"] += %w[src/hello src/kernel uefi-d/source] env["LD"] = "x86_64-w64-mingw32-gcc" env["LDFLAGS"] += %w[-nostdlib -Wl,-dll -shared -Wl,--subsystem,10 -e efi_main -Wl,-Map,${_TARGET}.map] env["LDCMD"] = %w[${LD} -o ${_TARGET} ${LDFLAGS} ${_SOURCES} ${LIBDIRPREFIX}${LIBPATH} ${LIBLINKPREFIX}${LIBS}] @@ -88,7 +88,7 @@ end task "run", desc: "Run HOS in QEMU" do Dir.mktmpdir do |tmpdir| - img = hel_env.expand("^/hos.img") + img = hello_env.expand("^/hos.img") FileUtils.cp(img, tmpdir) sh %W[qemu-system-x86_64 -bios OVMF.fd -drive file=#{tmpdir}/hos.img,format=raw] end diff --git a/src/hel/hel.d b/src/hello/hello.d similarity index 98% rename from src/hel/hel.d rename to src/hello/hello.d index b5a6c9c..0d7913f 100644 --- a/src/hel/hel.d +++ b/src/hello/hello.d @@ -125,7 +125,7 @@ extern (C) EFI_STATUS efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE * st) st.ConOut.ClearScreen(st.ConOut); - writeln("HOS EFI loader"); + writeln("HELLO, HOS EFI Lightweight LOader, v0.1.0"); writeln("Firmware vendor: '%S', version: 0x%x", st.FirmwareVendor, st.FirmwareVendor); if (!set_graphics_mode()) diff --git a/src/hel/output.d b/src/hello/output.d similarity index 99% rename from src/hel/output.d rename to src/hello/output.d index 537c761..c030312 100644 --- a/src/hel/output.d +++ b/src/hello/output.d @@ -1,5 +1,5 @@ import uefi; -import hel; +import hello; import core.stdc.stdarg; private size_t format_hex(CHAR16 * s, ulong v, bool ptr)