Merge branch 'dev' of github.com:hioa-cs/IncludeOS into dev

Author: AnnikaH

api/kernel/os.hpp

@@ -26,6 +26,7 @@
 #include <string>
 #include <sstream>
 #include <vector>
+#include <boot/multiboot.h>
 
 /**
  *  The entrypoint for OS services
@@ -36,15 +37,16 @@ class OS {
 public:
   using print_func  = delegate<void(const char*, size_t)>;
   using Plugin = delegate<void()>;
+  using Span_mods = gsl::span<multiboot_module_t>;
 
   /**
-   * Returns the version of the OS from when 
+   * Returns the version of the OS from when
    * the service was built.
   **/
   static const std::string& version() noexcept
   { return version_field; }
 
-  /** 
+  /**
    *  Returns the commandline arguments provided,
    *  if any, to the VM passed on by multiboot or
    *  other mechanisms. The first argument is always
@@ -113,7 +115,7 @@ class OS {
    * The on_panic handler will be called directly after a panic,
    * or any condition which will deliberately cause the OS to become
    * unresponsive. After the handler is called, the OS goes to sleep.
-   * This handler can thus be used to, for example, automatically 
+   * This handler can thus be used to, for example, automatically
    * have the OS restart on any crash.
   **/
   typedef void (*on_panic_func) ();
