Merge branch 'master' of github.com:jtsiomb/pcboot

[bootcensus] / Makefile

diff --git a/Makefile b/Makefile
index 0722ce4..c4d724a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,22 @@
-csrc = $(wildcard src/*.c) $(wildcard src/libc/*.c)
-ssrc = $(wildcard src/*.s) $(wildcard src/libc/*.s) $(wildcard src/boot/*.s)
-obj = $(csrc:.c=.o) $(ssrc:.s=.o)
+csrc = $(wildcard src/*.c) $(wildcard src/libc/*.c) $(wildcard src/test/*.c)
+ssrc = $(wildcard src/*.s) $(wildcard src/libc/*.s) $(wildcard src/boot/*.s) $(wildcard src/test/*.s)
+Ssrc = $(wildcard src/*.S)
+obj = $(csrc:.c=.o) $(ssrc:.s=.o) $(Ssrc:.S=.o)
 dep = $(obj:.o=.d)
 elf = test
 bin = test.bin
 
 warn = -pedantic -Wall
+#opt = -O2
 dbg = -g
-inc = -Isrc -Isrc/libc
+inc = -Isrc -Isrc/libc -Isrc/test
+gccopt = -fno-pic -ffreestanding -nostdinc -fno-builtin
 
-CFLAGS = $(ccarch) -march=i386 $(warn) $(dbg) -nostdinc -fno-builtin $(inc) $(def)
+CFLAGS = $(ccarch) -march=i386 $(warn) $(opt) $(dbg) $(gccopt) $(inc) $(def)
 ASFLAGS = $(asarch) -march=i386 $(dbg) -nostdinc -fno-builtin $(inc)
-LDFLAGS = $(ldarch) -T pcboot.ld -print-gc-sections
+LDFLAGS = $(ldarch) -nostdlib -T pcboot.ld -print-gc-sections
 
+QEMU_FLAGS = -fda floppy.img -serial file:serial.log -soundhw sb16
 
 ifneq ($(shell uname -m), i386)
        ccarch = -m32
@@ -24,6 +28,13 @@ floppy.img: boot.img
        dd if=/dev/zero of=$@ bs=512 count=2880
        dd if=$< of=$@ conv=notrunc
 
+pcboot.iso: floppy.img
+       rm -rf cdrom
+       git archive --format=tar --prefix=cdrom/ HEAD | tar xf -
+       cp $< cdrom
+       mkisofs -o $@ -R -J -V pcboot -b $< cdrom
+
+
 boot.img: bootldr.bin $(bin)
        cat bootldr.bin $(bin) >$@
 
@@ -38,6 +49,9 @@ $(bin): $(elf)
 $(elf): $(obj)
        $(LD) -o $@ $(obj) -Map link.map $(LDFLAGS)
 
+%.o: %.S
+       $(CC) -o $@ $(CFLAGS) -c $<
+
 -include $(dep)
 
 %.d: %.c
@@ -60,6 +74,16 @@ bootldr.disasm: $(elf)
 $(elf).disasm: $(elf)
        objdump -d $< -j .startup -j .text -m i386 >$@
 
+$(elf).sym: $(elf)
+       objcopy --only-keep-debug $< $@
+
 .PHONY: run
 run: $(bin)
-       qemu-system-i386 -fda floppy.img -serial file:serial.log
+       qemu-system-i386 $(QEMU_FLAGS)
+
+.PHONY: debug
+debug: $(bin) $(elf).sym
+       qemu-system-i386 $(QEMU_FLAGS) -s -S
+
+.PHONY: sym
+sym: $(elf).sym