Merge branch 'gem5_fixes' into 'develop'

Update gem5 coupling to latest gem5 version

See merge request ems/astdm/dram.sys!274

DRAMSys/gem5/CMakeLists.txt

@@ -48,9 +48,9 @@ endif()
 
 add_executable(DRAMSys_gem5 
     main.cpp
-    $ENV{GEM5}/util/systemc/sc_logger.cc
-    $ENV{GEM5}/util/systemc/sc_module.cc
-    $ENV{GEM5}/util/systemc/stats.cc
+    $ENV{GEM5}/util/systemc/gem5_within_systemc/sc_logger.cc
+    $ENV{GEM5}/util/systemc/gem5_within_systemc/sc_module.cc
+    $ENV{GEM5}/util/systemc/gem5_within_systemc/stats.cc
     $ENV{GEM5}/util/tlm/src/sc_master_port.cc
     $ENV{GEM5}/util/tlm/src/sc_slave_port.cc
     $ENV{GEM5}/util/tlm/src/slave_transactor.cc
@@ -64,7 +64,7 @@ target_include_directories(DRAMSys_gem5
     PRIVATE $ENV{GEM5}/util/tlm/examples/slave_port/
     PRIVATE $ENV{GEM5}/util/tlm/examples/common/
     PRIVATE $ENV{GEM5}/util/tlm/src/
-    PRIVATE $ENV{GEM5}/util/systemc/
+    PRIVATE $ENV{GEM5}/util/systemc/gem5_within_systemc/
     PRIVATE ../library/src/simulation/
 )
 

DRAMSys/gem5/README.md

@@ -9,7 +9,7 @@ The main steps for building gem5 and libgem5 follow:
 ```bash
 $ cd gem5
 $ scons build/ARM/gem5.opt
-$ scons --with-cxx-config --without-python --without-tcmalloc build/ARM/libgem5_opt.so
+$ scons --with-cxx-config --without-python --without-tcmalloc USE_SYSTEMC=0 build/ARM/libgem5_opt.so
 ```
 
 In order to use gem5 with DRAMSys export the `GEM5` environment variable (gem5 root directory) and add the path of the library to `LD_LIBRARY_PATH`, then rerun CMake and rebuild the DRAMSys project.

DRAMSys/library/CMakeLists.txt

@@ -294,7 +294,7 @@ endif()
 
 if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/src/common/third_party/sqlite-amalgamation)
     target_include_directories(DRAMSysLibrary
-        PRIVATE src/common/third_party/sqlite-amalgamation/
+        PUBLIC src/common/third_party/sqlite-amalgamation/
     )
     target_link_libraries(DRAMSysLibrary
         PRIVATE sqlite3::sqlite3

DRAMSys/library/src/common/TlmRecorder.h

@@ -44,11 +44,11 @@
 #include <string>
 #include <map>
 #include <algorithm>
-#include <sqlite3.h>
 #include <fstream>
 #include <cerrno>
 #include <tlm.h>
 #include <systemc.h>
+#include "sqlite3.h"
 #include "DebugManager.h"
 #include "utils.h"