Prepare for adding multiple architecures in OS

* Need place to hold arch specific stuff * Abstraction layer for multiple platforms Signed-off-by: Mahavir Jain <[email protected]>
mahavirj · Apr 1, 2017 · bdc60a2 · bdc60a2
1 parent dc8312e
commit bdc60a2
Show file tree

Hide file tree

Showing 43 changed files with 244 additions and 159 deletions.
diff --git a/Makefile b/Makefile
@@ -1,140 +1,17 @@
-
-# Compiler GCC
-CC := gcc
-AS := nasm
-OBJDUMP := objdump
-OBJCOPY := objcopy
-AR := ar
-
 # Tiny OS version
 VERSION := 0.2
 
+# Architecture
+ARCH ?= x86
+
 # Verbose build pass verbose=1
 ifeq ($(verbose),1)
 V :=
 else
 V := @
 endif
 
-# Build artifacts
-objdir := bin
-os_image := $(objdir)/os.iso
-kernel := $(objdir)/kernel.elf
-
-kernel_src_dir := \
-		kernel	 \
-		drivers	 \
-		stdlib 	 \
-
-boot_src_dir :=	boot
-
-app_src_dir := app
-
-app_obj_dir := $(objdir)/$(app_src_dir)
-
-c_srcs := kernel/cpio_parser.c \
-	  kernel/gdt.c \
-	  kernel/idt.c \
-	  kernel/isr.c \
-	  kernel/keyboard.c \
-	  kernel/main.c \
-	  kernel/mem.c \
-	  kernel/sync.c \
-	  kernel/syscall.c \
-	  kernel/task.c \
-	  kernel/timer.c \
-	  kernel/vm.c \
-	  kernel/wait_queue.c \
-	  drivers/vga.c \
-	  stdlib/stdlib.c \
-	  stdlib/printk.c \
-
-asm_srcs := boot/boot.s \
-	    boot/helper.s \
-	    boot/isr.s \
-	    boot/swtch.s \
-	    boot/sync.s \
-
-c_objs := $(c_srcs:%.c=$(objdir)/%.o)
-asm_objs := $(asm_srcs:%.s=$(objdir)/%.o)
-
-app_lib_srcs := stdlib/crt.c \
-		stdlib/stdlib.c \
-		stdlib/printf.c \
-		stdlib/malloc.c \
-
-app_asm_srcs := boot/syscall.s \
-
-app_lib_objs := $(app_lib_srcs:%.c=$(objdir)/%.o)
-app_asm_objs := $(app_asm_srcs:%.s=$(objdir)/%.o)
-
-app_lib := $(objdir)/lib_helper.a
-
-CFLAGS := -g -O2 -m32 -ffreestanding -Wall -Wextra -DVERSION=\"$(VERSION)\"
-CFLAGS += -Iinclude/kernel \
-	-Iinclude/drivers \
-
-LDSCRIPT = -T ldscript/linker.ld
-APP_LDSCRIPT = -T app/linker.ld
-LDFLAGS = -nostdlib -Wl,--build-id=none
-APP_CFLAGS := -g -O2 -m32 -static -fno-pic -Wall -Wextra -ffreestanding -I app/
-APP_LDFLAGS := -nostdlib -Ttext 0x100000 -Wl,--build-id=none
-ASFLAGS = -f elf
-
-define make-repo
-   for dir in $(kernel_src_dir) $(boot_src_dir) $(app_src_dir); \
-   do \
-        mkdir -p $(objdir)/$$dir; \
-   done
-endef
-
-all: pre-build $(kernel) $(os_image)
-
-ramfs.obj: $(app_lib) $(app_obj_dir)/init $(app_obj_dir)/shell $(app_obj_dir)/forktest $(app_obj_dir)/memtest
-	$(V)cd $(app_obj_dir) && find . | cpio -o -H newc > ../ramfs.cpio
-	$(V)cd $(objdir) && $(OBJCOPY) -I binary -O elf32-i386 -B i386 ramfs.cpio $@
-
-$(app_lib): $(app_lib_objs) $(app_asm_objs)
-	$(V)$(AR) cru $@ $^
-
-$(app_obj_dir)/forktest: $(app_src_dir)/forktest.c $(app_lib)
-	@echo "  APP   $<"
-	$(V)$(CC) $(APP_CFLAGS) $(APP_LDFLAGS) $^ -o $@
-
-$(app_obj_dir)/memtest: $(app_src_dir)/memtest.c $(app_lib)
-	@echo "  APP   $<"
-	$(V)$(CC) $(APP_CFLAGS) $(APP_LDFLAGS) $^ -o $@
-
-$(app_obj_dir)/init: $(app_src_dir)/init.c $(app_lib)
-	@echo "  APP   $<"
-	$(V)$(CC) $(APP_CFLAGS) $(APP_LDFLAGS) $^ -o $@
-
-$(app_obj_dir)/shell: $(app_src_dir)/shell.c $(app_lib)
-	@echo "  APP   $<"
-	$(V)$(CC) $(APP_CFLAGS) $(APP_LDFLAGS) $^ -o $@
-
-pre-build:
-	@mkdir -p $(objdir)
-	@$(call make-repo)
-
-$(kernel): ldscript/linker.ld $(asm_objs) $(c_objs) ramfs.obj
-	@echo "  LD    $@"
-	$(V)$(CC) $(CFLAGS) $(LDFLAGS) $(LDSCRIPT) $(asm_objs) $(c_objs) $(objdir)/ramfs.obj -o $@
-	$(V)$(OBJDUMP) -t $@ | sed '1,/SYMBOL TABLE/d; s/ .* / /; /^$$/d' > $(objdir)/kernel.sym
-
-$(os_image): $(kernel)
-	$(V)cp $< iso/boot/
-	$(V)genisoimage -R -b boot/grub/grub -no-emul-boot -boot-load-size 4 \
-                -A os -input-charset utf8 -quiet -boot-info-table -o $@ iso
-
-run: all
-	bochs -qf tools/bochsrc.txt -rc tools/bochsrc.debug
-
-qemu: all
-	qemu-system-i386 -cdrom bin/os.iso -m 32 -monitor stdio
-
-qemu_gdb: all
-	qemu-system-i386 -cdrom bin/os.iso -m 32 -s -S -monitor stdio
+include build/rules-$(ARCH).mk
 
 $(objdir)/%.o: %.c
 	@echo "  CC    $<"
