Merge pull request #1277 from fwsGonzo/dev

More fixes and g++ compatibility

Author: fwsGonzo

api/net/ethernet/header.hpp

@@ -14,8 +14,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#pragma once
 
+#pragma once
 #ifndef NET_ETHERNET_HEADER_HPP
 #define NET_ETHERNET_HEADER_HPP
 
@@ -40,7 +40,7 @@ class Header {
   const MAC::Addr& src() const noexcept
   { return src_; }
 
-  const Ethertype& type() const noexcept
+  Ethertype type() const noexcept
   { return type_; }
 
   void set_dest(const MAC::Addr& dest)

api/net/ip4/icmp4_common.hpp

@@ -95,6 +95,8 @@ namespace net {
           return "TIMESTAMP REPLY (14)";
         case Type::NO_REPLY:
           return "NO REPLY";
+        default:
+          return "UNKNOWN";
       };
     }();
   }

etc/service.cmake

@@ -190,12 +190,6 @@ set_target_properties(crti PROPERTIES IMPORTED_LOCATION $ENV{INCLUDEOS_PREFIX}/i
 
 target_link_libraries(service --whole-archive crti --no-whole-archive)
 
-add_library(multiboot STATIC IMPORTED)
-set_target_properties(multiboot PROPERTIES LINKER_LANGUAGE CXX)
-set_target_properties(multiboot PROPERTIES IMPORTED_LOCATION $ENV{INCLUDEOS_PREFIX}/includeos/lib/libmultiboot.a)
-
-target_link_libraries(service --whole-archive multiboot --no-whole-archive)
-
 add_library(libos STATIC IMPORTED)
 set_target_properties(libos PROPERTIES LINKER_LANGUAGE CXX)
 set_target_properties(libos PROPERTIES IMPORTED_LOCATION $ENV{INCLUDEOS_PREFIX}/includeos/lib/libos.a)

src/arch/x86/start.asm

@@ -21,14 +21,35 @@ global _start
 global __xsave_enabled
 global __avx_enabled
 
+%define  MB_MAGIC   0x1BADB002
+%define  MB_FLAGS   0x3  ;; ALIGN + MEMINFO
+
+extern _MULTIBOOT_START_
+extern _LOAD_START_
+extern _LOAD_END_
+extern _end
+
+ALIGN 4
+section .multiboot
+  dd  MB_MAGIC
+  dd  MB_FLAGS
+  dd  -(MB_MAGIC + MB_FLAGS)
+  dd _MULTIBOOT_START_
+  dd _LOAD_START_
+  dd _LOAD_END_
+  dd _end
+  dd _start
+
 %define data_segment 0x10
 %define code_segment 0x08
 
+section .data
 __xsave_enabled:
     dw 0x0
 __avx_enabled:
     dw 0x0
 
+ALIGN32
 section .text
 ;; Multiboot places boot paramters on eax and ebx.
 _start:
@@ -57,7 +78,7 @@ rock_bottom:
   ;; enable SSE before we enter C/C++ land
   call enable_sse
   ;; enable AVX if xsave and avx supported on CPU
-  call enable_avx
+  ;call enable_avx
 
   ;;  Place multiboot parameters on stack
   push ebx

src/boot/CMakeLists.txt

@@ -1,5 +1,3 @@
-add_library(multiboot STATIC multiboot.cpp)
-add_dependencies(multiboot PrecompiledLibraries)
 
 add_custom_command(
 	OUTPUT bootloader
@@ -10,4 +8,3 @@ add_custom_command(
 add_custom_target(run ALL DEPENDS bootloader)
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/bootloader DESTINATION includeos/boot)
-install(TARGETS multiboot DESTINATION includeos/lib)

src/boot/multiboot.cpp

@@ -18,20 +18,14 @@
 **/
 ENTRY(_start)
 
-PHDRS {
-  loadable PT_LOAD FLAGS(7);
-}
-
 SECTIONS
 {
   PROVIDE ( _ELF_START_ = . + 0x100000);
   PROVIDE ( _LOAD_START_ = _ELF_START_); /* For convenience w. multiboot */
 
   .multiboot (_ELF_START_ + SIZEOF_HEADERS): {
       PROVIDE(_MULTIBOOT_START_ = .);
-      *multiboot.cpp.obj(.rodata);
-      *multiboot.cpp.o(.rodata);
-      *multiboot.o(.rodata);
+      *(.multiboot)
    }
   PROVIDE ( _TEXT_START_ = . );
   .text (_TEXT_START_ ) :
@@ -112,20 +106,6 @@ SECTIONS
     _DISK_END_ = .;
   }
 
-  .symtab :
-  {
-        _SYMTAB_START = .;
-        *(.symtab)
-        *(.symtab.*)
-  }:loadable
-
-  .strtab :
-  {
-        _STRTAB_START = .;
-        *(.strtab)
-        *(.strtab.*)
-  }:loadable
-
   .elf_symbols : {
     _ELF_SYM_START_ = .;
     LONG (0);
@@ -136,9 +116,9 @@ SECTIONS
     _BSS_START_ = .;
     *(.bss .bss.* .gnu.linkonce.b.*)
     *(COMMON)
-    _BSS_END_ = .;
     . = ALIGN(64 / 8);
   }
+  _BSS_END_ = .;
   . = ALIGN(64 / 8);
   _end = .;
 

src/linker.ld

@@ -17,5 +17,5 @@
 
 #include <service>
 
-extern "C" const char* service_name__ = SERVICE_NAME;
-extern "C" const char* service_binary_name__ = SERVICE;
+const char* service_name__ = SERVICE_NAME;
+const char* service_binary_name__ = SERVICE;

src/service_name.cpp

@@ -107,7 +107,6 @@ set(TEST_SOURCES
 )
 
 set(OS_SOURCES
-  ${SRC}/boot/multiboot.cpp
   ${SRC}/fs/disk.cpp
   ${SRC}/fs/fat.cpp
   ${SRC}/fs/fat_async.cpp

test/CMakeLists.txt

@@ -21,12 +21,12 @@
 #include <iostream>
 
 #include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <sys/stat.h>
+#include <cassert>
 
 #include "../api/boot/multiboot.h"
-#include <gsl/gsl>
 #include "elf.h"
 #include "elf_binary.hpp"
 
@@ -72,7 +72,7 @@ string get_bootloader_path(int argc, char** argv) {
 int main(int argc, char** argv) {
 
   // Verify proper command usage
-  if (argc < 2) {
+  if (argc <= 2) {
     cout << info << usage;
     exit(EXIT_FAILURE);
   }
@@ -127,7 +127,7 @@ int main(int argc, char** argv) {
 
   const decltype(binary_sectors) img_size_sect  {1 + binary_sectors};
   const decltype(binary_sectors) img_size_bytes {img_size_sect * SECT_SIZE};
-  Expects((img_size_bytes & (SECT_SIZE-1)) == 0);
+  assert((img_size_bytes & (SECT_SIZE-1)) == 0);
 
   INFO("Total disk size: \t%ld bytes, => %ld sectors",
        img_size_bytes, img_size_sect);
@@ -175,14 +175,17 @@ int main(int argc, char** argv) {
 
   INFO("Verifying multiboot header:");
   INFO("Magic value: 0x%x\n" , multiboot.magic);
-  Expects(multiboot.magic == MULTIBOOT_HEADER_MAGIC);
+  if (multiboot.magic != MULTIBOOT_HEADER_MAGIC) {
+    printf("Multiboot magic mismatch: 0x%08x vs %#x\n", multiboot.magic, MULTIBOOT_HEADER_MAGIC);
+  }
+  assert(multiboot.magic == MULTIBOOT_HEADER_MAGIC);
 
   INFO("Flags: 0x%x" , multiboot.flags);
   INFO("Checksum: 0x%x" , multiboot.checksum);
   INFO("Checksum computed: 0x%x", multiboot.checksum + multiboot.flags + multiboot.magic);
 
   // Verify multiboot header checksum
-  Expects(multiboot.checksum + multiboot.flags + multiboot.magic == 0);
+  assert(multiboot.checksum + multiboot.flags + multiboot.magic == 0);
 
   INFO("Header addr: 0x%x" , multiboot.header_addr);
   INFO("Load start: 0x%x" , multiboot.load_addr);