Skip to content

Commit

Permalink
修复构建参数
Browse files Browse the repository at this point in the history
  • Loading branch information
wenxuanjun committed Dec 23, 2024
1 parent c222197 commit 5e91529
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
File renamed without changes.
17 changes: 5 additions & 12 deletions xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,15 @@ set_warnings("all", "extra")
set_policy("run.autobuild", true)
set_policy("check.auto_ignore_flags", false)

--add_cflags("-target i686-freestanding")
--add_arflags("-target i686-freestanding")
--add_ldflags("-target i686-freestanding")

add_cflags("-target x86-freestanding")
add_arflags("-target x86-freestanding")
add_ldflags("-target x86-freestanding")
add_cflags("-O2", "-mno-mmx", "-mno-sse", "-mno-sse2")
--add_cflags("-fsanitize=bool -fsanitize=builtin -fsanitize=bounds -fsanitize=enum -fsanitize=float-cast-overflow -fsanitize=float-divide-by-zero -fsanitize=implicit-unsigned-integer-truncation -fsanitize=implicit-integer-sign-change -fsanitize=integer-divide-by-zero -fsanitize=nonnull-attribute -fsanitize=null -fsanitize=nullability -fsanitize=pointer-overflow -fsanitize=return -fsanitize=returns-nonnull-attribute -fsanitize=shift -fsanitize=unsigned-shift-base -fsanitize=signed-integer-overflow -fsanitize=unreachable -fsanitize=unsigned-integer-overflow -fsanitize=vla-bound -fsanitize=implicit-integer-arithmetic-value-change -fsanitize=implicit-bitfield-conversion")
--add_ldflags("-fno-sanitize=undefined","-nostdlib")
--set_toolset("as", "nasm")
add_cflags("-mno-mmx", "-mno-sse", "-mno-sse2")

target("kernel")
set_kind("binary")
set_toolchains("@zig", "nasm")
set_toolset("as", "nasm")

set_default(false)

Expand All @@ -33,8 +27,7 @@ target("kernel")

add_links("os_terminal")
add_links("elf_parse")
add_links("alloc-i686")
--add_links("ubscan")
add_links("alloc")
add_files("src/**/*.asm", "src/**/*.c")

add_asflags("-f", "elf32")
Expand Down Expand Up @@ -62,14 +55,14 @@ target("iso")
end)

on_run(function (target)
local mis = "-serial stdio -m 4096"
local misc = "-serial stdio -m 4096"
local speaker = " -audiodev pa,id=speaker -machine pcspk-audiodev=speaker "
local ahci = "-device ahci,id=ahci -drive file=./disk.qcow2,if=none,id=disk0 -device ide-hd,bus=ahci.0,drive=disk0"
local kvm = " -enable-kvm"
local vga = " -vga std -global VGA.vgamem_mb=32 "
local net = " -net nic,model=pcnet -net user "
local audio = " -device sb16,audiodev=speaker -device intel-hda -device hda-micro,audiodev=speaker "
local flags = mis..speaker..vga..net..kvm..audio
local flags = misc..speaker..vga..net..kvm..audio

os.exec("qemu-system-i386 -cdrom $(buildir)/CoolPotOS.iso %s", flags)
end)
Expand Down

0 comments on commit 5e91529

Please sign in to comment.