@@ -144,8 +21,4 @@ $(objdir)/%.o: %.s
 	@echo "  ASM   $<"
 	$(V)$(AS) $(ASFLAGS) $< -o $@
 
-clean:
-	@rm -rf bin/
-	@rm -f iso/boot/$(kernel)
-
 .PHONY: all pre-build clean run
diff --git a/arch/x86/arch.c b/arch/x86/arch.c
@@ -0,0 +1,24 @@
+#include <vga.h>
+#include <gdt.h>
+#include <idt.h>
+#include <helper.h>
+#include <timer.h>
+#include <keyboard.h>
+#include <mem.h>
+#include <vm.h>
+#include <task.h>
+#include <sync.h>
+
+extern unsigned end;
+void arch_init()
+{
+	mem_init(&end, PHYS_RAM - (int) V2P(&end));
+	printk("Initialized memory allocator\n");
+	init_paging();
+	printk("Initialized kernel paging\n");
+	init_gdt();
+	init_idt();
+	printk("Initialized descriptors\n");
+	init_keyboard();
+	init_timer(100);
+}
diff --git a/boot/boot.s → arch/x86/boot/boot.s b/boot/boot.s → arch/x86/boot/boot.s
diff --git a/boot/helper.s → arch/x86/boot/helper.s b/boot/helper.s → arch/x86/boot/helper.s
diff --git a/boot/isr.s → arch/x86/boot/isr.s b/boot/isr.s → arch/x86/boot/isr.s
diff --git a/boot/swtch.s → arch/x86/boot/swtch.s b/boot/swtch.s → arch/x86/boot/swtch.s
diff --git a/boot/sync.s → arch/x86/boot/sync.s b/boot/sync.s → arch/x86/boot/sync.s
diff --git a/boot/syscall.s → arch/x86/boot/syscall.s b/boot/syscall.s → arch/x86/boot/syscall.s
diff --git a/kernel/cpio_parser.c → arch/x86/cpio_parser.c b/kernel/cpio_parser.c → arch/x86/cpio_parser.c
diff --git a/drivers/vga.c → arch/x86/drivers/vga.c b/drivers/vga.c → arch/x86/drivers/vga.c
@@ -122,3 +122,8 @@ void init_vga()
 	fb = (uint16_t *) (KERNBASE + 0xB8000);
 	cls();
 }
