stuff

xing1357 · Aug 12, 2023 · 74ffe25 · 74ffe25
1 parent ccc7379
commit 74ffe25
Show file tree

Hide file tree

Showing 41 changed files with 599 additions and 133 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Makefile b/Makefile
@@ -23,12 +23,12 @@ DEFINES=
 
 # qemu
 QEMU= qemu-system-i386
-QEMU_FLAGS= -m 64 -cdrom out/SimpleOS.iso -drive file=ext2.img,format=raw
+QEMU_FLAGS=  -boot d -cdrom out/SimpleOS.iso -drive file=fat32.img,format=raw
 
 # assembler flags
 ASM_FLAGS = -f elf32
 # compiler flags
-CC_FLAGS = $(INCLUDE) $(DEFINES) -m32 -std=gnu99 -ffreestanding -Wall -Wextra
+CC_FLAGS = $(INCLUDE) $(DEFINES) -m32 -std=gnu99 -ffreestanding -Wall -Wextra 
 # linker flags, for linker add linker.ld file too
 LD_FLAGS = -m elf_i386 -T $(CONFIG)/linker.ld -nostdlib --allow-multiple-definition
 
@@ -56,6 +56,9 @@ OBJECTS=$(ASM_OBJ)/entry.o $(ASM_OBJ)/load_gdt.o\
 		$(OBJ)/vesa.o\
 		$(OBJ)/bitmap.o\
 		$(OBJ)/panic.o\
+		$(OBJ)/fat32.o\
+
+
 
 all: $(OBJECTS)
 	@printf "[ linking... ]\n"
@@ -209,6 +212,11 @@ $(OBJ)/panic.o : $(SRC)/panic.c
 	$(CC) $(CC_FLAGS) -c $(SRC)/panic.c -o $(OBJ)/panic.o
 	@printf "\n"
 
+$(OBJ)/fat32.o : $(SRC)/fat32.c
+	@printf "[ $(SRC)/fat32.c ]\n"
+	$(CC) $(CC_FLAGS) -c $(SRC)/fat32.c -o $(OBJ)/fat32.o
+	@printf "\n"
+
 run:
 	$(QEMU) $(QEMU_FLAGS)
 

diff --git a/fat32.img b/fat32.img
diff --git a/include/ext2.h b/include/ext2.h
@@ -83,17 +83,17 @@ typedef struct ext2_inode
 typedef struct ext2_dirent
 {
 	uint32 inode;
-	uint32 dirent_size;
-	uint32 name_len;
-	uint32 type;
-	char* name;
+	uint16 dirent_size;
+	uint16 name_len;
+	uint8 type;
+	uint8* name;
 } ext2_dirent;
 
 ext2_superblock* sb;
 
-void read_superblock();
+ext2_superblock* read_superblock();
 void ext2_init();
 char* ext2_read_file(char* fpath);
-char** ext2_ls(uint32 inode_num);
+int ext2_ls(uint32 inode_num);
 uint32 ext2_path_to_inode(char* path);
 #endif
