Merge branch 'develop' of https://git.minres.com/DBT-RISE/DBT-RISE-TGC into develop

src/plugin/pctrace.cpp

@@ -10,8 +10,9 @@
 #include <rapidjson/error/en.h>
 #include <fstream>
 #include <iostream>
+#ifdef WITH_LZ4
 #include <lz4frame.h>
-
+#endif
 
 namespace iss {
 namespace plugin {
@@ -19,6 +20,7 @@ namespace plugin {
 using namespace rapidjson;
 using namespace std;
 
+#ifdef WITH_LZ4
 class lz4compress_steambuf: public std::streambuf {
 public:
     lz4compress_steambuf(const lz4compress_steambuf&) = delete;
@@ -86,6 +88,7 @@ private:
     LZ4F_compressionContext_t ctx{ nullptr };
     bool closed{ false };
 };
+#endif
 
 cov::cov(std::string const &filename)
 : instr_if(nullptr)
@@ -162,10 +165,10 @@ void cov::callback(instr_info_t iinfo, const exec_info& einfo) {
     else
         delay = entry.not_taken;
 #ifndef WITH_LZ4
-    output<<std::hex <<"0x" << instr_if->get_pc() <<"," << delay << "\n";
+    output<<std::hex <<"0x" << instr_if->get_pc() <<"," << delay <<"," << call<< "\n";
 #else
     auto rdbuf=ostr.rdbuf();
-    ostr<<std::hex <<"0x" << instr_if->get_pc() <<"," << delay << "\n";
+    ostr<<std::hex <<"0x" << instr_if->get_pc() <<"," << delay <<"," << call<< "\n";
 #endif
 }
 }