Merge branch 'dev' of github.com:fwsGonzo/IncludeOS into dev

Author: fwsGonzo

cmake/cross_compiled_libraries.txt

@@ -32,37 +32,39 @@ if (WITH_SOLO5)
 ExternalProject_Add(solo5_repo
 	PREFIX precompiled
 	BUILD_IN_SOURCE 1
-	GIT_REPOSITORY https://github.com/ricarkol/solo5.git
-	GIT_TAG includeos64
-	CONFIGURE_COMMAND ./configure.sh
+	GIT_REPOSITORY https://github.com/solo5/solo5.git
+	GIT_TAG f8a277f83807333685742228ffef0d87270207cf
+	CONFIGURE_COMMAND CC=gcc ./configure.sh
 	UPDATE_COMMAND ""
-	BUILD_COMMAND make build
+	BUILD_COMMAND make
 	INSTALL_COMMAND ""
 )
 
 set(SOLO5_REPO_DIR ${CMAKE_CURRENT_BINARY_DIR}/precompiled/src/solo5_repo)
-set(SOLO5_INCLUDE_DIR ${SOLO5_REPO_DIR}/build/include/)
-set(SOLO5_LIB_DIR ${SOLO5_REPO_DIR}/build/${ARCH})
+set(SOLO5_INCLUDE_DIR ${SOLO5_REPO_DIR}/kernel)
 
 # solo5 in ukvm mode (let's call it "solo5")
 add_library(solo5 STATIC IMPORTED)
-set_target_properties(solo5 PROPERTIES IMPORTED_LOCATION ${SOLO5_LIB_DIR}/ukvm/solo5.o)
+set_target_properties(solo5 PROPERTIES IMPORTED_LOCATION ${SOLO5_REPO_DIR}/kernel/ukvm/solo5.o)
 
 # ukvm-bin
 add_library(ukvm-bin STATIC IMPORTED)
-set_target_properties(solo5 PROPERTIES IMPORTED_LOCATION ${SOLO5_LIB_DIR}/ukvm/ukvm-bin)
+set_target_properties(solo5 PROPERTIES IMPORTED_LOCATION ${SOLO5_REPO_DIR}/ukvm/ukvm-bin)
 
 add_dependencies(solo5 solo5_repo)
 add_dependencies(ukvm-bin solo5_repo)
 
 # Some OS components depend on solo5 (for solo5.h for example)
 add_dependencies(PrecompiledLibraries solo5)
+add_dependencies(PrecompiledLibraries ukvm-bin)
 
 # Only x86_64 supported at the moment
 if ("${ARCH}" STREQUAL "x86_64")
-  install(FILES ${SOLO5_LIB_DIR}/ukvm/solo5.o ${SOLO5_LIB_DIR}/ukvm/ukvm-bin DESTINATION includeos/${ARCH}/lib)
+  install(FILES ${SOLO5_REPO_DIR}/kernel/ukvm/solo5.o ${SOLO5_REPO_DIR}/ukvm/ukvm-bin DESTINATION includeos/${ARCH}/lib)
 endif()
 
+install(FILES ${SOLO5_INCLUDE_DIR}/solo5.h DESTINATION includeos/${ARCH}/include)
+
 endif (WITH_SOLO5)
 
 set(PRECOMPILED_DIR ${CMAKE_CURRENT_BINARY_DIR}/precompiled/src/PrecompiledLibraries/${ARCH})
@@ -99,8 +101,6 @@ install(DIRECTORY ${LIBCXX_INCLUDE_DIR} DESTINATION includeos/${ARCH}/include/li
 
 install(DIRECTORY ${NEWLIB_INCLUDE_DIR} DESTINATION includeos/${ARCH}/include/newlib)
 
-install(DIRECTORY ${SOLO5_INCLUDE_DIR} DESTINATION includeos/${ARCH}/include/solo5)
-
 install(FILES ${CRTEND} ${CRTBEGIN} DESTINATION includeos/${ARCH}/lib)
 
 install(FILES ${NEWLIB_LIB_DIR}/libc.a ${NEWLIB_LIB_DIR}/libg.a ${NEWLIB_LIB_DIR}/libm.a ${LIBGCC_LIB_DIR}/libgcc.a ${LIBCXX_LIB_DIR}/libc++.a ${LIBCXX_LIB_DIR}/libc++abi.a DESTINATION includeos/${ARCH}/lib)

src/platform/x86_pc/os.cpp

@@ -104,8 +104,7 @@ void OS::start(uint32_t boot_magic, uint32_t boot_addr)
   // Print a fancy header
   CAPTION("#include<os> // Literally");
 
-  void* esp = get_cpu_esp();
-  MYINFO("Stack: %p", esp);
+  MYINFO("Stack: %p", get_cpu_esp());
   MYINFO("Boot magic: 0x%x, addr: 0x%x", boot_magic, boot_addr);
 
   /// STATMAN ///
@@ -130,7 +129,7 @@ void OS::start(uint32_t boot_magic, uint32_t boot_addr)
 
     OS::legacy_boot();
   }
-  Expects(OS::memory_end_ != 0);
+  assert(OS::memory_end_ != 0);
   // Give the rest of physical memory to heap
   OS::heap_max_ = OS::memory_end_;
 
@@ -149,13 +148,13 @@ void OS::start(uint32_t boot_magic, uint32_t boot_addr)
   memmap.assign_range({(uintptr_t)&_LOAD_START_, (uintptr_t)&_end - 1,
         "ELF", "Your service binary including OS"});
 
-  Expects(::heap_begin and heap_max_);
+  assert(::heap_begin != 0x0 and OS::heap_max_ != 0x0);
   // @note for security we don't want to expose this
   memmap.assign_range({(uintptr_t)&_end, ::heap_begin - 1,
         "Pre-heap", "Heap randomization area"});
 
   uintptr_t span_max = std::numeric_limits<std::ptrdiff_t>::max();
-  uintptr_t heap_range_max_ = std::min(span_max, heap_max_);
+  uintptr_t heap_range_max_ = std::min(span_max, OS::heap_max_-1);
 
   MYINFO("Assigning heap");
   memmap.assign_range({::heap_begin, heap_range_max_,
@@ -196,14 +195,17 @@ void OS::legacy_boot()
 {
   // Fetch CMOS memory info (unfortunately this is maximally 10^16 kb)
   auto mem = hw::CMOS::meminfo();
-  //uintptr_t low_memory_size = mem.base.total * 1024;
-  INFO2("* Low memory: %i Kib", mem.base.total);
-
-  uintptr_t high_memory_size = mem.extended.total * 1024;
-  INFO2("* High memory (from cmos): %i Kib", mem.extended.total);
+  if (OS::memory_end_ == 0)
+  {
+    //uintptr_t low_memory_size = mem.base.total * 1024;
+    INFO2("* Low memory: %i Kib", mem.base.total);
+
+    uintptr_t high_memory_size = mem.extended.total * 1024;
+    INFO2("* High memory (from cmos): %i Kib", mem.extended.total);
+    OS::memory_end_ = 0x100000 + high_memory_size;
+  }
 
   auto& memmap = memory_map();
-
   // No guarantees without multiboot, but we assume standard memory layout
   memmap.assign_range({0x0009FC00, 0x0009FFFF,
         "EBDA", "Extended BIOS data area"});
@@ -214,11 +216,12 @@ void OS::legacy_boot()
   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;
+  uintptr_t unavail_start = OS::memory_end_;
   size_t interval = std::min(span_max, addr_max - unavail_start) - 1;
   uintptr_t unavail_end = unavail_start + interval;
 
-  while (unavail_end < addr_max){
+  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" });