Merge pull request #1479 from fwsGonzo/dev

Fix initialization problems with high BSS value

Author: alfreb

api/kernel/os.hpp

@@ -59,7 +59,7 @@ class OS {
    *  other mechanisms. The first argument is always
    *  the binary name.
   **/
-  static const std::string& cmdline_args() noexcept;
+  static const char* cmdline_args() noexcept;
 
   /** Clock cycles since boot. */
   static uint64_t cycles_since_boot() {
@@ -257,18 +257,15 @@ class OS {
   static bool boot_sequence_passed_;
   static MHz cpu_mhz_;
 
-  // XXX: Only used by solo5
   static RTC::timestamp_t booted_at_;
   static uintptr_t liveupdate_loc_;
   static std::string version_str_;
   static std::string arch_str_;
   static Plugin_vec plugins_;
-  static uintptr_t low_memory_size_;
-  static uintptr_t high_memory_size_;
   static uintptr_t memory_end_;
   static uintptr_t heap_max_;
   static const uintptr_t elf_binary_size_;
-  static std::string cmdline;
+  static const char* cmdline;
 
   // Prohibit copy and move operations
   OS(OS&)  = delete;

api/kernel/service.hpp

@@ -6,9 +6,9 @@
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,12 +30,12 @@ class Service {
   /**
    *  @return: The (descriptive) name of the service
    */
-  static std::string name();
+  static const char* name();
 
   /**
    *  @return: The name of the service binary
    */
-  static std::string binary_name();
+  static const char* binary_name();
 
 
   /**

cmake/post.service.cmake

@@ -377,25 +377,22 @@ endif()
 
 # all the OS and C/C++ libraries + crt end
 target_link_libraries(service
-  libplatform
-  libarch
   libos
   libbotan
   libosdeps
-  cxxabi
-  libc
-  libcxx
-  libm
-  libg
-  libgcc
 
   libplatform
   libarch
   libos
-  libbotan
-  libosdeps
+
+  libplatform
+  libarch
+  libos
+  libplatform
+
   cxxabi
   libc
+  libos
   libcxx
   libm
   libg

src/CMakeLists.txt

@@ -22,10 +22,10 @@ include_directories(${BOTAN_DIR})
 
 # TODO: i wanted to use a glob, but then found out that not everything is included
 set(OS_OBJECTS
-  kernel/kernel_start.cpp kernel/multiboot.cpp
+  kernel/multiboot.cpp
   kernel/syscalls.cpp kernel/os.cpp kernel/cpuid.cpp
   kernel/events.cpp kernel/memmap.cpp kernel/pci_manager.cpp
-  kernel/heap.cpp kernel/service_stub.cpp kernel/main_call.cpp
+  kernel/heap.cpp kernel/service_stub.cpp
   kernel/elf.cpp kernel/terminal.cpp kernel/terminal_disk.cpp
   kernel/vga.cpp kernel/context.cpp kernel/context_asm.asm
   kernel/fiber.cpp kernel/tls.cpp

src/crt/c_abi.c

@@ -46,20 +46,20 @@ void _init_bss()
 {
   /// Initialize .bss section
   extern char _BSS_START_, _BSS_END_;
-  streamset8(&_BSS_START_, 0, &_BSS_END_ - &_BSS_START_);
+  __builtin_memset(&_BSS_START_, 0, &_BSS_END_ - &_BSS_START_);
 }
 
 void _init_heap(uintptr_t free_mem_begin)
 {
   // NOTE: Initialize the heap before exceptions
   // cache-align heap, because its not aligned
   heap_begin = (void*) free_mem_begin + HEAP_ALIGNMENT;
-  heap_begin = (void*) ((size_t)heap_begin & ~HEAP_ALIGNMENT);
+  heap_begin = (void*) ((uintptr_t)heap_begin & ~HEAP_ALIGNMENT);
   // heap end tracking, used with sbrk
   heap_end   = heap_begin;
 }
 
-uintptr_t _move_symbols(void* sym_loc)
+uint32_t _move_symbols(void* sym_loc)
 {
   extern char _ELF_SYM_START_;
   /// read out size of symbols **before** moving them
@@ -74,7 +74,7 @@ uintptr_t _move_symbols(void* sym_loc)
   return elfsym_size;
 }
 
-void _crt_sanity_checks()
+static void crt_sanity_checks()
 {
   // validate that heap is aligned
   int validate_heap_alignment =
@@ -105,7 +105,7 @@ void _init_c_runtime()
   extern void _init_elf_parser();
   _init_elf_parser();
 
-  _crt_sanity_checks();
+  crt_sanity_checks();
 }
 
 // stack-protector

src/kernel/main_call.cpp

@@ -100,9 +100,7 @@ void OS::multiboot(uint32_t boot_addr)
     uint32_t mem_high_end = mem_high_start + (bootinfo_->mem_upper * 1024) - 1;
     uint32_t mem_high_kb = bootinfo_->mem_upper;
 
-    OS::low_memory_size_ = mem_low_kb * 1024;
-    OS::high_memory_size_ = mem_high_kb * 1024;
-    OS::memory_end_ = high_memory_size_ + mem_high_start;
+    OS::memory_end_ = mem_high_end;
 
     INFO2("* Valid memory (%i Kib):", mem_low_kb + mem_high_kb);
     INFO2("\t 0x%08x - 0x%08x (%i Kib)",
@@ -118,7 +116,7 @@ void OS::multiboot(uint32_t boot_addr)
   if (bootinfo_->flags & MULTIBOOT_INFO_CMDLINE) {
     INFO2("* Booted with parameters @ 0x%x: %s", bootinfo_->cmdline,
           reinterpret_cast<const char*>(bootinfo_->cmdline));
-    cmdline = reinterpret_cast<const char*>(bootinfo_->cmdline);
+    OS::cmdline = reinterpret_cast<const char*>(bootinfo_->cmdline);
   }
 
   if (bootinfo_->flags & MULTIBOOT_INFO_MEM_MAP) {

src/kernel/multiboot.cpp

@@ -18,16 +18,12 @@
 //#define DEBUG
 #define MYINFO(X,...) INFO("Kernel", X, ##__VA_ARGS__)
 
-#include <cstdio>
-#include <boot/multiboot.h>
-#include <hw/cmos.hpp>
 #include <kernel/os.hpp>
 #include <kernel/rng.hpp>
-#include <kernel/cpuid.hpp>
 #include <util/fixedvec.hpp>
 #include <kprint>
 #include <service>
-#include <statman>
+#include <cstdio>
 #include <cinttypes>
 
 //#define ENABLE_PROFILERS
@@ -53,12 +49,9 @@ bool  OS::power_   = true;
 bool  OS::boot_sequence_passed_ = false;
 MHz   OS::cpu_mhz_ {-1};
 uintptr_t OS::liveupdate_loc_   = 0;
-uintptr_t OS::low_memory_size_  = 0;
-uintptr_t OS::high_memory_size_ = 0;
 uintptr_t OS::memory_end_ = 0;
-uintptr_t OS::heap_max_ {0xfffffff};
+uintptr_t OS::heap_max_ = (uintptr_t) -1;
 const uintptr_t OS::elf_binary_size_ {(uintptr_t)&_ELF_END_ - (uintptr_t)&_ELF_START_};
-std::string OS::cmdline{Service::binary_name()};
 
 // stdout redirection
 using Print_vec = fixedvector<OS::print_func, 8>;
@@ -79,8 +72,8 @@ void* OS::liveupdate_storage_area() noexcept
   return (void*) OS::liveupdate_loc_;
 }
 
-const std::string& OS::cmdline_args() noexcept
-{
+const char* OS::cmdline = nullptr;
+const char* OS::cmdline_args() noexcept {
   return cmdline;
 }
 
@@ -141,7 +134,7 @@ void OS::post_start()
   printf(" IncludeOS %s (%s / %i-bit)\n",
          version().c_str(), arch().c_str(),
          static_cast<int>(sizeof(uintptr_t)) * 8);
-  printf(" +--> Running [ %s ]\n", Service::name().c_str());
+  printf(" +--> Running [ %s ]\n", Service::name());
   FILLINE('~');
 
   Service::start();
@@ -151,11 +144,6 @@ void OS::add_stdout(OS::print_func func)
 {
   os_print_handlers.add(func);
 }
-__attribute__ ((weak))
-void default_stdout_handlers()
-{
-  OS::add_stdout(&OS::default_stdout);
-}
 __attribute__((weak))
 bool os_enable_boot_logging = false;
 void OS::print(const char* str, const size_t len)
@@ -165,49 +153,3 @@ void OS::print(const char* str, const size_t len)
       callback(str, len);
   }
 }
-
-void OS::legacy_boot() {
-  // Fetch CMOS memory info (unfortunately this is maximally 10^16 kb)
-  auto mem = hw::CMOS::meminfo();
-  if (low_memory_size_ == 0) {
-    low_memory_size_ = mem.base.total * 1024;
-    INFO2("* Low memory: %i Kib", mem.base.total);
-  }
-  if (high_memory_size_ == 0) {
-    high_memory_size_ = mem.extended.total * 1024;
-    INFO2("* High memory (from cmos): %i Kib", mem.extended.total);
-  }
-
-  auto& memmap = memory_map();
-
-  // No guarantees without multiboot, but we assume standard memory layout
-  memmap.assign_range({0x0009FC00, 0x0009FFFF,
-        "EBDA", "Extended BIOS data area"});
-  memmap.assign_range({0x000A0000, 0x000FFFFF,
-        "VGA/ROM", "Memory mapped video memory"});
-
-  // @note : since the maximum size of a span is unsigned (ptrdiff_t) we may need more than one
-  uintptr_t addr_max = std::numeric_limits<std::size_t>::max();
-  uintptr_t span_max = std::numeric_limits<std::ptrdiff_t>::max();
-
-  uintptr_t unavail_start = 0x100000 + high_memory_size_;
-  size_t interval = std::min(span_max, addr_max - unavail_start) - 1;
-  uintptr_t unavail_end = unavail_start + interval;
-
-  while (unavail_end < addr_max){
-    INFO2("* Unavailable memory: 0x%" PRIxPTR" - 0x%" PRIxPTR, unavail_start, unavail_end);
-    memmap.assign_range({unavail_start, unavail_end,
-          "N/A", "Reserved / outside physical range" });
-    unavail_start = unavail_end + 1;
-    interval = std::min(span_max, addr_max - unavail_start);
-    // Increment might wrapped around
-    if (unavail_start > unavail_end + interval or unavail_start + interval == addr_max){
-      INFO2("* Last chunk of memory: 0x%" PRIxPTR" - 0x%" PRIxPTR, unavail_start, addr_max);
-      memmap.assign_range({unavail_start, addr_max,
-            "N/A", "Reserved / outside physical range" });
-      break;
-    }
-
-    unavail_end += interval;
-  }
-}