diff options
author | Andreas Baumann <mail@andreasbaumann.cc> | 2017-05-17 17:58:46 +0200 |
---|---|---|
committer | Andreas Baumann <mail@andreasbaumann.cc> | 2017-05-17 17:58:46 +0200 |
commit | 07f029b4b7d3d6d8e5fb4dfc1198b6ae6880fb56 (patch) | |
tree | 8bd3f56414be09cfc336adb8f5d99e56f3eff2a4 /src/Makefile | |
parent | d6b64c65a0d09dba96a65edd2959bd58fe781fcc (diff) | |
download | abaos-07f029b4b7d3d6d8e5fb4dfc1198b6ae6880fb56.tar.gz abaos-07f029b4b7d3d6d8e5fb4dfc1198b6ae6880fb56.tar.bz2 |
better magic signature detection (using a compile stamp with date and time)
using local labels where possible, some renames in assembly code
added a console_put_hex and serial_put_hex
better call to qemu printing the status of the host when crashing the emulator
Diffstat (limited to 'src/Makefile')
-rw-r--r-- | src/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index c2b91fa..7f5f162 100644 --- a/src/Makefile +++ b/src/Makefile @@ -12,7 +12,7 @@ image.bin: boot.bin kernel.bin magic.bin # + 1 * 512 = 512 for magic.bin # (M + N + 1 is the number of sectors to be read in stage 2, as stage 1 # loads only the first sector, so adapt NOF_LOAD_SECTORS to 12) - truncate -s 6656 image.tmp + truncate -s 7168 image.tmp cat image.tmp magic.bin > image.bin boot.bin: boot.asm gdt.asm stage1_functions.asm stage2_functions.asm switch_mode.asm @@ -51,10 +51,10 @@ stdlib.o: stdlib.c stdlib.h $(CC) $(CFLAGS) -c -o stdlib.o stdlib.c clean: - -rm -f boot.bin kernel.bin image.bin magic.bin *.o kernel.map image.tmp + -rm -f boot.bin kernel.bin image.bin magic.bin *.o boot.map image.tmp run-qemu: image.bin - qemu-system-i386 -m 32 -drive "file=image.bin,if=ide,format=raw" \ + qemu-system-i386 -d guest_errors -m 32 -drive "file=image.bin,if=ide,format=raw" \ -serial file:serial.log run-bochs: |