From a265979640a6b2bf20592c96ae1910b7dc93809a Mon Sep 17 00:00:00 2001 From: Nic Gaffney Date: Thu, 22 Feb 2024 23:16:13 -0600 Subject: Added easy distribution through make --- .bochsrc | 57 --------------------------------------------------------- .gitignore | 1 + Makefile | 12 +++++++++++- tests/bochsrc | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 58 deletions(-) delete mode 100644 .bochsrc create mode 100644 tests/bochsrc diff --git a/.bochsrc b/.bochsrc deleted file mode 100644 index f0ebff1..0000000 --- a/.bochsrc +++ /dev/null @@ -1,57 +0,0 @@ -# configuration file generated by Bochs -plugin_ctrl: unmapped=true, biosdev=true, speaker=true, extfpuirq=true, parallel=true, serial=true, e1000=false, iodebug=true, usb_uhci=false, usb_ohci=false, usb_ehci=false, usb_xhci=false -config_interface: textconfig -display_library: sdl2 -memory: host=32, guest=32 -romimage: file="/usr/share/bochs/BIOS-bochs-latest", address=0x00000000, options=none -vgaromimage: file="/usr/share/bochs/VGABIOS-lgpl-latest" -floppy_bootsig_check: disabled=0 -floppya: type=1_44 -boot: cdrom -# no floppyb -ata0: enabled=true, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14 -ata0-master: type=none -ata0-slave: type=cdrom, path="out/gftos.iso", status=inserted, model="Generic 1234", biosdetect=auto -ata1: enabled=true, ioaddr1=0x170, ioaddr2=0x370, irq=15 -ata1-master: type=none -ata1-slave: type=none -ata2: enabled=false -ata3: enabled=false -optromimage1: file=none -optromimage2: file=none -optromimage3: file=none -optromimage4: file=none -optramimage1: file=none -optramimage2: file=none -optramimage3: file=none -optramimage4: file=none -pci: enabled=1, chipset=i440fx, slot1=none, slot2=none, slot3=none, slot4=none, slot5=none -vga: extension=none, update_freq=5, realtime=1, ddc=builtin -cpu: count=1:1:1, ips=4000000, quantum=16, model=bx_generic, reset_on_triple_fault=1, cpuid_limit_winnt=0, ignore_bad_msrs=1, mwait_is_nop=0 -cpuid: level=6, stepping=3, model=3, family=6, vendor_string="GenuineIntel", brand_string=" Intel(R) Pentium(R) 4 CPU " -cpuid: mmx=true, apic=xapic, simd=sse2, sse4a=false, misaligned_sse=false, sep=true -cpuid: movbe=false, adx=false, aes=false, sha=false, xsave=false, xsaveopt=false, avx_f16c=false -cpuid: avx_fma=false, bmi=0, xop=false, fma4=false, tbm=false, x86_64=true, 1g_pages=false -cpuid: pcid=false, fsgsbase=false, smep=false, smap=false, mwait=true -print_timestamps: enabled=0 -debugger_log: bochs/dblog.txt -magic_break: enabled=1 -port_e9_hack: enabled=0 -private_colormap: enabled=0 -clock: sync=none, time0=local, rtc_sync=0 -# no cmosimage -log: bochs/log.txt -logprefix: %t%e%d -debug: action=ignore -info: action=report -error: action=report -panic: action=ask -keyboard: type=mf, serial_delay=250, paste_delay=100000, user_shortcut=none -mouse: type=ps2, enabled=false, toggle=ctrl+mbutton -speaker: enabled=true, mode=system -parport1: enabled=true, file=none -parport2: enabled=false -com1: enabled=true, mode=null -com2: enabled=false -com3: enabled=false -com4: enabled=false diff --git a/.gitignore b/.gitignore index 3fa9e7b..5eb4bc3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ out/*.iso out/isodir/boot/*.bin bochs/*.txt .cache +*.tgz diff --git a/Makefile b/Makefile index a7285e3..7ea4e27 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,10 @@ BUILD = build BOCHS = bochs TESTS = tests TEST = $(TESTS)/debug.rc +BOCHSRC = $(TESTS)/bochsrc TARGET = i686-elf ISO = gftos +DIST = $(ISO).tgz # Define source files ASM := $(sort $(shell find $(SRC) -name '*.s')) @@ -64,7 +66,7 @@ run: all # Generate logfiles using bochs test: all @mkdir -p $(BOCHS) - @bochs -f .bochsrc -q -rc $(TEST) > /dev/null 2>&1 + @bochs -f $(BOCHSRC) -q -rc $(TEST) > /dev/null 2>&1 @echo "BOCHS \t$(TEST)" .PHONY: clean @@ -81,11 +83,19 @@ clean: @echo "RM \t$(OUT_DIR)/isodir/boot/$(ISO).bin" @rm -rf $(BUILD) @echo "RM \t$(BUILD)" + @rm -rf $(DIST) + @echo "RM \t$(DIST)" .PHONY: compdb # Generate JSON compilation database compdb: $(BUILD)/compile_commands.json +.PHONY: dist +# Pack the source into a tar file +dist: clean + @tar zcvf $(DIST) * >/dev/null + @echo "TAR \t$(DIST)" + # https://stackoverflow.com/a/35730928 .PHONY: help # Show this help. diff --git a/tests/bochsrc b/tests/bochsrc new file mode 100644 index 0000000..f0ebff1 --- /dev/null +++ b/tests/bochsrc @@ -0,0 +1,57 @@ +# configuration file generated by Bochs +plugin_ctrl: unmapped=true, biosdev=true, speaker=true, extfpuirq=true, parallel=true, serial=true, e1000=false, iodebug=true, usb_uhci=false, usb_ohci=false, usb_ehci=false, usb_xhci=false +config_interface: textconfig +display_library: sdl2 +memory: host=32, guest=32 +romimage: file="/usr/share/bochs/BIOS-bochs-latest", address=0x00000000, options=none +vgaromimage: file="/usr/share/bochs/VGABIOS-lgpl-latest" +floppy_bootsig_check: disabled=0 +floppya: type=1_44 +boot: cdrom +# no floppyb +ata0: enabled=true, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14 +ata0-master: type=none +ata0-slave: type=cdrom, path="out/gftos.iso", status=inserted, model="Generic 1234", biosdetect=auto +ata1: enabled=true, ioaddr1=0x170, ioaddr2=0x370, irq=15 +ata1-master: type=none +ata1-slave: type=none +ata2: enabled=false +ata3: enabled=false +optromimage1: file=none +optromimage2: file=none +optromimage3: file=none +optromimage4: file=none +optramimage1: file=none +optramimage2: file=none +optramimage3: file=none +optramimage4: file=none +pci: enabled=1, chipset=i440fx, slot1=none, slot2=none, slot3=none, slot4=none, slot5=none +vga: extension=none, update_freq=5, realtime=1, ddc=builtin +cpu: count=1:1:1, ips=4000000, quantum=16, model=bx_generic, reset_on_triple_fault=1, cpuid_limit_winnt=0, ignore_bad_msrs=1, mwait_is_nop=0 +cpuid: level=6, stepping=3, model=3, family=6, vendor_string="GenuineIntel", brand_string=" Intel(R) Pentium(R) 4 CPU " +cpuid: mmx=true, apic=xapic, simd=sse2, sse4a=false, misaligned_sse=false, sep=true +cpuid: movbe=false, adx=false, aes=false, sha=false, xsave=false, xsaveopt=false, avx_f16c=false +cpuid: avx_fma=false, bmi=0, xop=false, fma4=false, tbm=false, x86_64=true, 1g_pages=false +cpuid: pcid=false, fsgsbase=false, smep=false, smap=false, mwait=true +print_timestamps: enabled=0 +debugger_log: bochs/dblog.txt +magic_break: enabled=1 +port_e9_hack: enabled=0 +private_colormap: enabled=0 +clock: sync=none, time0=local, rtc_sync=0 +# no cmosimage +log: bochs/log.txt +logprefix: %t%e%d +debug: action=ignore +info: action=report +error: action=report +panic: action=ask +keyboard: type=mf, serial_delay=250, paste_delay=100000, user_shortcut=none +mouse: type=ps2, enabled=false, toggle=ctrl+mbutton +speaker: enabled=true, mode=system +parport1: enabled=true, file=none +parport2: enabled=false +com1: enabled=true, mode=null +com2: enabled=false +com3: enabled=false +com4: enabled=false -- cgit v1.2.3