From 58311b37dbec793328f4d03f3ec5742cafc99ef3 Mon Sep 17 00:00:00 2001
From: Eyck-Alexander Jentzsch <alex@minres.com>
Date: Mon, 28 Mar 2022 11:16:09 +0200
Subject: [PATCH] Merge branch 'feature/reduced_output' of
 https://git.minres.com/DBT-RISE/DBT-RISE-TGC.git into feature/reduced_output

---
 src/plugin/pctrace.cpp | 70 +++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/plugin/pctrace.cpp b/src/plugin/pctrace.cpp
index 97ca4fc..e178072 100644
--- a/src/plugin/pctrace.cpp
+++ b/src/plugin/pctrace.cpp
@@ -89,45 +89,45 @@ inline string formatPC(uint64_t pc) {
 }
 
 void iss::plugin::cov::callback(instr_info_t iinfo, const exec_info& einfo) {
-    auto delay = 0;
-    auto entry = delays[iinfo.instr_id];
-    bool taken = einfo.branch_taken;
-    if (einfo.branch_taken)
-        delay = entry.taken;
-    else
-        delay = entry.not_taken;
-
-    if (first){
-        output << formatPC(instr_if->get_pc()) << "," << delay;
-        first = false;
-    }
-    if(instr_if->get_next_pc()-instr_if->get_pc() != delays[iinfo.instr_id].size/8){
-        //The goal is to keep the output in start-target pairs, so after a jump the target address needs to get written
-        //to the output. If the target happens to also be a start, we keep the pairing by adding a 0-delay entry.
-        if (jumped)
-            output <<"\n" <<formatPC(instr_if->get_pc()) << "," << 0;
-        output <<"\n" << formatPC(instr_if->get_pc()) << "," << delay;
-        jumped = true;
-    }
-    else{
-        if (jumped){
-            output <<"\n" << formatPC(instr_if->get_pc()) << "," << delay;
-            jumped = false;
-        }
-        else if(delay!=1){
-            output <<"\n" << formatPC(instr_if->get_pc()) << "," << delay;
-            output <<"\n" << formatPC(instr_if->get_pc()) << "," << 0;
-        }
-
-    }
-
-//source code for the full output
 //    auto delay = 0;
 //    auto entry = delays[iinfo.instr_id];
 //    bool taken = einfo.branch_taken;
 //    if (einfo.branch_taken)
 //        delay = entry.taken;
 //    else
-//       delay = entry.not_taken;
-//    output<<std::hex <<"0x" << instr_if->get_pc() <<"," << delay << "\n";
+//        delay = entry.not_taken;
+//
+//    if (first){
+//        output << formatPC(instr_if->get_pc()) << "," << delay;
+//        first = false;
+//    }
+//    if(instr_if->get_next_pc()-instr_if->get_pc() != delays[iinfo.instr_id].size/8){
+//        //The goal is to keep the output in start-target pairs, so after a jump the target address needs to get written
+//        //to the output. If the target happens to also be a start, we keep the pairing by adding a 0-delay entry.
+//        if (jumped)
+//            output <<"\n" <<formatPC(instr_if->get_pc()) << "," << 0;
+//        output <<"\n" << formatPC(instr_if->get_pc()) << "," << delay;
+//        jumped = true;
+//    }
+//    else{
+//        if (jumped){
+//            output <<"\n" << formatPC(instr_if->get_pc()) << "," << delay;
+//            jumped = false;
+//        }
+//        else if(delay!=1){
+//            output <<"\n" << formatPC(instr_if->get_pc()) << "," << delay;
+//            output <<"\n" << formatPC(instr_if->get_pc()) << "," << 0;
+//        }
+//
+//    }
+
+//source code for the full output
+    auto delay = 0;
+    auto entry = delays[iinfo.instr_id];
+    bool taken = einfo.branch_taken;
+    if (einfo.branch_taken)
+        delay = entry.taken;
+    else
+       delay = entry.not_taken;
+    output<<std::hex <<"0x" << instr_if->get_pc() <<"," << delay << "\n";
 }