diff --git a/include/fat32.h b/include/fat32.h
@@ -0,0 +1,66 @@
+#ifndef FAT32_H
+#define FAT32_H
+
+#include "types.h"
+
+typedef struct fat_bpb
+{
+	unsigned char 		bootjmp[3];
+	unsigned char 		oem_name[8];
+	unsigned short 	    bytes_per_sector;
+	unsigned char		sectors_per_cluster;
+	unsigned short		reserved_sector_count;
+	unsigned char		table_count;
+	unsigned short		root_entry_count;
+	unsigned short		total_sectors_16;
+	unsigned char		media_type;
+	unsigned short		table_size_16;
+	unsigned short		sectors_per_track;
+	unsigned short		head_side_count;
+	unsigned int 		hidden_sector_count;
+	unsigned int 		total_sectors_32;
+	//Fat32 Extended BPBL
+	unsigned int		table_size_32;
+	unsigned short		extended_flags;
+	unsigned short		fat_version;
+	unsigned int		root_cluster;
+	unsigned short		fat_info;
+	unsigned short		backup_BS_sector;
+	unsigned char 		reserved_0[12];
+	unsigned char		drive_number;
+	unsigned char 		reserved_1;
+	unsigned char		boot_signature;
+	unsigned int 		volume_id;
+	unsigned char		volume_label[11];
+	unsigned char		fat_type_label[8];
+
+}__attribute__((packed)) fat_bpb;
+
+typedef struct 
+{
+    uint8 Name[11];
+    uint8 Attributes;
+    uint8 Reserved;
+    uint8 CreatedTimeTenths;
+    uint16 CreatedTime;
+    uint16 CreatedDate;
+    uint16 AccessedDate;
+    uint16 FirstClusterHigh;
+    uint16 ModifiedTime;
+    uint16 ModifiedDate;
+    uint16 FirstClusterLow;
+    uint32 Size;
+} __attribute__((packed)) FAT_dirent;
+
+typedef struct fat_file
+{
+	BOOL is_dir;
+	uint32 position;
+	uint32 size;
+} fat_file;
+
+void fat_init();
+char* fat_read_file(char* fpath);
+uint32 fat_path_to_cluster(const char* path);
+void fat_dir_ls(uint32 cluster);
+#endif
diff --git a/log.txt b/log.txt
@@ -0,0 +1,28 @@
+qemu: fatal: invalid tss type
+EAX=00000000 EBX=0010b000 ECX=0000000f EDX=0010886e
+ESI=00000000 EDI=00000000 EBP=0014385c ESP=0000080a
+EIP=00001eb9 EFL=000a0002 [-------] CPL=3 II=0 A20=1 SMM=0 HLT=0
+ES =0a1e 0000a1e0 0000ffff 0000f300 DPL=3 DS16 [-WA]
+CS =b000 000b0000 0000ffff 0000f300 DPL=3 DS16 [-WA]
+SS =7527 00075270 0000ffff 0000f300 DPL=3 DS16 [-WA]
+DS =b000 000b0000 0000ffff 0000f300 DPL=3 DS16 [-WA]
+FS =3908 00039080 0000ffff 0000f300 DPL=3 DS16 [-WA]
+GS =01c7 00001c70 0000ffff 0000f300 DPL=3 DS16 [-WA]
+LDT=0000 00000000 0000ffff 00008200 DPL=0 LDT
+TR =0000 00000000 0000ffff 00008b00 DPL=0 TSS32-busy
+GDT=     00127880 0000003f
+IDT=     001278e0 000007ff
+CR0=00000011 CR2=00000000 CR3=00000000 CR4=00000000
+DR0=00000000 DR1=00000000 DR2=00000000 DR3=00000000 
+DR6=ffff0ff0 DR7=00000400
+CCS=00000000 CCD=00143870 CCO=EFLAGS
+EFER=0000000000000000
+FCW=037f FSW=0000 [ST=0] FTW=00 MXCSR=00001f80
+FPR0=0000000000000000 0000 FPR1=0000000000000000 0000
+FPR2=0000000000000000 0000 FPR3=0000000000000000 0000
+FPR4=0000000000000000 0000 FPR5=0000000000000000 0000
+FPR6=0000000000000000 0000 FPR7=0000000000000000 0000
+XMM00=0000000000000000 0000000000000000 XMM01=0000000000000000 0000000000000000
+XMM02=0000000000000000 0000000000000000 XMM03=0000000000000000 0000000000000000
+XMM04=0000000000000000 0000000000000000 XMM05=0000000000000000 0000000000000000
+XMM06=0000000000000000 0000000000000000 XMM07=0000000000000000 0000000000000000
diff --git a/mkdisk.sh b/mkdisk.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 printf "Creating Disk...\n"
-dd if=/dev/zero of=ext2.img bs=1024 count=10000 > /dev/zero
-mkfs -t ext2 -i 1024 -b 1024 -F ext2.img > /dev/zero
+dd if=/dev/zero of=fat32.img bs=1024 count=8192 > /dev/zero
+mkfs.fat -F 32 fat32.img 
 printf "Mounting...\n"
