Merge pull request #91 from kushagra765/0.10

Merge changes from '0.10' branch

Author: DamieFC

.clang-format

@@ -15,7 +15,7 @@ AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLoopsOnASingleLine: false
 BreakStringLiterals: false
-ReflowComments:  true
-SortIncludes:    true
-UseTab:          Never
+ReflowComments: true
+SortIncludes: true
+UseTab: Never
 ...

.gitignore

@@ -8,3 +8,4 @@
 scripts/gen_initrd
 toolchain/compiler/
 isodir/
+kernel/include/generated/

Makefile

@@ -1,18 +1,19 @@
 # Makefile for Platypus OS
 
 VERSION = 0.10
-EXTRAVERSION = -rc3
+EXTRAVERSION = 
 
 MAKEFILE_BUILD = ./scripts/Makefile.build
 MAKEFILE_RUN = ./scripts/Makefile.run
 
 .PHONY: all
 
 all:
-	make -f $(MAKEFILE_BUILD) -j$(nproc)
+	@./scripts/gen_config.sh
+	@make -f $(MAKEFILE_BUILD) -j$(nproc)
 
 clean:
-	make -f $(MAKEFILE_BUILD) clean
+	@make -f $(MAKEFILE_BUILD) clean
 
 run:
-	make -f $(MAKEFILE_RUN)
+	@make -f $(MAKEFILE_RUN)

README.md

@@ -18,11 +18,13 @@ To build the OS, read the [build guide](docs/Building.md).
 See the [Mailing Patches](docs/Mailing-Patches.md) file.
 
 # Screenshot
-![Image](screenshots/Screenshot-0.10-rc3.png)
+Version 0.10 (GitHub Actions Build ISO)
+![Image](screenshots/Screenshot-0.10.png)
 
 # Acknowledgments
 ## Projects
