projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix boot under Bochs when Pintos is compiled with recent GCC.
[pintos-anon]
/
src
/
Makefile.build
diff --git
a/src/Makefile.build
b/src/Makefile.build
index cf0f9b6f152891323df145b820dfc9bfc414e544..e997d2787543cb4860edff352660dea9ae350bcf 100644
(file)
--- a/
src/Makefile.build
+++ b/
src/Makefile.build
@@
-2,17
+2,18
@@
SRCDIR = ../..
SRCDIR = ../..
-all:
os.dsk
+all:
kernel.bin loader.bin
include ../../Make.config
include ../Make.vars
include ../../tests/Make.tests
# Compiler and assembler options.
include ../../Make.config
include ../Make.vars
include ../../tests/Make.tests
# Compiler and assembler options.
-
os.dsk
: CPPFLAGS += -I$(SRCDIR)/lib/kernel
+
kernel.bin
: CPPFLAGS += -I$(SRCDIR)/lib/kernel
# Core kernel.
# Core kernel.
-threads_SRC = threads/init.c # Main program.
+threads_SRC = threads/start.S # Startup code.
+threads_SRC += threads/init.c # Main program.
threads_SRC += threads/thread.c # Thread management core.
threads_SRC += threads/switch.S # Thread switch routine.
threads_SRC += threads/interrupt.c # Interrupt core.
threads_SRC += threads/thread.c # Thread management core.
threads_SRC += threads/switch.S # Thread switch routine.
threads_SRC += threads/interrupt.c # Interrupt core.
@@
-20,15
+21,21
@@
threads_SRC += threads/intr-stubs.S # Interrupt stubs.
threads_SRC += threads/synch.c # Synchronization.
threads_SRC += threads/palloc.c # Page allocator.
threads_SRC += threads/malloc.c # Subpage allocator.
threads_SRC += threads/synch.c # Synchronization.
threads_SRC += threads/palloc.c # Page allocator.
threads_SRC += threads/malloc.c # Subpage allocator.
-threads_SRC += threads/start.S # Startup code.
# Device driver code.
# Device driver code.
-devices_SRC = devices/timer.c # Timer device.
+devices_SRC = devices/pit.c # Programmable interrupt timer chip.
+devices_SRC += devices/timer.c # Periodic timer device.
devices_SRC += devices/kbd.c # Keyboard device.
devices_SRC += devices/vga.c # Video device.
devices_SRC += devices/serial.c # Serial port device.
devices_SRC += devices/kbd.c # Keyboard device.
devices_SRC += devices/vga.c # Video device.
devices_SRC += devices/serial.c # Serial port device.
-devices_SRC += devices/disk.c # IDE disk device.
+devices_SRC += devices/block.c # Block device abstraction layer.
+devices_SRC += devices/partition.c # Partition block device.
+devices_SRC += devices/ide.c # IDE disk block device.
+devices_SRC += devices/input.c # Serial and keyboard input.
devices_SRC += devices/intq.c # Interrupt queue.
devices_SRC += devices/intq.c # Interrupt queue.
+devices_SRC += devices/rtc.c # Real-time clock.
+devices_SRC += devices/shutdown.c # Reboot and power off.
+devices_SRC += devices/speaker.c # PC speaker.
# Library code shared between kernel and user programs.
lib_SRC = lib/debug.c # Debug helpers.
# Library code shared between kernel and user programs.
lib_SRC = lib/debug.c # Debug helpers.
@@
-36,6
+43,8
@@
lib_SRC += lib/random.c # Pseudo-random numbers.
lib_SRC += lib/stdio.c # I/O library.
lib_SRC += lib/stdlib.c # Utility functions.
lib_SRC += lib/string.c # String functions.
lib_SRC += lib/stdio.c # I/O library.
lib_SRC += lib/stdlib.c # Utility functions.
lib_SRC += lib/string.c # String functions.
+lib_SRC += lib/arithmetic.c # 64-bit arithmetic for GCC.
+lib_SRC += lib/ustar.c # Unix standard tar format utilities.
# Kernel-specific library code.
lib/kernel_SRC = lib/kernel/debug.c # Debug helpers.
# Kernel-specific library code.
lib/kernel_SRC = lib/kernel/debug.c # Debug helpers.
@@
-53,7
+62,7
@@
userprog_SRC += userprog/gdt.c # GDT initialization.
userprog_SRC += userprog/tss.c # TSS management.
# No virtual memory code yet.
userprog_SRC += userprog/tss.c # TSS management.
# No virtual memory code yet.
-#vm_SRC = vm/file
name.c
# Some file.
+#vm_SRC = vm/file
.c
# Some file.
# Filesystem code.
filesys_SRC = filesys/filesys.c # Filesystem core.
# Filesystem code.
filesys_SRC = filesys/filesys.c # Filesystem core.
@@
-71,27
+80,28
@@
threads/kernel.lds.s: CPPFLAGS += -P
threads/kernel.lds.s: threads/kernel.lds.S threads/loader.h
kernel.o: threads/kernel.lds.s $(OBJECTS)
threads/kernel.lds.s: threads/kernel.lds.S threads/loader.h
kernel.o: threads/kernel.lds.s $(OBJECTS)
- $(LD) -T $< -o $@ $(OBJECTS)
`$(CC) -print-libgcc-file-name`
+ $(LD) -T $< -o $@ $(OBJECTS)
kernel.bin: kernel.o
kernel.bin: kernel.o
- $(OBJCOPY) -O binary -R .note -R .comment -S $< $@.tmp
- dd if=$@.tmp of=$@ bs=4096 conv=sync
- rm $@.tmp
+ $(OBJCOPY) -R .note -R .comment -S $< $@
-threads/loader.o: threads/loader.S
kernel.bin
- $(CC) -c $< -o $@ $(ASFLAGS) $(CPPFLAGS) $(DEFINES)
-DKERNEL_LOAD_PAGES=`perl -e 'print +(-s "kernel.bin") / 4096;'`
+threads/loader.o: threads/loader.S
+ $(CC) -c $< -o $@ $(ASFLAGS) $(CPPFLAGS) $(DEFINES)
loader.bin: threads/loader.o
loader.bin: threads/loader.o
- $(LD) -N -e
start
-Ttext 0x7c00 --oformat binary -o $@ $<
+ $(LD) -N -e
0
-Ttext 0x7c00 --oformat binary -o $@ $<
-os.dsk:
loader.bin
kernel.bin
+os.dsk: kernel.bin
cat $^ > $@
clean::
rm -f $(OBJECTS) $(DEPENDS)
rm -f threads/loader.o threads/kernel.lds.s threads/loader.d
cat $^ > $@
clean::
rm -f $(OBJECTS) $(DEPENDS)
rm -f threads/loader.o threads/kernel.lds.s threads/loader.d
+ rm -f kernel.bin.tmp
rm -f kernel.o kernel.lds.s
rm -f kernel.o kernel.lds.s
- rm -f kernel.bin loader.bin os.dsk
+ rm -f kernel.bin loader.bin
+ rm -f bochsout.txt bochsrc.txt
+ rm -f results grade
Makefile: $(SRCDIR)/Makefile.build
cp $< $@
Makefile: $(SRCDIR)/Makefile.build
cp $< $@