Merge branch 'bugfix_includes' into 'develop'

Fix includes that cause build errors on some platforms

See merge request ems/astdm/modeling.dram/dram.sys.5!38

src/simulator/simulator/Cache.cpp

@@ -2,11 +2,6 @@
 #include "MemoryManager.h"
 
 #include <cstring>
-#include <sysc/kernel/sc_simcontext.h>
-#include <sysc/kernel/sc_time.h>
-#include <sysc/utils/sc_report.h>
-#include <tlm_core/tlm_2/tlm_generic_payload/tlm_gp.h>
-#include <tlm_core/tlm_2/tlm_generic_payload/tlm_phase.h>
 
 using namespace tlm;
 using namespace sc_core;
@@ -50,7 +45,7 @@ Cache::Cache(const sc_module_name &name,
     if (storageEnabled)
     {
         dataMemory.reserve(size);
-        
+
         for (std::size_t set = 0; set < lineTable.size(); set++)
         {
             for (std::size_t way = 0; way < lineTable[set].size(); way++)
@@ -552,7 +547,7 @@ void Cache::accessCacheAndSendResponse(tlm_generic_payload &trans)
     sc_time bwDelay = SC_ZERO_TIME;
 
     trans.set_response_status(tlm::TLM_OK_RESPONSE);
-    
+
     tlm_sync_enum returnValue = tSocket->nb_transport_bw(trans, bwPhase, bwDelay);
     if (returnValue == tlm::TLM_UPDATED) // TODO tlm_completed
         payloadEventQueue.notify(trans, bwPhase, bwDelay);

src/simulator/simulator/Cache.h

@@ -38,6 +38,7 @@
 
 #include "MemoryManager.h"
 
+#include <cstdint>
 #include <list>
 #include <queue>
 #include <systemc>

src/simulator/simulator/player/StlPlayer.h

@@ -46,6 +46,7 @@
 #include <systemc>
 #include <tlm>
 
+#include <array>
 #include <fstream>
 #include <memory>
 #include <thread>