@@ -204,6 +206,22 @@ class OS {
   /** Start the OS.  @todo Should be `init()` - and not accessible from ABI */
   static void start(uint32_t boot_magic, uint32_t boot_addr);
 
+  /** Get "kernel modules", provided by multiboot */
+  static Span_mods modules() {
+
+    if (bootinfo_ and bootinfo_->flags & MULTIBOOT_INFO_MODS) {
+
+      Expects(bootinfo_->mods_count < std::numeric_limits<int>::max());
+
+      return Span_mods{
+        reinterpret_cast<multiboot_module_t*>(bootinfo_->mods_addr),
+          static_cast<int>(bootinfo_->mods_count) };
+
+    }
+
+    return nullptr;
+  }
+
 private:
 
   /** Process multiboot info. Called by 'start' if multibooted **/
@@ -216,15 +234,6 @@ class OS {
   static bool is_softreset_magic(uint32_t value);
   static void resume_softreset(intptr_t boot_addr);
 
-  static constexpr int PAGE_SHIFT = 12;
-
-  static bool power_;
-  static bool boot_sequence_passed_;
-
-  static MHz cpu_mhz_;
-
-  static std::string version_field;
-
   struct Plugin_struct {
     Plugin_struct(Plugin f, const char* n)
       : func_{f}, name_{n}
@@ -234,13 +243,19 @@ class OS {
     const char* name_;
   };
 
+  static constexpr int PAGE_SHIFT = 12;
+  static bool power_;
+  static bool boot_sequence_passed_;
+  static MHz cpu_mhz_;
+  static std::string version_field;
   static std::vector<Plugin_struct> 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 multiboot_info_t* bootinfo_;
+  static std::string cmdline;
 
   // Prohibit copy and move operations
   OS(OS&)  = delete;

api/net/tcp/tcp.hpp

@@ -537,6 +537,21 @@ namespace net {
      */
     void transmit(tcp::Packet_ptr);
 
+    /**
+     * @brief      Creates an outgoing TCP packet.
+     *
+     * @return     A tcp packet ptr
+     */
+    tcp::Packet_ptr create_outgoing_packet();
+
+    /**
+     * @brief      Sends a TCP reset based on the values of the incoming packet.
+     *             Used when packet are addressed to closed ports or already dead connections.
+     *
+     * @param[in]  incoming  The incoming tcp packet "to reset".
+     */
+    void send_reset(const tcp::Packet& incoming);
+
     /**
      * @brief      Generate a unique initial sequence number (ISS).
      *

api/posix/ctype.h

@@ -15,6 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Trick to prevent libc++ from using old newlib locale stubs
+#define _LIBCPP_SUPPORT_NEWLIB_XLOCALE_H
+
+
 #ifndef SYS_CTYPE_H
 #define SYS_CTYPE_H
 
@@ -40,5 +44,4 @@ extern "C" {
 
 #endif //SYS_CTYPE_H
 
-
 #include_next <ctype.h>

api/posix/features.h

@@ -27,6 +27,11 @@
 #define _POSIX_TIMERS 1
 #define _POSIX_MONOTONIC_CLOCK 1
 
+// Enable newlib multibyte support
+#define _MB_CAPABLE 1
+
+
+
 // Required to pass CMake tests for libc++
 #define __GLIBC_PREREQ__(min, maj) 1
 #define __GLIBC_PREREQ(min, maj) 1

vmbuild/elf.h api/util/elf.hvmbuild/elf.h renamed to api/util/elf.h

@@ -17,8 +17,8 @@ else(BUNDLE_LOC)
 	include(ExternalProject)
 	ExternalProject_Add(PrecompiledLibraries
 			    PREFIX precompiled
-			    URL https://github.com/hioa-cs/IncludeOS/releases/download/v0.9.0/IncludeOS_install_v0-9-0.tar.gz
-			    URL_HASH SHA1=8f7dfa92d38814c0c4f3e83adacfbd741a617622
+			    URL https://github.com/hioa-cs/IncludeOS/releases/download/v0.10.1-bundle/IncludeOS_dependencies_v0-10-1-bundle.tar.gz
+			    URL_HASH SHA1=8b298ea394b304c03f59d4a2fa3db711ae7d5161
 			    CONFIGURE_COMMAND ""
 			    BUILD_COMMAND ""
 			    UPDATE_COMMAND ""
@@ -32,8 +32,12 @@ set(PRECOMPILED_DIR ${CMAKE_CURRENT_BINARY_DIR}/precompiled/src/PrecompiledLibra
 set(LIBCXX_INCLUDE_DIR ${PRECOMPILED_DIR}libcxx/include/)
 set(LIBCXX_LIB_DIR ${PRECOMPILED_DIR}/libcxx/)
 add_library(libcxx STATIC IMPORTED)
+add_library(libcxxabi STATIC IMPORTED)
+
 add_dependencies(libcxx PrecompiledLibraries)
+add_dependencies(libcxxabi PrecompiledLibraries)
 set_target_properties(libcxx PROPERTIES IMPORTED_LOCATION ${LIBCXX_LIB_DIR}/libc++.a)
+set_target_properties(libcxxabi PROPERTIES IMPORTED_LOCATION ${LIBCXX_LIB_DIR}/libc++abi.a)
 
 set(NEWLIB_INCLUDE_DIR ${PRECOMPILED_DIR}/newlib/include/)
 set(NEWLIB_LIB_DIR ${PRECOMPILED_DIR}/newlib/)
@@ -62,4 +66,4 @@ install(DIRECTORY ${NEWLIB_INCLUDE_DIR} DESTINATION includeos/include/newlib)
 
 install(FILES ${CRTEND} ${CRTBEGIN} DESTINATION includeos/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 DESTINATION includeos/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/lib)

vmbuild/elf_binary.hpp api/util/elf_binary.hppvmbuild/elf_binary.hpp renamed to api/util/elf_binary.hpp

@@ -1,27 +1,41 @@
+#! /bin/bash
+. $INCLUDEOS_SRC/etc/set_traps.sh
+
+# Download, configure and build binutils
+
 pushd $BUILD_DIR
 
+# Downloading
 if [ ! -f binutils-$binutils_version.tar.gz ]; then
     echo -e "\n\n >>> Getting binutils into `pwd` \n"
     wget -c --trust-server-name ftp://ftp.gnu.org/gnu/binutils/binutils-$binutils_version.tar.gz
 fi
 
-
+# Extracting
 if [ ! -d binutils-$binutils_version ]; then
     echo -e "\n\n >>> Extracting binutils \n"
     tar -xf binutils-$binutils_version.tar.gz
+	rm -rf build_binutils	# If a new version has been downloaded it will be built
 else
     echo -e "\n\n >>> SKIP: Extracting binutils  \n"
 fi
 
+# Configuring
 if [ ! -d build_binutils ]; then
     echo -e "\n\n >>> Configuring binutils \n"
     mkdir -p build_binutils
     cd build_binutils
-    ../binutils-$binutils_version/configure --target=$TARGET --prefix="$PREFIX" --disable-nls --disable-werror
+    ../binutils-$binutils_version/configure \
+		--target=$TARGET \
+	   	--prefix="$TEMP_INSTALL_DIR" \
+	   	--disable-nls \
+	   	--disable-werror
 
+# Compiling
     echo -e "\n\n >>> Building binutils \n" 
     make $num_jobs
 
+# Installing
     echo -e "\n\n >>> Installing binutils \n"    
     make install
 
@@ -30,3 +44,5 @@ else
 fi
 
 popd
+
+trap - EXIT

cmake/cross_compiled_libraries.txt

@@ -1,20 +1,20 @@
-# Bash utils
+#!/bin/bash
 . $INCLUDEOS_SRC/etc/set_traps.sh
 
-mkdir -p $BUILD_DIR
-cd $BUILD_DIR
+# Download, configure, compile and install gcc
 
-GCC_LOC=ftp://ftp.nluug.nl/mirror/languages/gcc/releases/
+pushd $BUILD_DIR
 
+# Download
 if [ ! -f gcc-$gcc_version.tar.gz ]; then
     echo -e "\n\n >>> Getting GCC \n"
+	GCC_LOC=ftp://ftp.nluug.nl/mirror/languages/gcc/releases/
     wget -c --trust-server-name $GCC_LOC/gcc-$gcc_version/gcc-$gcc_version.tar.gz
 fi
 
 # UNPACK GCC
 if [ ! -d gcc-$gcc_version ]; then
     echo -e "\n\n >>> Unpacking GCC source \n"
-    cd $BUILD_DIR
     tar -xf gcc-$gcc_version.tar.gz
 
     # GET GCC PREREQS 
@@ -26,18 +26,23 @@ else
     echo -e "\n\n >>> SKIP: Unpacking GCC + getting prerequisites Seems to be there \n"
 fi
 
-cd $BUILD_DIR
-
-
 mkdir -p build_gcc
-cd build_gcc
+pushd build_gcc
 
+# Configure
 echo -e "\n\n >>> Configuring GCC \n"
-../gcc-$gcc_version/configure --target=$TARGET --prefix="$PREFIX" --disable-nls --enable-languages=c,c++ --without-headers
-
+../gcc-$gcc_version/configure \
+	--target=$TARGET \
+	--prefix="$TEMP_INSTALL_DIR" \
+	--disable-nls \
+	--enable-languages=c,c++ \
+   	--without-headers
+
+# Compile
 echo -e "\n\n >>> Building GCC \n"
 make all-gcc $num_jobs
 
+# Install
 echo -e "\n\n >>> Installing GCC (Might require sudo) \n"
 make install-gcc
 
@@ -47,5 +52,6 @@ make all-target-libgcc $num_jobs
 echo -e "\n\n >>> Installing libgcc (Might require sudo) \n"
 make install-target-libgcc
 
-
+popd	# build_gcc
+popd	# BUILD_DIR
 trap - EXIT