Merge pull request #1640 from fwsGonzo/dev

Various fixes to x86 platform

Author: fwsGonzo

lib/uplink/ws_uplink.cpp

@@ -393,6 +393,9 @@ namespace uplink {
     writer.Key("arch");
     writer.String(OS::arch());
 
+    writer.Key("physical_ram");
+    writer.Uint64(sysinfo.physical_memory);
+
     // CPU Features
     auto features = CPUID::detect_features_str();
     writer.Key("cpu_features");

src/arch/x86_64/arch_start.asm

@@ -25,7 +25,7 @@ extern __multiboot_addr
 %define P2_TAB             0x3000  ;; - 0x7fff
 %define NUM_P3_ENTRIES     5
 %define NUM_P2_ENTRIES     2560
-%define STACK_LOCATION     0x9F7F0
+%define STACK_LOCATION     0x9D3F0
 
 [BITS 32]
 __arch_start:

src/platform/x86_pc/os.cpp

@@ -127,11 +127,11 @@ void OS::start(uint32_t boot_magic, uint32_t boot_addr)
   memmap.assign_range({0x8000, 0xffff, "Statman", "Statistics"});
 #if defined(ARCH_x86_64)
   memmap.assign_range({0x1000, 0x6fff, "Pagetables", "System page tables"});
-  memmap.assign_range({0x10000, 0x9f7ff, "Stack", "System main stack"});
+  memmap.assign_range({0x10000, 0x9d3ff, "Stack", "System main stack"});
 #elif defined(ARCH_i686)
-  memmap.assign_range({0x10000, 0x9f7ff, "Stack", "System main stack"});
+  memmap.assign_range({0x10000, 0x9d3ff, "Stack", "System main stack"});
 #endif
-  //memmap.assign_range({0x9f800, 0x9ffff, "Multiboot", "Multiboot reserved area"});
+  //memmap.assign_range({0x9d400, 0x9ffff, "Multiboot", "Multiboot reserved area"});
   memmap.assign_range({(uintptr_t)&_LOAD_START_, (uintptr_t)&_end - 1,
         "ELF", "Your service binary including OS"});
 

src/platform/x86_pc/platform.cpp

@@ -86,7 +86,7 @@ void __platform_init()
   initialize_gdt_for_cpu(APIC::get().get_id());
 #ifdef ARCH_x86_64
   // setup Interrupt Stack Table
-  x86::ist_initialize_for_cpu(0, 0xA00000);
+  x86::ist_initialize_for_cpu(0, 0x9D3F0);
 #endif
 
   // IDT manager: Interrupt and exception handlers

src/platform/x86_pc/smbios.cpp

@@ -20,6 +20,7 @@
 #include <cstring>
 #include <cstdio>
 #include <info>
+#include <kernel/os.hpp>
 
 namespace x86
 {
@@ -148,6 +149,11 @@ namespace x86
       hdr = hdr->next();
       if (hdr->type == 0) break;
     }
+
+    // salvage operation for when no memory array found
+    if (sysinfo.physical_memory == 0) {
+      sysinfo.physical_memory = OS::memory_end()+1;
+    }
   }
 
   static uint8_t checksum(const char* addr, int length)

src/platform/x86_pc/start.asm

@@ -28,8 +28,8 @@ global __avx_enabled
 %define  MB_FLAGS   0x3  ;; ALIGN + MEMINFO
 
 ;; stack base address at EBDA border
-;; NOTE: Multiboot can use 9f800 to 9ffff
-%define  STACK_LOCATION     0x9F7F0
+;; NOTE: Multiboot can use 9d400 to 9ffff
+%define  STACK_LOCATION     0x9D3F0
 
 extern _MULTIBOOT_START_
 extern _LOAD_START_