diff options
| -rw-r--r-- | kernel/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | kernel/include/mm/memory_map.h | 13 | ||||
| -rw-r--r-- | kernel/kernel/kernel.cc | 2 | ||||
| -rw-r--r-- | kernel/kernel/stack_smashing_protector.c | 6 | ||||
| -rw-r--r-- | kernel/libk/strlen.cc (renamed from kernel/libk/strlen.c) | 0 | ||||
| -rw-r--r-- | kernel/mm/memory_map.cc (renamed from kernel/mm/memory_map.c) | 20 | ||||
| -rw-r--r-- | kernel/mm/physical_mm/physical_mm.cc | 2 |
7 files changed, 25 insertions, 25 deletions
diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt index c80b225..cb39e32 100644 --- a/kernel/CMakeLists.txt +++ b/kernel/CMakeLists.txt @@ -17,10 +17,10 @@ set(SRC libk/printf.c libk/printk.cc - libk/strlen.c + libk/strlen.cc libk/kmalloc.cc - mm/memory_map.c + mm/memory_map.cc mm/physical_mm/memory_map.cc mm/physical_mm/physical_mm.cc mm/virtual_mm/virtual_mm.cc @@ -50,6 +50,9 @@ set(CXX_COMPILE_OPTIONS -fno-exceptions -fno-rtti -std=c++98 + + -Wno-write-strings + -Wno-missing-field-initializers ) target_compile_options(kernel PRIVATE diff --git a/kernel/include/mm/memory_map.h b/kernel/include/mm/memory_map.h index d72abc0..de8296b 100644 --- a/kernel/include/mm/memory_map.h +++ b/kernel/include/mm/memory_map.h @@ -25,20 +25,17 @@ /* TODO: Practically, do we need more than 32? */ #define MAX_FREE_REGIONS 32 -#ifdef __cplusplus -extern "C" { -#endif - typedef struct { uint8_t n_regions; multiboot_memory_map_t *region_list[MAX_FREE_REGIONS]; } free_memory_regions_t; -void memory_map_load(multiboot_info_t *mmap); -free_memory_regions_t *memory_map_get_free_regions(void); +namespace MemoryMap +{ + +void load(multiboot_info_t *mmap); +free_memory_regions_t *get_free_regions(void); -#ifdef __cplusplus } -#endif #endif diff --git a/kernel/kernel/kernel.cc b/kernel/kernel/kernel.cc index 384244a..98d1f5f 100644 --- a/kernel/kernel/kernel.cc +++ b/kernel/kernel/kernel.cc @@ -40,7 +40,7 @@ kernel_main(uint32_t magic, multiboot_info_t *multiboot_info) } GDT::load(); - memory_map_load(multiboot_info); + MemoryMap::load(multiboot_info); PhysicalMM::init(); VirtualMM::init(); diff --git a/kernel/kernel/stack_smashing_protector.c b/kernel/kernel/stack_smashing_protector.c index a00e392..f9c83b2 100644 --- a/kernel/kernel/stack_smashing_protector.c +++ b/kernel/kernel/stack_smashing_protector.c @@ -16,11 +16,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <stdint.h> - -#include <libk/stdio.h> - #include <kernel/halt.h> +#include <libk/stdio.h> +#include <stdint.h> /* TODO: Randomize */ #define STACK_CHK_GUARD 0xe2dee396 diff --git a/kernel/libk/strlen.c b/kernel/libk/strlen.cc index 69e499f..69e499f 100644 --- a/kernel/libk/strlen.c +++ b/kernel/libk/strlen.cc diff --git a/kernel/mm/memory_map.c b/kernel/mm/memory_map.cc index d7af229..0d224ac 100644 --- a/kernel/mm/memory_map.c +++ b/kernel/mm/memory_map.cc @@ -16,20 +16,20 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <stdint.h> - #include <common.h> - #include <kernel/halt.h> #include <libk/stdio.h> - #include <mm/memory_map.h> #include <mm/multiboot.h> +#include <stdint.h> + +namespace MemoryMap +{ static free_memory_regions_t free_memory_regions = { 0 }; ALWAYS_INLINE static char * -memory_map_fetch_type(multiboot_memory_map_t *mmap) +fetch_type(multiboot_memory_map_t *mmap) { switch (mmap->type) { case MULTIBOOT_MEMORY_AVAILABLE: @@ -48,7 +48,7 @@ memory_map_fetch_type(multiboot_memory_map_t *mmap) } void -memory_map_load(multiboot_info_t *multiboot_info) +load(multiboot_info_t *multiboot_info) { printk("mm", "Loading Memory Map:"); @@ -86,15 +86,17 @@ memory_map_load(multiboot_info_t *multiboot_info) "start: 0x%.08x | length: 0x%.08x | type: %s", mmap->addr_low, mmap->len_low, - memory_map_fetch_type(mmap)); + fetch_type(mmap)); } printk("mm", "Total Memory: %lu MiB", total_mem / MiB); printk("mm", "Total Available Memory: %lu MiB", total_available_mem / MiB); } -ALWAYS_INLINE free_memory_regions_t * -memory_map_get_free_regions(void) +free_memory_regions_t * +get_free_regions(void) { return &free_memory_regions; } + +} diff --git a/kernel/mm/physical_mm/physical_mm.cc b/kernel/mm/physical_mm/physical_mm.cc index ae4c62b..cc70ea6 100644 --- a/kernel/mm/physical_mm/physical_mm.cc +++ b/kernel/mm/physical_mm/physical_mm.cc @@ -93,7 +93,7 @@ deinitialize_region(uint32_t start, uint32_t length) void init(void) { - free_memory_regions_t *free_memory_regions = memory_map_get_free_regions(); + free_memory_regions_t *free_memory_regions = MemoryMap::get_free_regions(); log_memory_map(free_memory_regions); Spinlock::acquire(&memory_map_lock); |