+
+void console_init()
+{
+	init_vga();
+}
diff --git a/kernel/gdt.c → arch/x86/gdt.c b/kernel/gdt.c → arch/x86/gdt.c
diff --git a/kernel/idt.c → arch/x86/idt.c b/kernel/idt.c → arch/x86/idt.c
diff --git a/include/kernel/cpio_parser.h → arch/x86/include/cpio_parser.h b/include/kernel/cpio_parser.h → arch/x86/include/cpio_parser.h
diff --git a/include/drivers/vga.h → arch/x86/include/drivers/vga.h b/include/drivers/vga.h → arch/x86/include/drivers/vga.h
diff --git a/include/kernel/elf.h → arch/x86/include/elf.h b/include/kernel/elf.h → arch/x86/include/elf.h
diff --git a/include/kernel/gdt.h → arch/x86/include/gdt.h b/include/kernel/gdt.h → arch/x86/include/gdt.h
diff --git a/include/kernel/helper.h → arch/x86/include/helper.h b/include/kernel/helper.h → arch/x86/include/helper.h
diff --git a/include/kernel/idt.h → arch/x86/include/idt.h b/include/kernel/idt.h → arch/x86/include/idt.h
diff --git a/include/kernel/isr.h → arch/x86/include/isr.h b/include/kernel/isr.h → arch/x86/include/isr.h
diff --git a/include/kernel/keyboard.h → arch/x86/include/keyboard.h b/include/kernel/keyboard.h → arch/x86/include/keyboard.h
diff --git a/include/kernel/mem.h → arch/x86/include/mem.h b/include/kernel/mem.h → arch/x86/include/mem.h
diff --git a/include/kernel/sync.h → arch/x86/include/sync.h b/include/kernel/sync.h → arch/x86/include/sync.h
diff --git a/include/kernel/syscall.h → arch/x86/include/syscall.h b/include/kernel/syscall.h → arch/x86/include/syscall.h
diff --git a/include/kernel/timer.h → arch/x86/include/timer.h b/include/kernel/timer.h → arch/x86/include/timer.h
diff --git a/include/kernel/vm.h → arch/x86/include/vm.h b/include/kernel/vm.h → arch/x86/include/vm.h
diff --git a/include/kernel/wait_queue.h → arch/x86/include/wait_queue.h b/include/kernel/wait_queue.h → arch/x86/include/wait_queue.h
diff --git a/kernel/isr.c → arch/x86/isr.c b/kernel/isr.c → arch/x86/isr.c
diff --git a/kernel/keyboard.c → arch/x86/keyboard.c b/kernel/keyboard.c → arch/x86/keyboard.c
diff --git a/ldscript/linker.ld → arch/x86/ldscript/linker.ld b/ldscript/linker.ld → arch/x86/ldscript/linker.ld
diff --git a/kernel/mem.c → arch/x86/mem.c b/kernel/mem.c → arch/x86/mem.c
diff --git a/kernel/sync.c → arch/x86/sync.c b/kernel/sync.c → arch/x86/sync.c
diff --git a/kernel/syscall.c → arch/x86/syscall.c b/kernel/syscall.c → arch/x86/syscall.c
diff --git a/kernel/task.c → arch/x86/task.c b/kernel/task.c → arch/x86/task.c
diff --git a/kernel/timer.c → arch/x86/timer.c b/kernel/timer.c → arch/x86/timer.c
diff --git a/kernel/vm.c → arch/x86/vm.c b/kernel/vm.c → arch/x86/vm.c
@@ -274,3 +274,11 @@ void init_paging()
 	irq_install_handler(14, page_fault);
 	switch_pgdir(V2P(init_pd));
 }
