# HG changeset patch
# User mir3636
# Date 1518769452 -32400
# Node ID ad95e7f82f1e999e49694b5745e565393ea4b80a
# Parent  1d371d93ab4f412c3760a5e7247ddd98665c21c6
gcc-arm

diff -r 1d371d93ab4f -r ad95e7f82f1e Todo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Todo	Fri Feb 16 17:24:12 2018 +0900
@@ -0,0 +1,11 @@
+Fri Feb 16 16:38:49 JST 2018
+
+    xv6arm をつくる
+    cbclangの-arm
+    CbC_gcc のarmくろすこんぱいら
+    cbclang らいぶらりとインクルード
+    gccbc ライブラリとインクルード
+    できたxv6をKVMでうごかす
+    実際にxv6の一部をCbCで書き直す
+    efi boot を書く
+
diff -r 1d371d93ab4f -r ad95e7f82f1e src/entry.S
--- a/src/entry.S	Fri Feb 16 16:37:55 2018 +0900
+++ b/src/entry.S	Fri Feb 16 17:24:12 2018 +0900
@@ -14,8 +14,8 @@
 
 1:
     CMP     r1, r2
-#    STMLTIA r1!, {r3}
-    STMIALT r1!, {r3}
+    STMLTIA r1!, {r3}
+#    STMIALT r1!, {r3}
     BLT     1b
 
     # initialize stack pointers for svc modes
diff -r 1d371d93ab4f -r ad95e7f82f1e src/makefile-armgcc4.8.5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/makefile-armgcc4.8.5	Fri Feb 16 17:24:12 2018 +0900
@@ -0,0 +1,96 @@
+# specify path to QEMU, installed with MacPorts 
+QEMU = qemu-system-arm
+
+include makefile.inc
+
+CC = arm-linux-gnu-gcc
+AS = arm-linux-gnu-as
+LD = arm-linux-gnu-ld
+OBJCOPY = arm-linux-gnu-objcopy
+OBJDUMP = arm-linux-gnu-objdump
+
+CFLAGS = -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -I. -g -O0
+
+ASFLAGS = 
+
+LIBGCC = $(shell $(CC) -print-libgcc-file-name)
+
+LINK_BIN = $(call quiet-command,$(LD) $(LDFLAGS) \
+        -T $(1) -o $(2) $(3) $(LIBS) -b binary $(4), "  LINK     $(TARGET_DIR)$@")
+
+LINK_INIT = $(call quiet-command,$(LD) $(LDFLAGS) \
+        $(1) -o $@.out $<, "  LINK     $(TARGET_DIR)$@")
+OBJCOPY_INIT = $(call quiet-command,$(OBJCOPY) \
+        -S -O binary --prefix-symbols="_binary_$@" $@.out $@, "  OBJCOPY  $(TARGET_DIR)$@")
+
+
+# link the libgcc.a for __aeabi_idiv. ARM has no native support for div
+LIBS = $(LIBGCC)
+
+OBJS = \
+	lib/string.o \
+	\
+	arm.o\
+	asm.o\
+	bio.o\
+	buddy.o\
+	console.o\
+	exec.o\
+	file.o\
+	fs.o\
+	log.o\
+	main.o\
+	memide.o\
+	pipe.o\
+	proc.o\
+	spinlock.o\
+	start.o\
+	swtch.o\
+	syscall.o\
+	sysfile.o\
+	sysproc.o\
+	trap_asm.o\
+	trap.o\
+	vm.o \
+	\
+	device/picirq.o \
+	device/timer.o \
+	device/uart.o
+
+KERN_OBJS = $(OBJS) entry.o
+kernel.elf: $(addprefix build/,$(KERN_OBJS)) kernel.ld build/initcode build/fs.img
+	cp -f build/initcode initcode
+	cp -f build/fs.img fs.img
+	$(call LINK_BIN, kernel.ld, kernel.elf, \
+		$(addprefix build/,$(KERN_OBJS)), \
+		initcode fs.img)
+	$(OBJDUMP) -S kernel.elf > kernel.asm
+	$(OBJDUMP) -t kernel.elf | sed '1,/SYMBOL TABLE/d; s/ .* / /; /^$$/d' > kernel.sym
+	rm -f initcode fs.img
+
+qemu: kernel.elf
+	@clear
+	@echo "Press Ctrl-A and then X to terminate QEMU session\n"
+	$(QEMU) -M versatilepb -m 128 -cpu arm1176  -nographic -kernel kernel.elf
+
+INITCODE_OBJ = initcode.o
+$(addprefix build/,$(INITCODE_OBJ)): initcode.S
+	$(call build-directory)
+	$(call AS_WITH, -nostdinc -I.)
+
+#initcode is linked into the kernel, it will be used to craft the first process
+build/initcode: $(addprefix build/,$(INITCODE_OBJ))
+	$(call LINK_INIT, -N -e start -Ttext 0)
+	$(call OBJCOPY_INIT)
+	$(OBJDUMP) -S $< > initcode.asm
+
+build/fs.img:
+	make -C tools
+	make -C usr
+
+clean: 
+	rm -rf build
+	rm -f *.o *.d *.asm *.sym vectors.S bootblock entryother \
+	initcode initcode.out kernel xv6.img fs.img kernel.elf memfs
+	make -C tools clean
+	make -C usr clean