Project 1 백업 및 커맨드 라인 파싱 구현

include/threads/fixed_point.h

@@ -1,8 +1,10 @@
+
+/* Multi-Level Feedback Queue Scheduler 구현 시 추가한 헤더파일 */
 #define F (1 << 14) /* fixed point 1 */
 #define INT_MAX ((1 << 31) - 1)
 #define INT_MIN (-(1 << 31))
-
 #include <stdint.h> /* For int64_t */
+
 // x and y denote fixed_point numbers in 17.14 format
 // n is an integer
 
@@ -21,12 +23,14 @@ int div_mixed(int x, int n);  /* FP와 int 나눗셈(x/n) */
 /* 함수 본체 */
 
 /* integer를 fixed point로 전환 */
+
 int int_to_fp(int n)
 {
     return n * F;
 }
 
 /* FP를 int로 전환(버림) */
+
 int fp_to_int(int x)
 {
     return x / F;

userprog/Make.vars

@@ -7,6 +7,6 @@ TEST_SUBDIRS = tests/userprog tests/filesys/base tests/userprog/no-vm tests/thre
 GRADING_FILE = $(SRCDIR)/tests/userprog/Grading.no-extra
 
 # Uncomment the lines below to submit/test extra for project 2.
-# TDEFINE := -DEXTRA2
-# TEST_SUBDIRS += tests/userprog/dup2
-# GRADING_FILE = $(SRCDIR)/tests/userprog/Grading.extra
+ TDEFINE := -DEXTRA2
+ TEST_SUBDIRS += tests/userprog/dup2
+ GRADING_FILE = $(SRCDIR)/tests/userprog/Grading.extra

userprog/build/Makefile

@@ -0,0 +1,64 @@
+# -*- makefile -*-
+
+SRCDIR = ../..
+
+all: os.dsk
+
+include ../../Make.config
+include ../Make.vars
+include ../../tests/Make.tests
+
+# Compiler and assembler options.
+os.dsk: CPPFLAGS += -I$(SRCDIR)/lib/kernel
+
+# Core kernel.
+include ../../threads/targets.mk
+# User process code.
+include ../../userprog/targets.mk
+# Virtual memory code.
+include ../../vm/targets.mk
+# Filesystem code.
+include ../../filesys/targets.mk
+# Library code shared between kernel and user programs.
+include ../../lib/targets.mk
+# Kernel-specific library code.
+include ../../lib/kernel/targets.mk
+# Device driver code.
+include ../../devices/targets.mk
+
+SOURCES = $(foreach dir,$(KERNEL_SUBDIRS),$($(dir)_SRC))
+OBJECTS = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(SOURCES)))
+DEPENDS = $(patsubst %.o,%.d,$(OBJECTS))
+
+threads/kernel.lds.s: CPPFLAGS += -P
+threads/kernel.lds.s: threads/kernel.lds.S
+
+kernel.o: threads/kernel.lds.s $(OBJECTS)
+	$(LD) $(LDFLAGS) -T $< -o $@ $(OBJECTS)
+
+kernel.bin: kernel.o
+	$(OBJCOPY) -O binary -R .note -R .comment -S $< [email protected]
+	dd [email protected] of=$@ bs=4096 conv=sync
+	rm [email protected]
+
+threads/loader.o: threads/loader.S kernel.bin
+	$(CC) -c $< -o $@ $(ASFLAGS) $(CPPFLAGS) $(DEFINES) -DKERNEL_LOAD_PAGES=`perl -e 'print +(-s "kernel.bin") / 4096;'`
+
+loader.bin: threads/loader.o
+	$(LD) $(LDFLAGS) -N -e start -Ttext 0x7c00 --oformat binary -o $@ $<
+
+os.dsk: loader.bin kernel.bin
+	cat $^ > $@
+
+clean::
+	rm -f $(OBJECTS) $(DEPENDS)
+	rm -f threads/loader.o threads/kernel.lds.s threads/loader.d
+	rm -f kernel.o kernel.lds.s
+	rm -f kernel.bin loader.bin os.dsk
+	rm -f bochsout.txt bochsrc.txt
+	rm -f results grade
+
+Makefile: $(SRCDIR)/Makefile.build
+	cp $< $@
+
+-include $(DEPENDS)

userprog/build/threads/kernel.lds.s

@@ -0,0 +1,23 @@
+OUTPUT_FORMAT("elf64-x86-64")
+OUTPUT_ARCH(i386:x86-64)
+ENTRY(_start)
+SECTIONS
+{
+ . = 0x8004000000 + 0x200000;
+ PROVIDE(start = .);
+ .text : AT(0x200000) {
+  *(.entry)
+  *(.text .text.* .stub .gnu.linkonce.t.*)
+ } = 0x90
+ .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
+ . = ALIGN(0x1000);
+ PROVIDE(_end_kernel_text = .);
+  .data : { *(.data) *(.data.*)}
+  PROVIDE(_start_bss = .);
+  .bss : { *(.bss) }
+  PROVIDE(_end_bss = .);
+  PROVIDE(_end = .);
+ /DISCARD/ : {
+  *(.eh_frame .note.GNU-stack .stab)
+ }
+}

userprog/exception.c

@@ -140,6 +140,8 @@ page_fault (struct intr_frame *f) {
 	write = (f->error_code & PF_W) != 0;
 	user = (f->error_code & PF_U) != 0;
 
+	exit(-1);
+
 #ifdef VM
 	/* For project 3 and later. */
 	if (vm_try_handle_fault (f, fault_addr, user, write, not_present))