+
+__attribute__((aligned(PGSIZE))) pd_t entrypgdir = {
+	/* Identiy mapping for first 4M memory */
+	.pdes[0] = (pde_t *) ((0) | PTE_P | PTE_W | PTE_PS),
+	/* Higher address mapping for 4M memory */
+	.pdes[KERNBASE >> PDXSHIFT] =
+		 (pde_t *) ((0) | PTE_P | PTE_W | PTE_PS),
+};
diff --git a/build/rules-arm.mk b/build/rules-arm.mk
@@ -0,0 +1,49 @@
+
+# Compiler GCC
+CC := arm-none-eabi-gcc
+CFLAGS := -g -mcpu=cortex-m3 -mthumb -O2 -ffreestanding -Iarch/arm/ -I include/
+LDFILE := arch/arm/ldscript/linker.ld
+LDFLAGS := -T $(LDFILE) -nostdlib
+
+# Build artifacts
+objdir := bin
+kernel := $(objdir)/kernel.elf
+
+kernel_src_dir := \
+		arch/arm	 	\
+		stdlib 	 		\
+
+c_srcs := \
+	arch/arm/startup.c \
+	arch/arm/main.c \
+	stdlib/stdlib.c \
+	stdlib/printf.c \
+	stdlib/malloc.c \
+
+c_objs := $(c_srcs:%.c=$(objdir)/%.o)
+
+define make-repo
+   for dir in $(kernel_src_dir); \
+   do \
+        mkdir -p $(objdir)/$$dir; \
+   done
+endef
+
+all: pre-build $(kernel)
+
+pre-build:
+	@mkdir -p $(objdir)
+	@$(call make-repo)
+
+$(kernel): $(LDFILE) $(c_objs)
+	@echo "  LD    $@"
+	$(V)$(CC) $(CFLAGS) $(LDFLAGS) $(c_objs) -o $@
+
+qemu: all
+	qemu-system-arm -M lm3s6965evb -kernel $(kernel) -serial stdio
+
+qemu_gdb: all
+	qemu-system-arm -M lm3s6965evb -kernel $(kernel) -serial stdio -s -S
+
+clean:
+	@rm -rf bin/
diff --git a/build/rules-x86.mk b/build/rules-x86.mk
@@ -0,0 +1,136 @@
+
+# Compiler GCC
+CC := gcc
+AS := nasm
+OBJDUMP := objdump
+OBJCOPY := objcopy
+AR := ar
+
+# Build artifacts
+objdir := bin
+os_image := $(objdir)/os.iso
+kernel := $(objdir)/kernel.elf
+
+kernel_src_dir := \
+		arch/x86/	 	\
+		arch/x86/drivers/ 	\
+		kernel/			\
+		stdlib/	 		\
+
+boot_src_dir :=	arch/x86/boot
+
+app_src_dir := app
+
+app_obj_dir := $(objdir)/$(app_src_dir)
+
+c_srcs := \
+	  arch/x86/arch.c \
+	  arch/x86/cpio_parser.c \
+	  arch/x86/gdt.c \
+	  arch/x86/idt.c \
+	  arch/x86/isr.c \
+	  arch/x86/keyboard.c \
+	  arch/x86/mem.c \
+	  arch/x86/sync.c \
+	  arch/x86/syscall.c \
+	  arch/x86/task.c \
+	  arch/x86/timer.c \
+	  arch/x86/vm.c \
+	  arch/x86/drivers/vga.c \
+	  kernel/main.c \
+	  stdlib/stdlib.c \
+	  stdlib/printk.c \
+	  stdlib/wait_queue.c \
+
+asm_srcs := arch/x86/boot/boot.s \
+	    arch/x86/boot/helper.s \
+	    arch/x86/boot/isr.s \
+	    arch/x86/boot/swtch.s \
+	    arch/x86/boot/sync.s \
+
+c_objs := $(c_srcs:%.c=$(objdir)/%.o)
+asm_objs := $(asm_srcs:%.s=$(objdir)/%.o)
+
+app_lib_srcs := stdlib/crt.c \
+		stdlib/stdlib.c \
+		stdlib/printf.c \
+		stdlib/malloc.c \
+
+app_asm_srcs := arch/x86/boot/syscall.s \
+
+app_lib_objs := $(app_lib_srcs:%.c=$(objdir)/%.o)
+app_asm_objs := $(app_asm_srcs:%.s=$(objdir)/%.o)
+
+app_lib := $(objdir)/lib_helper.a
+
+CFLAGS := -g -O2 -m32 -ffreestanding -Wall -Wextra -DVERSION=\"$(VERSION)\"
+CFLAGS += -Iinclude/ \
+	-Iarch/x86/include \
+	-Iarch/x86/include/drivers \
+
+LDFILE = arch/x86/ldscript/linker.ld
+LDSCRIPT = -T $(LDFILE)
+APP_LDSCRIPT = -T app/linker.ld
+LDFLAGS = -nostdlib -Wl,--build-id=none
+APP_CFLAGS := -g -O2 -m32 -static -fno-pic -Wall -Wextra -ffreestanding -I app/
+APP_LDFLAGS := -nostdlib -Ttext 0x100000 -Wl,--build-id=none
+ASFLAGS = -f elf
+
+define make-repo
+   for dir in $(kernel_src_dir) $(boot_src_dir) $(app_src_dir); \
+   do \
+        mkdir -p $(objdir)/$$dir; \
+   done
+endef
+
+all: pre-build $(kernel) $(os_image)
+
+ramfs.obj: $(app_lib) $(app_obj_dir)/init $(app_obj_dir)/shell $(app_obj_dir)/forktest $(app_obj_dir)/memtest
+	$(V)cd $(app_obj_dir) && find . | cpio -o -H newc > ../ramfs.cpio
+	$(V)cd $(objdir) && $(OBJCOPY) -I binary -O elf32-i386 -B i386 ramfs.cpio $@
+
+$(app_lib): $(app_lib_objs) $(app_asm_objs)
+	$(V)$(AR) cru $@ $^
+
+$(app_obj_dir)/forktest: $(app_src_dir)/forktest.c $(app_lib)
+	@echo "  APP   $<"
+	$(V)$(CC) $(APP_CFLAGS) $(APP_LDFLAGS) $^ -o $@
+
+$(app_obj_dir)/memtest: $(app_src_dir)/memtest.c $(app_lib)
+	@echo "  APP   $<"
+	$(V)$(CC) $(APP_CFLAGS) $(APP_LDFLAGS) $^ -o $@
+
+$(app_obj_dir)/init: $(app_src_dir)/init.c $(app_lib)
+	@echo "  APP   $<"
+	$(V)$(CC) $(APP_CFLAGS) $(APP_LDFLAGS) $^ -o $@
+
+$(app_obj_dir)/shell: $(app_src_dir)/shell.c $(app_lib)
+	@echo "  APP   $<"
+	$(V)$(CC) $(APP_CFLAGS) $(APP_LDFLAGS) $^ -o $@
+
+pre-build:
+	@mkdir -p $(objdir)
+	@$(call make-repo)
+
+$(kernel): $(LDFILE) $(asm_objs) $(c_objs) ramfs.obj
+	@echo "  LD    $@"
+	$(V)$(CC) $(CFLAGS) $(LDFLAGS) $(LDSCRIPT) $(asm_objs) $(c_objs) $(objdir)/ramfs.obj -o $@
+	$(V)$(OBJDUMP) -t $@ | sed '1,/SYMBOL TABLE/d; s/ .* / /; /^$$/d' > $(objdir)/kernel.sym
+
+$(os_image): $(kernel)
+	$(V)cp $< iso/boot/
+	$(V)genisoimage -R -b boot/grub/grub -no-emul-boot -boot-load-size 4 \
+                -A os -input-charset utf8 -quiet -boot-info-table -o $@ iso
+
+run: all
+	bochs -qf tools/bochsrc.txt -rc tools/bochsrc.debug
+
+qemu: all
+	qemu-system-i386 -cdrom bin/os.iso -m 32 -monitor stdio
+
+qemu_gdb: all
+	qemu-system-i386 -cdrom bin/os.iso -m 32 -s -S -monitor stdio
+
+clean:
+	@rm -rf bin/
+	@rm -f iso/boot/$(kernel)
diff --git a/include/arch.h b/include/arch.h
@@ -0,0 +1,6 @@
+#ifndef __ARCH_H__
+#define __ARCH_H__
+
+void arch_init(void);
+
+#endif /* __ARCH_H__ */