-rm -rf /mnt/ext2
-mkdir /mnt/ext2
-mount ext2.img /mnt/ext2
+rm -rf /mnt/fat32
+mkdir /mnt/fat32
+mount fat32.img /mnt/fat32
 printf "MOUNTED!\n"
-cp -r rootfs/* /mnt/ext2
-umount ext2.img
+cp -r rootfs/* /mnt/fat32
+umount fat32.img
 printf "Done!\n"
 
 

diff --git a/obj/8259_pic.o b/obj/8259_pic.o
diff --git a/obj/bios32.o b/obj/bios32.o
diff --git a/obj/bitmap.o b/obj/bitmap.o
diff --git a/obj/console.o b/obj/console.o
diff --git a/obj/ext2.o b/obj/ext2.o
diff --git a/obj/fat32.o b/obj/fat32.o
diff --git a/obj/gdt.o b/obj/gdt.o
diff --git a/obj/gui.o b/obj/gui.o
diff --git a/obj/ide.o b/obj/ide.o
diff --git a/obj/idt.o b/obj/idt.o
diff --git a/obj/io_ports.o b/obj/io_ports.o
diff --git a/obj/isr.o b/obj/isr.o
diff --git a/obj/kernel.o b/obj/kernel.o
diff --git a/obj/keyboard.o b/obj/keyboard.o
diff --git a/obj/kheap.o b/obj/kheap.o
diff --git a/obj/mouse.o b/obj/mouse.o
diff --git a/obj/panic.o b/obj/panic.o
diff --git a/obj/pmm.o b/obj/pmm.o
diff --git a/obj/string.o b/obj/string.o
diff --git a/obj/task.o b/obj/task.o
diff --git a/obj/tss.o b/obj/tss.o
diff --git a/obj/vesa.o b/obj/vesa.o
diff --git a/obj/vga.o b/obj/vga.o
diff --git a/out/.DS_Store b/out/.DS_Store
diff --git a/out/SimpleOS.iso b/out/SimpleOS.iso
diff --git a/out/isodir/boot/SimpleOS.bin b/out/isodir/boot/SimpleOS.bin
diff --git a/src/asm/task.asm b/src/asm/task.asm
@@ -0,0 +1,43 @@
+global write_port
+extern timer_handler_main
+
+write_port:
+	mov   edx, [esp + 4]    
+	mov   al, [esp + 4 + 4]  
+	out   dx, al  
+	ret
+
+global timer_handler
+timer_handler:
+    ;cli ; no more interrupts
+
+    pushad ; save all registers
+
+    push esp ; send the ESP to timer_handler_main
+    push ebp ; send the EBP to timer_handler_main
+
+    call timer_handler_main
+    ;hlt ; we should not get here, halt the cpu
+
+global switch_stack_and_jump
+switch_stack_and_jump:
+    mov ebx, [esp + 8] ; second argument, the function pointer
+    mov eax, [esp + 4] ; first argument, a location to build a stack
+    mov esp, eax ; set the stack pointer to the location
+    mov ebp, esp ; by setting the EBP to the ESP, we configure a new stack
+    sti ; enable interrupts
+    jmp ebx ; jump to the function pointer
+
+global switch_stack
+switch_stack:
+    mov ebx, [esp + 8] ; second argument, the stack frame pointer
+    mov eax, [esp + 4] ; first argument, the stack pointer
+
+    mov ebp, ebx ; restore the stack frame
+    mov esp, eax ; restore the top of the stack
+
+    popad ; restore all registers
+
+    sti ; OK for interupts at this point
+    iretd ; perform a return from interrupt since the last task was interrupted
+