oscapstone · fanhouin · Apr 19, 2022 · Apr 19, 2022 · Apr 19, 2022 · Apr 19, 2022
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+*.cpio
 *.elf
 *.img
 src/*.elf
@@ -15,6 +16,12 @@ bootloader/src/*.elf
 bootloader/src/*.img
 bootloader/src/*.o
 bootloader/boot/*.o
+
+
+user/*.elf
+user/*.img
+user/build/*
+
 peda*
 .gdb*
 

diff --git a/README.md b/README.md
@@ -68,6 +68,7 @@ sudo ../uartboot.py <num>
  ┃ ┣ 📂include
  ┃ ┃ ┣ 📜allocator.h
  ┃ ┃ ┣ 📜cpio.h
+ ┃ ┃ ┣ 📜dev_ops.h
  ┃ ┃ ┣ 📜exc.h
  ┃ ┃ ┣ 📜fdt.h
  ┃ ┃ ┣ 📜gpio.h
@@ -78,14 +79,25 @@ sudo ../uartboot.py <num>
  ┃ ┃ ┣ 📜math.h
  ┃ ┃ ┣ 📜read.h
  ┃ ┃ ┣ 📜reboot.h
+ ┃ ┃ ┣ 📜sched.h
  ┃ ┃ ┣ 📜shell.h
+ ┃ ┃ ┣ 📜signal.h
  ┃ ┃ ┣ 📜stddef.h
  ┃ ┃ ┣ 📜stdint.h
  ┃ ┃ ┣ 📜string.h
+ ┃ ┃ ┣ 📜syscall.h
  ┃ ┃ ┣ 📜task.h
+ ┃ ┃ ┣ 📜test_fs.h
  ┃ ┃ ┣ 📜timer.h
- ┃ ┃ ┗ 📜uart.h
+ ┃ ┃ ┣ 📜tmpfs.h
+ ┃ ┃ ┣ 📜uart.h
+ ┃ ┃ ┣ 📜user_syscall.h
+ ┃ ┃ ┗ 📜vfs.h
  ┃ ┣ 📂initramfs
+ ┃ ┃ ┣ 📂flag
+ ┃ ┃ ┃ ┣ 📂fffflag
+ ┃ ┃ ┃ ┃ ┗ 📜flag   
+ ┃ ┃ ┃ ┗ 📜fakeflag.txt
  ┃ ┃ ┣ 📜me
  ┃ ┃ ┣ 📜test1
  ┃ ┃ ┣ 📜test2.txt
@@ -94,6 +106,8 @@ sudo ../uartboot.py <num>
  ┃ ┣ 📂src
  ┃ ┃ ┣ 📜allocator.c
  ┃ ┃ ┣ 📜cpio.c
+ ┃ ┃ ┣ 📜ctx_switch.S
+ ┃ ┃ ┣ 📜dev_ops.c
  ┃ ┃ ┣ 📜exc.c
  ┃ ┃ ┣ 📜fdt.c
  ┃ ┃ ┣ 📜irq.c
@@ -103,11 +117,18 @@ sudo ../uartboot.py <num>
  ┃ ┃ ┣ 📜math.c
  ┃ ┃ ┣ 📜read.c
  ┃ ┃ ┣ 📜reboot.c
+ ┃ ┃ ┣ 📜sched.c
  ┃ ┃ ┣ 📜shell.c
+ ┃ ┃ ┣ 📜signal.c
  ┃ ┃ ┣ 📜string.c
+ ┃ ┃ ┣ 📜syscall.c
  ┃ ┃ ┣ 📜task.c
+ ┃ ┃ ┣ 📜test_fs.c
  ┃ ┃ ┣ 📜timer.c
- ┃ ┃ ┗ 📜uart.c
+ ┃ ┃ ┣ 📜tmpfs.c
+ ┃ ┃ ┣ 📜uart.c
+ ┃ ┃ ┣ 📜user_syscall.S
+ ┃ ┃ ┗ 📜vfs.c
  ┃ ┣ 📜Makefile
  ┃ ┣ 📜bcm2710-rpi-3-b-plus.dtb
  ┃ ┗ 📜initramfs.cpio

diff --git a/debug.gdb b/debug.gdb
@@ -1,3 +1,3 @@
 file kernel8.elf
-b *0x81600
+b *tmpfs_read
 target remote :1234
diff --git a/kernel/Makefile b/kernel/Makefile
@@ -7,21 +7,26 @@ SRC_DIR = src
 BUILD_DIR = build
 BOOT_DIR = boot
 
+SFILES_ASM = $(wildcard src/*.S)
+OFILES_ASM = $(patsubst src/%.S, build/%.o, $(SFILES_ASM)) # OFILES = $(SFILES:.c=.o)
 SFILES = $(wildcard src/*.c)
 OFILES = $(patsubst src/%.c, build/%.o, $(SFILES)) # OFILES = $(SFILES:.c=.o)
 BOOTFILES = $(wildcard boot/*.S)
 BOOTOFILES = $(patsubst boot/%.S, build/%.o, $(BOOTFILES)) # BOOTOFILES = $(BOOTFILES:.S=.o)
-ALLOFILES = $(OFILES) $(BOOTOFILES)
+ALLOFILES = $(OFILES) $(BOOTOFILES) $(OFILES_ASM)
 
 CFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -nostartfiles
 
-all: clean kernel8.img run
+all: clean kernel8.img run-display
 
 $(BUILD_DIR)/%.o: $(BOOT_DIR)/%.S
-	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ -g
+	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ -g 
+
+$(BUILD_DIR)/%.o: $(SRC_DIR)/%.S
+	$(CC) $(CFLAGS)	$(INCLUDE) -c $< -o $@ -g 
 
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c
-	$(CC) $(CFLAGS)	$(INCLUDE) -c $< -o $@ -g
+	$(CC) $(CFLAGS)	$(INCLUDE) -c $< -o $@ -g 
 
 kernel8.img: $(ALLOFILES)
 	$(LD) -nostdlib -nostartfiles  $(ALLOFILES) -T boot/linker.ld -o kernel8.elf
@@ -31,7 +36,21 @@ clean:
 	rm *.elf *.img build/* >/dev/null 2>/dev/null || true
 
 run: 
-	qemu-system-aarch64 -M raspi3 -kernel kernel8.img -display none -s -serial null -serial stdio -initrd initramfs.cpio -dtb bcm2710-rpi-3-b-plus.dtb
+	qemu-system-aarch64 -M raspi3 -kernel kernel8.img -display none -s -serial null -serial stdio -initrd initramfs.cpio -dtb bcm2710-rpi-3-b-plus.dtb 
+
+run-display: 
+	qemu-system-aarch64 -M raspi3 -kernel kernel8.img -s -serial null -serial stdio -initrd initramfs.cpio -dtb bcm2710-rpi-3-b-plus.dtb
 
 pty: 
 	qemu-system-aarch64 -M raspi3 -kernel kernel8.img -display none -s -serial null -serial pty -initrd initramfs.cpio -dtb bcm2710-rpi-3-b-plus.dtb
+
+cpio:
+	cd initramfs;\find . | cpio -o -H newc > ../initramfs.cpio;
+
+user:
+	cd ../user;\
+	make;\
+	cp user2.img ./initramfs/user2.img;\
+	cd initramfs;\find . | cpio -o -H newc > ../initramfs.cpio;\
+	cd ..;\
+	cp ./initramfs.cpio ../kernel/initramfs.cpio
diff --git a/kernel/boot/start.S b/kernel/boot/start.S
@@ -39,7 +39,7 @@ _start:
 
 // save general registers to stack
 .macro save_all
-    sub sp, sp, 33 * 8
+    sub sp, sp, 16 * 17
     stp x0, x1, [sp ,16 * 0]
     stp x2, x3, [sp ,16 * 1]
     stp x4, x5, [sp ,16 * 2]
@@ -55,18 +55,20 @@ _start:
     stp x24, x25, [sp ,16 * 12]
     stp x26, x27, [sp ,16 * 13]
     stp x28, x29, [sp ,16 * 14]
-    str x30, [sp, 16 * 15]
-
-    mrs x5, spsr_el1
-    mrs x6, elr_el1
-    stp x5, x6, [sp ,16 * 16]
+    mrs x9, sp_el0
+    stp x30, x9, [sp, 16 * 15]
+    mrs x9, elr_el1
+    mrs x10, spsr_el1
+    stp x9, x10, [sp ,16 * 16]
 .endm
 
 // load general registers from stack
 .macro load_all
-    ldp x5, x6, [sp ,16 * 16]
-    msr spsr_el1, x5 
-    msr elr_el1, x6
+    ldp x30, x10, [sp ,16 * 15]
+    msr sp_el0, x10
+    ldp x9, x10, [sp ,16 * 16]
+    msr elr_el1, x9
+    msr spsr_el1, x10 
 
     ldp x0, x1, [sp ,16 * 0]
     ldp x2, x3, [sp ,16 * 1]
@@ -83,23 +85,31 @@ _start:
     ldp x24, x25, [sp ,16 * 12]
     ldp x26, x27, [sp ,16 * 13]
     ldp x28, x29, [sp ,16 * 14]
-    ldr x30, [sp, 16 * 15]
 
-    add sp, sp, 33 * 8
+    add sp, sp, 16 * 17
 .endm
 
+.global after_fork
+after_fork:
+    load_all
+    eret
+
 sync_exception_entry:
     save_all
-    mrs     x1, esr_el1
-    mrs     x2, elr_el1
-    mrs     x3, spsr_el1
+    mrs     x0, esr_el1
+    mrs     x1, elr_el1
+    mrs     x2, spsr_el1
+
+    // trap frame
+    mov     x3, sp
     bl      exception_handler
     load_all
     eret
 
 irq_entry:
     save_all
-    mrs     x1, spsr_el1
+    mrs     x0, spsr_el1
+    mov     x1, sp
     bl      irq_handler
     load_all
     eret
@@ -122,7 +132,7 @@ exception_vector_table:
     b fail
     .align 7
 
-    b fail
+    b sync_exception_entry
     .align 7
     b irq_entry
     .align 7

diff --git a/kernel/include/cpio.h b/kernel/include/cpio.h
@@ -10,6 +10,7 @@ unsigned long long CPIO_BASE_END;
 #define CPIO_HEADER_MAGIC "070701"
 #define CPIO_FOOTER_MAGIC "TRAILER!!!"
 #define CPIO_ALIGNMENT 4
+#define MAX_CPIO_FILE_NUM 1024
 
 
 typedef struct _cpio_newc_header{
@@ -36,14 +37,16 @@ typedef struct _file_info{
     char *data;
     unsigned int filename_size;
     unsigned int datasize;
+    char *c_nlink;
 }file_info;
 
-void testprint();
+void init_cpio_file_info();
 unsigned int padding(unsigned int);
 void ls();
 void cat(char [MAX_SIZE]);
 void run(unsigned long);
-unsigned long findDataAddr(char [MAX_SIZE]);
+unsigned long findDataAddr(const char *);
+file_info cpio_find_file_info(const char *thefilename);
 void parse_cpio_header(cpio_newc_header *, file_info *);
 
 

diff --git a/kernel/include/dev_ops.h b/kernel/include/dev_ops.h
@@ -0,0 +1,14 @@
+#ifndef DRIVER_OPS_H_
+#define DRIVER_OPS_H_
+
+#include <stddef.h>
+#include <vfs.h>
+#include <tmpfs.h>
+
+void dev_ops_init();
+int uart_dev_write(struct file* file, const void* buf, size_t len);
+int uart_dev_read(struct file* file, void* buf, size_t len);
+int framebuf_dev_write(struct file* file, const void* buf, size_t len);
+
+
+#endif
diff --git a/kernel/include/exc.h b/kernel/include/exc.h
@@ -1,9 +1,13 @@
 #ifndef	EXC_H_
 #define	EXC_H_
+#include <syscall.h>
 
-void exception_handler(unsigned long long, 
-                    unsigned long long, 
-                    unsigned long long, 
-                    unsigned long long);
+void exception_handler( unsigned long long, 
+                        unsigned long long, 
+                        unsigned long long,
+                        TrapFrame *);
+
+void syscall_handler(unsigned int syscall_id, TrapFrame *trapFrame);
+
+#endif  
 
-#endif  
diff --git a/kernel/include/irq.h b/kernel/include/irq.h
@@ -2,6 +2,7 @@
 #define	IRQ_H_
 
 #include <gpio.h>
+#include <syscall.h>
 
 #define IRQ_BASIC_PENDING	    ((volatile unsigned int*)(MMIO_BASE+0x0000B200))
 #define IRQ_PENDING_1	    	((volatile unsigned int*)(MMIO_BASE+0x0000B204))
@@ -22,7 +23,7 @@
 #define SYSTEM_TIMER_IRQ_3	(1 << 3)
 #define NON_SECURE_TIMER_IRQ	(1 << 1)
 
-void irq_handler(unsigned long long, unsigned long long);
+void irq_handler(unsigned long long, TrapFrame*);
 void Time_interrupt(unsigned long long);
 void GPU_interrupt();
 

diff --git a/kernel/include/mailbox.h b/kernel/include/mailbox.h
@@ -36,8 +36,14 @@
 #define MAILBOX_CH_COUNT    7
 #define MAILBOX_CH_PROP     8
 
-unsigned int get_board_revision(volatile unsigned int [36]);
-unsigned int get_arm_memory(volatile unsigned int [36]);
-unsigned int mailbox_call(volatile unsigned int [36], unsigned char);
+#define MBOX_REQUEST        0
+#define MBOX_CH_PROP        8
+#define MBOX_TAG_LAST       0
+
+
+unsigned int get_board_revision(unsigned int [36]);
+unsigned int get_arm_memory(unsigned int [36]);
+void framebuffer_init();
+unsigned int mailbox_call(unsigned int *, unsigned char);
 
 #endif
diff --git a/kernel/include/read.h b/kernel/include/read.h
@@ -9,6 +9,8 @@ int async_readline(char [MAX_SIZE], int);
 /* scan the input until get \r */
 int readline(char [MAX_SIZE], int);
 
+
+int async_readnbyte(char buf[MAX_SIZE], int size);
 /* read n bytes from uart */
 int readnbyte(char [MAX_SIZE], int);
 #endif