-- [pdclib](https://github.com/DevSolar/pdclib) (The libc is based on pdclib)
+- [pdclib](https://github.com/DevSolar/pdclib)
+- [libc11](https://github.com/dryc/libc11)
 
 # License
 This project is licensed under GPL v2. See the [`LICENSE`](LICENSE) file for more info.

SECURITY.md

@@ -4,7 +4,7 @@
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 0.10-rc2 | :white_check_mark: |
+| 0.10    | :white_check_mark: |
 | 0.09    | :x:                |
 | 0.08    | :x:                |
 | 0.07    | :x:                |                

docs/Building.md

@@ -5,11 +5,7 @@ cd ./toolchain/
 sh ./build_toolchain.sh
 ```
 
-After the toolchain is built, you can build the OS by running: <br/>
-`make`
+After the toolchain is built, you can build the OS by running: `make`
 
 # Building the OS (without toolchain)
 If you already have the `i686-elf-gcc` toolchain, there's no need to build it again. Open the `scripts/Makefile.build` file and change the `CC` variable to the path where you have installed the toolchain and run `make`.
-
-# Booting the OS
-After building the OS, you can boot it by running `make run`.

docs/user-guide/terminal.md renamed to docs/user-guide/Terminal.md

@@ -1,6 +1,8 @@
 # User Guide
 This is what you should read if you're a user, and you want to try it out.
+
 ## Prerequisites
 1. [Building](../Building.md)
+
 ## Table Of Contents
-1. [The Terminal](terminal.md)
+1. [The Terminal](Terminal.md)

docs/user-guide/User-Guide.md

@@ -1,12 +1,17 @@
 #include "multiboot.h"
+#include <assert.h>
 #include <cpu/gdt.h>
 #include <cpu/idt.h>
 #include <cpu/irq.h>
 #include <cpu/isr.h>
+#include <floppy/floppy.h>
 #include <initrd/initrd.h>
-#include <kernel/paging.h>
+#include <kernel/device.h>
+#include <kernel/elf.h>
+#include <kernel/kheap.h>
+#include <kernel/pmm.h>
 #include <kernel/printm.h>
-#include <kernel/task.h>
+#include <kernel/vmm.h>
 #include <keyboard/keyboard.h>
 #include <pit/pit.h>
 #include <rtc/rtc.h>
@@ -17,8 +22,8 @@
 #include <vga/framebuffer.h>
 #include <vga/vga.h>
 
-extern uint32_t placement_address;
 uint32_t initial_esp;
+elf_t kernel_elf;
 
 void welcome_screen() {
   settextcolor(LIGHT_YELLOW, BLACK);
@@ -43,13 +48,12 @@ void welcome_screen() {
   settextcolor(BLUE, BLACK);
   writestr("Version: ");
   settextcolor(LIGHT_RED, BLACK);
-  writestr("0.10-rc3\n");
+  writestr("0.10\n");
   reset_text_color();
   writestr("\n");
 }
 
-void kernel_main(multiboot_info_t *mboot_info, uint32_t initial_stack) {
-  initial_esp = initial_stack;
+void kernel_main(multiboot_info_t *mboot_info) {
 
   // Initialize VGA and Framebuffer
   init_vga();
@@ -60,24 +64,39 @@ void kernel_main(multiboot_info_t *mboot_info, uint32_t initial_stack) {
   init_idt();
   init_isr();
   init_irq();
-  writestr("[OK] Load GDT, IDT, ISR and IRQ\n");
+  printm("[OK] Load GDT, IDT, ISR and IRQ\n");
 
   // Load Drivers
   init_pit(1000);
   init_keyboard();
-  register_snd_driver();
+  init_pcspkr();
   init_serial();
   init_rtc();
-  writestr("[OK] Load Drivers\n");
+  printm("[OK] Load Drivers\n");
 
+  init_pmm(mboot_info->mem_upper);
+  init_vmm();
+
+  uint32_t i = mboot_info->mmap_addr;
+  while (i < mboot_info->mmap_addr + mboot_info->mmap_length) {
+    multiboot_memory_map_t *entry = (multiboot_memory_map_t *)i;
+
+    if (entry->type == MULTIBOOT_MEMORY_AVAILABLE) {
+      uint32_t j;
+      for (j = entry->base_addr_low;
+           j < entry->base_addr_low + entry->length_low; j += 0x1000) {
+        free_page_pmm(j);
+      }
+    }
+    i += entry->size + sizeof(uint32_t);
+  }
+
+  kernel_elf = elf_from_multiboot(mboot_info->u.elf_sec);
+
+  ASSERT(mboot_info->mods_count > 0);
   uint32_t initrd = *((uint32_t *)mboot_info->mods_addr);
-  uint32_t initrd_end = *(uint32_t *)(mboot_info->mods_addr + 4);
-  placement_address = initrd_end;
 
-  // Initialize paging and tasking
-  init_paging();
-  init_tasking();
-  writestr("[OK] Initialize paging and tasking\n");
+  init_device_manager();
 
   irq_enable();
 
@@ -87,8 +106,9 @@ void kernel_main(multiboot_info_t *mboot_info, uint32_t initial_stack) {
   writestr("Kernel command line: %s\n", mboot_info->cmdline);
   uint32_t memsize = (mboot_info->mem_lower + mboot_info->mem_upper) / 1024;
   writestr("Total memory: %d MB\n", memsize);
-  writestr("Initrd at address: %x", initrd);
-  writestr("\n\n");
+  writestr("Initrd at address: %x\n", initrd);
+  detect_drives_floppy();
+  writestr("\n");
 
   vfs_root = init_initrd(initrd);
 

init/main.c

@@ -222,8 +222,10 @@ struct multiboot_color {
 
 struct multiboot_mmap_entry {
   multiboot_uint32_t size;
-  multiboot_uint32_t addr;
-  multiboot_uint32_t len;
+  multiboot_uint32_t base_addr_low;
+  multiboot_uint32_t base_addr_high;
+  multiboot_uint32_t length_low;
+  multiboot_uint32_t length_high;
 #define MULTIBOOT_MEMORY_AVAILABLE 1
 #define MULTIBOOT_MEMORY_RESERVED 2
 #define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE 3