Fix Include Issue / Enable Warnings (#586)

The bfvmm was not installing its headers, but instead was directly searching for the includes from the source tree, resulting in name collisions with extensions. In addition, warnings were never working, and are by default turned off. Travis however should ensure no warnings occur, which was not working properly. [ISSUES]: #585 Signed-off-by: “rianquinn” <“rianquinn@gmail.com”>
Bareflank · Jan 30, 2018 · c181dae · c181dae
1 parent 6c1eefd
commit c181dae
Show file tree

Hide file tree

Showing 27 changed files with 2,359 additions and 2,311 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -31,7 +31,8 @@ environment:
     BFPATH: '%PATH%'
     PATH: '%PATH%;C:\Program Files\NASM'
 
-test: off
+cache:
+  - ../cache
 
 #
 # Setup Cygwin
@@ -63,6 +64,7 @@ build_script:
   - cmake -G "Visual Studio 14 2015 Win64" -DENABLE_BUILD_VMM=OFF -DENABLE_BUILD_USERSPACE=OFF -DENABLE_BUILD_TEST=ON ..
   - msbuild /m:3 hypervisor.sln
   - cmake --build . --target test
+  - cmake --build . --target test
 
   #
   # Cygwin (Shared Libraries)
@@ -71,3 +73,9 @@ build_script:
   - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER/build_cygwin; cmake -DENABLE_BUILD_TEST=ON .."'
   - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER/build_cygwin; make -j3"'
   - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER/build_cygwin; make unittest"'
+  - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER/build_cygwin; make unittest"'
+
+#
+# No AppVeyor Tests
+#
+test: off
diff --git a/.travis.yml b/.travis.yml
@@ -38,7 +38,6 @@ before_script:
   # Cache / Depends
   #
   - mkdir -p ../cache
-  - mkdir -p ../depends
 
   #
   # Build Enviornment

diff --git a/bfintrinsics/include/arch/x64/srs.h b/bfintrinsics/include/arch/x64/srs.h
@@ -99,10 +99,10 @@ namespace es
         { return gsl::narrow_cast<value_type>(get_bits(sr, mask) >> from); }
 
         inline void set(value_type val)
-        { _write_es(gsl::narrow_cast<value_type>(set_bits(_read_es(), mask, val << from))); }
+        { _write_es(gsl::narrow_cast<value_type>(set_bits(_read_es(), mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline auto set(value_type sr, value_type val)
-        { _write_es(gsl::narrow_cast<value_type>(set_bits(sr, mask, val << from))); }
+        { _write_es(gsl::narrow_cast<value_type>(set_bits(sr, mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline void dump(int level, std::string *msg = nullptr)
         { bfdebug_subnhex(level, name, get(), msg); }
@@ -155,10 +155,10 @@ namespace es
         { return gsl::narrow_cast<value_type>(get_bits(sr, mask) >> from); }
 
         inline void set(value_type val)
-        { _write_es(gsl::narrow_cast<value_type>(set_bits(_read_es(), mask, val << from))); }
+        { _write_es(gsl::narrow_cast<value_type>(set_bits(_read_es(), mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline auto set(value_type sr, value_type val)
-        { _write_es(gsl::narrow_cast<value_type>(set_bits(sr, mask, val << from))); }
+        { _write_es(gsl::narrow_cast<value_type>(set_bits(sr, mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline void dump(int level, std::string *msg = nullptr)
         { bfdebug_subnhex(level, name, get(), msg); }
@@ -196,10 +196,10 @@ namespace cs
         { return gsl::narrow_cast<value_type>(get_bits(sr, mask) >> from); }
 
         inline void set(value_type val)
-        { _write_cs(gsl::narrow_cast<value_type>(set_bits(_read_cs(), mask, val << from))); }
+        { _write_cs(gsl::narrow_cast<value_type>(set_bits(_read_cs(), mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline auto set(value_type sr, value_type val)
-        { _write_cs(gsl::narrow_cast<value_type>(set_bits(sr, mask, val << from))); }
+        { _write_cs(gsl::narrow_cast<value_type>(set_bits(sr, mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline void dump(int level, std::string *msg = nullptr)
         { bfdebug_subnhex(level, name, get(), msg); }
@@ -252,10 +252,10 @@ namespace cs
         { return gsl::narrow_cast<value_type>(get_bits(sr, mask) >> from); }
 
         inline void set(value_type val)
-        { _write_cs(gsl::narrow_cast<value_type>(set_bits(_read_cs(), mask, val << from))); }
+        { _write_cs(gsl::narrow_cast<value_type>(set_bits(_read_cs(), mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline auto set(value_type sr, value_type val)
-        { _write_cs(gsl::narrow_cast<value_type>(set_bits(sr, mask, val << from))); }
+        { _write_cs(gsl::narrow_cast<value_type>(set_bits(sr, mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline void dump(int level, std::string *msg = nullptr)
         { bfdebug_subnhex(level, name, get(), msg); }
@@ -293,10 +293,10 @@ namespace ss
         { return gsl::narrow_cast<value_type>(get_bits(sr, mask) >> from); }
 
         inline void set(value_type val)
-        { _write_ss(gsl::narrow_cast<value_type>(set_bits(_read_ss(), mask, val << from))); }
+        { _write_ss(gsl::narrow_cast<value_type>(set_bits(_read_ss(), mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline auto set(value_type sr, value_type val)
-        { _write_ss(gsl::narrow_cast<value_type>(set_bits(sr, mask, val << from))); }
+        { _write_ss(gsl::narrow_cast<value_type>(set_bits(sr, mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline void dump(int level, std::string *msg = nullptr)
         { bfdebug_subnhex(level, name, get(), msg); }
@@ -349,10 +349,10 @@ namespace ss
         { return gsl::narrow_cast<value_type>(get_bits(sr, mask) >> from); }
 
         inline void set(value_type val)
-        { _write_ss(gsl::narrow_cast<value_type>(set_bits(_read_ss(), mask, val << from))); }
+        { _write_ss(gsl::narrow_cast<value_type>(set_bits(_read_ss(), mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline auto set(value_type sr, value_type val)
-        { _write_ss(gsl::narrow_cast<value_type>(set_bits(sr, mask, val << from))); }
+        { _write_ss(gsl::narrow_cast<value_type>(set_bits(sr, mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline void dump(int level, std::string *msg = nullptr)
         { bfdebug_subnhex(level, name, get(), msg); }
@@ -390,10 +390,10 @@ namespace ds
         { return gsl::narrow_cast<value_type>(get_bits(sr, mask) >> from); }
 
         inline void set(value_type val)
-        { _write_ds(gsl::narrow_cast<value_type>(set_bits(_read_ds(), mask, val << from))); }
+        { _write_ds(gsl::narrow_cast<value_type>(set_bits(_read_ds(), mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline auto set(value_type sr, value_type val)
-        { _write_ds(gsl::narrow_cast<value_type>(set_bits(sr, mask, val << from))); }
+        { _write_ds(gsl::narrow_cast<value_type>(set_bits(sr, mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline void dump(int level, std::string *msg = nullptr)
         { bfdebug_subnhex(level, name, get(), msg); }
@@ -446,10 +446,10 @@ namespace ds
         { return gsl::narrow_cast<value_type>(get_bits(sr, mask) >> from); }
 
         inline void set(value_type val)
-        { _write_ds(gsl::narrow_cast<value_type>(set_bits(_read_ds(), mask, val << from))); }
+        { _write_ds(gsl::narrow_cast<value_type>(set_bits(_read_ds(), mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline auto set(value_type sr, value_type val)
-        { _write_ds(gsl::narrow_cast<value_type>(set_bits(sr, mask, val << from))); }
+        { _write_ds(gsl::narrow_cast<value_type>(set_bits(sr, mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline void dump(int level, std::string *msg = nullptr)
         { bfdebug_subnhex(level, name, get(), msg); }
@@ -487,10 +487,10 @@ namespace fs
         { return gsl::narrow_cast<value_type>(get_bits(sr, mask) >> from); }
 
         inline void set(value_type val)
-        { _write_fs(gsl::narrow_cast<value_type>(set_bits(_read_fs(), mask, val << from))); }
+        { _write_fs(gsl::narrow_cast<value_type>(set_bits(_read_fs(), mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline auto set(value_type sr, value_type val)
-        { _write_fs(gsl::narrow_cast<value_type>(set_bits(sr, mask, val << from))); }
+        { _write_fs(gsl::narrow_cast<value_type>(set_bits(sr, mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline void dump(int level, std::string *msg = nullptr)
         { bfdebug_subnhex(level, name, get(), msg); }
@@ -543,10 +543,10 @@ namespace fs
         { return gsl::narrow_cast<value_type>(get_bits(sr, mask) >> from); }
 
         inline void set(value_type val)
-        { _write_fs(gsl::narrow_cast<value_type>(set_bits(_read_fs(), mask, val << from))); }
+        { _write_fs(gsl::narrow_cast<value_type>(set_bits(_read_fs(), mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline auto set(value_type sr, value_type val)
-        { _write_fs(gsl::narrow_cast<value_type>(set_bits(sr, mask, val << from))); }
+        { _write_fs(gsl::narrow_cast<value_type>(set_bits(sr, mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline void dump(int level, std::string *msg = nullptr)
         { bfdebug_subnhex(level, name, get(), msg); }
@@ -584,10 +584,10 @@ namespace gs
         { return gsl::narrow_cast<value_type>(get_bits(sr, mask) >> from); }
 
         inline void set(value_type val)
-        { _write_gs(gsl::narrow_cast<value_type>(set_bits(_read_gs(), mask, val << from))); }
+        { _write_gs(gsl::narrow_cast<value_type>(set_bits(_read_gs(), mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline auto set(value_type sr, value_type val)
-        { _write_gs(gsl::narrow_cast<value_type>(set_bits(sr, mask, val << from))); }
+        { _write_gs(gsl::narrow_cast<value_type>(set_bits(sr, mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline void dump(int level, std::string *msg = nullptr)
         { bfdebug_subnhex(level, name, get(), msg); }
@@ -640,10 +640,10 @@ namespace gs
         { return gsl::narrow_cast<value_type>(get_bits(sr, mask) >> from); }
 
         inline void set(value_type val)
-        { _write_gs(gsl::narrow_cast<value_type>(set_bits(_read_gs(), mask, val << from))); }
+        { _write_gs(gsl::narrow_cast<value_type>(set_bits(_read_gs(), mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline auto set(value_type sr, value_type val)
-        { _write_gs(gsl::narrow_cast<value_type>(set_bits(sr, mask, val << from))); }
+        { _write_gs(gsl::narrow_cast<value_type>(set_bits(sr, mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline void dump(int level, std::string *msg = nullptr)
         { bfdebug_subnhex(level, name, get(), msg); }
@@ -681,10 +681,10 @@ namespace ldtr
         { return gsl::narrow_cast<value_type>(get_bits(sr, mask) >> from); }
 
         inline void set(value_type val)
-        { _write_ldtr(gsl::narrow_cast<value_type>(set_bits(_read_ldtr(), mask, val << from))); }
+        { _write_ldtr(gsl::narrow_cast<value_type>(set_bits(_read_ldtr(), mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline auto set(value_type sr, value_type val)
-        { _write_ldtr(gsl::narrow_cast<value_type>(set_bits(sr, mask, val << from))); }
+        { _write_ldtr(gsl::narrow_cast<value_type>(set_bits(sr, mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline void dump(int level, std::string *msg = nullptr)
         { bfdebug_subnhex(level, name, get(), msg); }
@@ -737,10 +737,10 @@ namespace ldtr
         { return gsl::narrow_cast<value_type>(get_bits(sr, mask) >> from); }
 
         inline void set(value_type val)
-        { _write_ldtr(gsl::narrow_cast<value_type>(set_bits(_read_ldtr(), mask, val << from))); }
+        { _write_ldtr(gsl::narrow_cast<value_type>(set_bits(_read_ldtr(), mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline auto set(value_type sr, value_type val)
-        { _write_ldtr(gsl::narrow_cast<value_type>(set_bits(sr, mask, val << from))); }
+        { _write_ldtr(gsl::narrow_cast<value_type>(set_bits(sr, mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline void dump(int level, std::string *msg = nullptr)
         { bfdebug_subnhex(level, name, get(), msg); }
@@ -778,10 +778,10 @@ namespace tr
         { return gsl::narrow_cast<value_type>(get_bits(sr, mask) >> from); }
 
         inline void set(value_type val)
-        { _write_tr(gsl::narrow_cast<value_type>(set_bits(_read_tr(), mask, val << from))); }
+        { _write_tr(gsl::narrow_cast<value_type>(set_bits(_read_tr(), mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline auto set(value_type sr, value_type val)
-        { _write_tr(gsl::narrow_cast<value_type>(set_bits(sr, mask, val << from))); }
+        { _write_tr(gsl::narrow_cast<value_type>(set_bits(sr, mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline void dump(int level, std::string *msg = nullptr)
         { bfdebug_subnhex(level, name, get(), msg); }
@@ -834,10 +834,10 @@ namespace tr
         { return gsl::narrow_cast<value_type>(get_bits(sr, mask) >> from); }
 
         inline void set(value_type val)
-        { _write_tr(gsl::narrow_cast<value_type>(set_bits(_read_tr(), mask, val << from))); }
+        { _write_tr(gsl::narrow_cast<value_type>(set_bits(_read_tr(), mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline auto set(value_type sr, value_type val)
-        { _write_tr(gsl::narrow_cast<value_type>(set_bits(sr, mask, val << from))); }
+        { _write_tr(gsl::narrow_cast<value_type>(set_bits(sr, mask, gsl::narrow_cast<value_type>(val << from)))); }
 
         inline void dump(int level, std::string *msg = nullptr)
         { bfdebug_subnhex(level, name, get(), msg); }

diff --git a/bfruntime/src/CMakeLists.txt b/bfruntime/src/CMakeLists.txt
@@ -22,6 +22,7 @@ project(bfruntime C CXX)
 include(${SOURCE_CMAKE_DIR}/project.cmake)
 init_project(
     TIDY_EXCLUSIONS -cert-err34-c,-misc-misplaced-widening-cast
+    CXX_FLAGS -Wno-main
 )
 
 add_subdirectory(crt)

diff --git a/bfvmm/src/CMakeLists.txt b/bfvmm/src/CMakeLists.txt
@@ -20,7 +20,9 @@ cmake_minimum_required(VERSION 3.6)
 project(bfvmm C CXX)
 
 include(${SOURCE_CMAKE_DIR}/project.cmake)
-init_project()
+init_project(
+    INCLUDES ${CMAKE_CURRENT_LIST_DIR}/../include
+)
 
 add_subdirectory(debug)
 add_subdirectory(memory_manager)

diff --git a/bfvmm/src/debug/CMakeLists.txt b/bfvmm/src/debug/CMakeLists.txt
@@ -46,3 +46,9 @@ add_static_library(
     DEFINES STATIC_DEBUG
     DEFINES STATIC_INTRINSICS
 )
+
+# ------------------------------------------------------------------------------
+# Install
+# ------------------------------------------------------------------------------
+
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/../include/debug DESTINATION include/bfvmm/debug)
diff --git a/bfvmm/src/hve/CMakeLists.txt b/bfvmm/src/hve/CMakeLists.txt
@@ -49,3 +49,9 @@ add_static_library(
     DEFINES STATIC_MEMORY_MANAGER
     DEFINES STATIC_INTRINSICS
 )
+
+# ------------------------------------------------------------------------------
+# Install
+# ------------------------------------------------------------------------------
+
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/../include/hve DESTINATION include/bfvmm/hve)
diff --git a/bfvmm/src/memory_manager/CMakeLists.txt b/bfvmm/src/memory_manager/CMakeLists.txt
@@ -43,3 +43,9 @@ add_static_library(
     DEFINES STATIC_MEMORY_MANAGER
     DEFINES STATIC_INTRINSICS
 )
+
+# ------------------------------------------------------------------------------
+# Install
+# ------------------------------------------------------------------------------
+
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/../include/memory_manager DESTINATION include/bfvmm/memory_manager)
diff --git a/bfvmm/src/vcpu/CMakeLists.txt b/bfvmm/src/vcpu/CMakeLists.txt
@@ -54,3 +54,9 @@ add_static_library(
     DEFINES STATIC_MEMORY_MANAGER
     DEFINES STATIC_INTRINSICS
 )
+
+# ------------------------------------------------------------------------------
+# Install
+# ------------------------------------------------------------------------------
+
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/../include/vcpu DESTINATION include/bfvmm/vcpu)
diff --git a/bfvmm/tests/CMakeLists.txt b/bfvmm/tests/CMakeLists.txt
@@ -20,7 +20,9 @@ cmake_minimum_required(VERSION 3.6)
 project(bfvmm_test C CXX)
 
 include(${SOURCE_CMAKE_DIR}/project.cmake)
-init_project()
+init_project(
+    INCLUDES ${CMAKE_CURRENT_LIST_DIR}/../include
+)
 
 add_subdirectory(../src/debug ${CMAKE_CURRENT_BINARY_DIR}/src/debug)
 add_subdirectory(../src/hve ${CMAKE_CURRENT_BINARY_DIR}/src/hve)

diff --git a/bfvmm/tests/debug/serial/test_serial_port_ns16550a.cpp b/bfvmm/tests/debug/serial/test_serial_port_ns16550a.cpp
@@ -30,7 +30,7 @@ static std::map<serial_port_ns16550a::port_type, serial_port_ns16550a::value_typ
 
 extern "C" uint8_t
 _inb(uint16_t port) noexcept
-{ return g_ports[port]; }
+{ return gsl::narrow_cast<serial_port_ns16550a::value_type_8>(g_ports[port]); }
 
 extern "C" void
 _outb(uint16_t port, uint8_t val) noexcept
@@ -42,7 +42,7 @@ _ind(uint16_t port) noexcept
 
 extern "C" void
 _outd(uint16_t port, uint32_t val) noexcept
-{ g_ports[port] = val; }
+{ g_ports[port] = gsl::narrow_cast<serial_port_ns16550a::value_type_8>(val); }
 
 TEST_CASE("serial: support")
 {