Fix Issues

maxtyson123 · Oct 13, 2024 · cf5e160 · cf5e160
1 parent 15c9e47
commit cf5e160
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/kernel/include/memory/memorymanagement.h b/kernel/include/memory/memorymanagement.h
@@ -44,7 +44,6 @@ namespace MaxOS{
 
           public:
               static MemoryManager* s_active_memory_manager;
-              static const uint64_t s_higher_half_offset { 0xFFFFFFFF80000000 };
 
               static const uint64_t s_higher_half_kernel_offset {  0xFFFFFFFF80000000 };
               static const uint64_t s_higher_half_mem_offset    {  0xFFFF800000000000 };

diff --git a/kernel/src/kernel.cpp b/kernel/src/kernel.cpp
@@ -110,9 +110,6 @@ extern volatile uint64_t p4_table[512];
 extern "C" void kernelMain(unsigned long addr, unsigned long magic)
 {
 
-    // Make the multiboot header
-    Multiboot multiboot(addr);
-
     // Initialise the serial console
     SerialConsole serialConsole;
 
@@ -132,10 +129,8 @@ extern "C" void kernelMain(unsigned long addr, unsigned long magic)
     _kprintf("-= Virtual Memory Manager set up =-\n");
 
 
+    // Initialise the memory manager
     MemoryManager memoryManager(&vmm);
-    void* test = memoryManager.malloc(100);
-    memoryManager.free(test);
-
     _kprintf("-= Memory Manager set up =-\n");
 
     // Now entered the gui space

diff --git a/kernel/src/memory/memorymanagement.cpp b/kernel/src/memory/memorymanagement.cpp
@@ -191,8 +191,6 @@ int MemoryManager::memory_used() {
 
         return result;
 }
-uint64_t MemoryManager::map_to_higher_half(uint64_t physical_address) {
-
 
 /**
  * @brief Aligns the size to the chunk alignment

diff --git a/toolchain/make_cross_compiler.sh b/toolchain/make_cross_compiler.sh
@@ -5,7 +5,7 @@ source ./MaxOS.sh
 if [ "$1" != "--no-deps" ]; then
     msg "Installing extra dependencies"
     sudo apt update
-    sudo apt install -y build-essential bison flex libgmp3-dev libmpc-dev libmpfr-dev texinfo libisl-dev cmake nasm
+    sudo apt install -y build-essential bison flex libgmp3-dev libmpc-dev libmpfr-dev texinfo libisl-dev cmake nasm telnet
 fi
 
 # Make A Directory For The Cross Compiler