DBT-RISE
/
DBT-RISE-TGC
11
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Merge branch 'feature/reduced_output' of 

https://git.minres.com/DBT-RISE/DBT-RISE-TGC.git into
feature/reduced_output
This commit is contained in:
Eyck-Alexander Jentzsch 2022-03-28 11:16:09 +02:00
parent ad8dc09bee
commit 58311b37db
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/plugin/pctrace.cpp
View File

@ -89,39 +89,6 @@ 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;
@ -129,5 +96,38 @@ void iss::plugin::cov::callback(instr_info_t iinfo, const exec_info& einfo) {
// delay = entry.taken;
// else
// delay = entry.not_taken;
// output<<std::hex <<"0x" << instr_if->get_pc() <<"," << delay << "\n";
//
// 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";
}