Cleanup and remove god-headers

Erdbeerenjanzi · Apr 3, 2020 · f0f6563 · f0f6563
1 parent 8efcaaf
commit f0f6563
Show file tree

Hide file tree

Showing 95 changed files with 145 additions and 316 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -112,6 +112,7 @@ set(sources
 
 add_library(vcml ${sources})
 target_include_directories(vcml PUBLIC ${inc})
+target_include_directories(vcml PRIVATE ${src})
 target_include_directories(vcml SYSTEM PUBLIC ${SYSTEMC_INCLUDE_DIRS})
 target_include_directories(vcml SYSTEM PUBLIC ${LIBELF_INCLUDE_DIRS})
 

diff --git a/include/vcml.h b/include/vcml.h
@@ -19,7 +19,6 @@
 #ifndef VCML_H
 #define VCML_H
 
-#include "vcml/common/includes.h"
 #include "vcml/common/types.h"
 #include "vcml/common/strings.h"
 #include "vcml/common/utils.h"
@@ -43,12 +42,6 @@
 #include "vcml/properties/property_provider_file.h"
 
 #include "vcml/backends/backend.h"
-#include "vcml/backends/backend_null.h"
-#include "vcml/backends/backend_file.h"
-#include "vcml/backends/backend_term.h"
-#include "vcml/backends/backend_stdout.h"
-#include "vcml/backends/backend_tcp.h"
-#include "vcml/backends/backend_tap.h"
 
 #include "vcml/debugging/rspserver.h"
 #include "vcml/debugging/gdbstub.h"

diff --git a/include/vcml/adapters.h b/include/vcml/adapters.h
@@ -19,10 +19,9 @@
 #ifndef VCML_ADAPTERS_H
 #define VCML_ADAPTERS_H
 
-#include "vcml/common/includes.h"
 #include "vcml/common/types.h"
-#include "vcml/common/utils.h"
 #include "vcml/common/report.h"
+#include "vcml/common/systemc.h"
 
 namespace vcml {
 

diff --git a/include/vcml/backends/backend.h b/include/vcml/backends/backend.h
@@ -19,17 +19,15 @@
 #ifndef VCML_BACKEND_H
 #define VCML_BACKEND_H
 
-#include "vcml/common/includes.h"
 #include "vcml/common/types.h"
-#include "vcml/common/utils.h"
+#include "vcml/common/strings.h"
 #include "vcml/common/report.h"
-
+#include "vcml/common/systemc.h"
 #include "vcml/logging/logger.h"
 #include "vcml/properties/property.h"
 
 namespace vcml {
 
-
     class backend: public sc_module
     {
     public:
@@ -41,9 +39,12 @@ namespace vcml {
     public:
         property<log_level> loglvl;
 
-        backend(const sc_module_name& nm = "backend");
-        virtual ~backend();
+        backend() = delete;
+        backend(const backend&) = delete;
+        backend& operator = (const backend&) = delete;
 
+        explicit backend(const sc_module_name& nm = "backend");
+        virtual ~backend();
         VCML_KIND(backend);
 
         virtual size_t peek() = 0;

diff --git a/include/vcml/command.h b/include/vcml/command.h
@@ -19,9 +19,7 @@
 #ifndef VCML_COMMAND_H
 #define VCML_COMMAND_H
 
-#include "vcml/common/includes.h"
 #include "vcml/common/types.h"
-#include "vcml/common/utils.h"
 #include "vcml/common/report.h"
 
 #define VCML_NO_ARGS (::std::vector<::std::string>())

diff --git a/include/vcml/common/aio.h b/include/vcml/common/aio.h
@@ -19,10 +19,7 @@
 #ifndef VCML_AIO_H
 #define VCML_AIO_H
 
-#include "vcml/common/includes.h"
-#include "vcml/common/types.h"
-#include "vcml/common/utils.h"
-#include "vcml/common/report.h"
+#include <functional>
 
 namespace vcml {
 

diff --git a/include/vcml/common/bitops.h b/include/vcml/common/bitops.h
@@ -19,7 +19,6 @@
 #ifndef VCML_BITOPS_H
 #define VCML_BITOPS_H
 
-#include "vcml/common/includes.h"
 #include "vcml/common/types.h"
 
 namespace vcml {

diff --git a/include/vcml/common/includes.h b/include/vcml/common/includes.h
diff --git a/include/vcml/common/report.h b/include/vcml/common/report.h
@@ -19,9 +19,10 @@
 #ifndef VCML_REPORT_H
 #define VCML_REPORT_H
 
-#include "vcml/common/includes.h"
+#include <exception>
+
 #include "vcml/common/types.h"
-#include "vcml/common/utils.h"
+#include "vcml/common/strings.h"
 
 namespace vcml {
 
@@ -36,11 +37,6 @@ namespace vcml {
         vector<string> m_backtrace;
         string         m_desc;
 
-        static void handle_segfault(int sig, siginfo_t* info, void* context);
-
-        // disabled
-        report();
-
     public:
         const char*  message()  const { return m_message.c_str(); }
         const char*  origin()   const { return m_origin.c_str(); }
@@ -50,6 +46,7 @@ namespace vcml {
 
         const vector<string> backtrace() const;
 
+        report() = delete;
         report(const string& msg, const char* file, int line);
         virtual ~report() throw();
 

diff --git a/include/vcml/common/strings.h b/include/vcml/common/strings.h
@@ -19,10 +19,11 @@
 #ifndef VCML_STRINGS_H
 #define VCML_STRINGS_H
 
+#include <stdarg.h>
+#include <string.h>
 #include <string>
 #include <sstream>
 
-#include "vcml/common/includes.h"
 #include "vcml/common/types.h"
 
 namespace vcml {

diff --git a/include/vcml/common/systemc.h b/include/vcml/common/systemc.h
@@ -142,6 +142,11 @@ namespace vcml {
     using tlm_utils::simple_target_socket;
     using tlm_utils::simple_target_socket_tagged;
 
+#define VCML_KIND(name)                \
+    virtual const char* kind() const { \
+        return "vcml::" #name;         \
+    }
+
 }
 
 std::istream& operator >> (std::istream& is, sc_core::sc_time& t);

diff --git a/include/vcml/common/thctl.h b/include/vcml/common/thctl.h
@@ -19,8 +19,7 @@
 #ifndef VCML_THCTL_H
 #define VCML_THCTL_H
 
-#include "vcml/common/includes.h"
-#include "vcml/common/types.h"
+#include <pthread.h>
 
 namespace vcml {
 

diff --git a/include/vcml/common/types.h b/include/vcml/common/types.h
@@ -32,7 +32,11 @@
 #include <list>
 #include <map>
 #include <unordered_map>
+#include <iterator>
 #include <algorithm>
+#include <iostream>
+#include <iomanip>
+#include <fstream>
 #include <memory>
 #include <functional>
 

diff --git a/include/vcml/common/utils.h b/include/vcml/common/utils.h
@@ -19,18 +19,11 @@
 #ifndef VCML_UTILS_H
 #define VCML_UTILS_H
 
-#include "vcml/common/includes.h"
 #include "vcml/common/types.h"
 #include "vcml/common/strings.h"
-#include "vcml/common/thctl.h"
 
 namespace vcml {
 
-#define VCML_KIND(name)                \
-    virtual const char* kind() const { \
-        return "vcml::" #name;         \
-    }
-
     string dirname(const string& filename);
     string tempdir();
 

diff --git a/include/vcml/component.h b/include/vcml/component.h
@@ -19,9 +19,7 @@
 #ifndef VCML_COMPONENT_H
 #define VCML_COMPONENT_H
 
-#include "vcml/common/includes.h"
 #include "vcml/common/types.h"
-#include "vcml/common/utils.h"
 #include "vcml/common/report.h"
 #include "vcml/common/systemc.h"
 

diff --git a/include/vcml/debugging/gdbserver.h b/include/vcml/debugging/gdbserver.h
@@ -19,9 +19,8 @@
 #ifndef VCML_GDBSERVER_H
 #define VCML_GDBSERVER_H
 
-#include "vcml/common/includes.h"
 #include "vcml/common/types.h"
-#include "vcml/common/utils.h"
+#include "vcml/common/strings.h"
 #include "vcml/common/report.h"
 #include "vcml/common/thctl.h"
 

diff --git a/include/vcml/debugging/gdbstub.h b/include/vcml/debugging/gdbstub.h
@@ -19,10 +19,8 @@
 #ifndef VCML_GDBSTUB_H
 #define VCML_GDBSTUB_H
 
-#include "vcml/common/includes.h"
 #include "vcml/common/types.h"
 #include "vcml/common/thctl.h"
-
 #include "vcml/range.h"
 
 namespace vcml { namespace debugging {

diff --git a/include/vcml/debugging/rspserver.h b/include/vcml/debugging/rspserver.h
@@ -19,14 +19,14 @@
 #ifndef VCML_RSP_H
 #define VCML_RSP_H
 
-#include "vcml/common/includes.h"
+#include <pthread.h>
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+
 #include "vcml/common/types.h"
 #include "vcml/common/strings.h"
-#include "vcml/common/utils.h"
 #include "vcml/common/report.h"
 
-#include "vcml/logging/logger.h"
-
 namespace vcml { namespace debugging {
 
     class rspserver

diff --git a/include/vcml/debugging/vncserver.h b/include/vcml/debugging/vncserver.h
@@ -21,12 +21,9 @@
 
 #include <rfb/rfb.h>
 
-#include "vcml/common/includes.h"
 #include "vcml/common/types.h"
 #include "vcml/common/strings.h"
-#include "vcml/common/utils.h"
 #include "vcml/common/report.h"
-
 #include "vcml/logging/logger.h"
 
 namespace vcml { namespace debugging {

diff --git a/include/vcml/debugging/vspserver.h b/include/vcml/debugging/vspserver.h
@@ -19,20 +19,12 @@
 #ifndef VCML_VSPSERVER_H
 #define VCML_VSPSERVER_H
 
-#include "vcml/common/includes.h"
 #include "vcml/common/types.h"
 #include "vcml/common/strings.h"
-#include "vcml/common/utils.h"
 #include "vcml/common/report.h"
-#include "vcml/common/aio.h"
-#include "vcml/common/version.h"
-
-#include "vcml/logging/logger.h"
-#include "vcml/properties/property.h"
+#include "vcml/common/systemc.h"
 #include "vcml/debugging/rspserver.h"
 
-#include "vcml/component.h"
-
 namespace vcml { namespace debugging {
 
     class vspserver: public rspserver {
@@ -59,7 +51,7 @@ namespace vcml { namespace debugging {
 
     public:
         vspserver() = delete;
-        vspserver(u16 port);
+        explicit vspserver(u16 port);
         virtual ~vspserver();
 
         void start();

diff --git a/include/vcml/dmi_cache.h b/include/vcml/dmi_cache.h
@@ -19,9 +19,7 @@
 #ifndef VCML_DMI_H
 #define VCML_DMI_H
 
-#include "vcml/common/includes.h"
 #include "vcml/common/types.h"
-#include "vcml/common/utils.h"
 #include "vcml/common/report.h"
 #include "vcml/common/systemc.h"
 

diff --git a/include/vcml/elf.h b/include/vcml/elf.h
@@ -19,11 +19,10 @@
 #ifndef VCML_ELF_H
 #define VCML_ELF_H
 
-#include "vcml/common/includes.h"
+#include <libelf.h>
+
 #include "vcml/common/types.h"
-#include "vcml/common/utils.h"
 #include "vcml/common/report.h"
-
 #include "vcml/logging/logger.h"
 
 namespace vcml {