Commit 65046374 authored by Valentin Touzeau's avatar Valentin Touzeau
Browse files

Refactoring WIP

parent 92f2ec6f
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include <otawa/icat3/features.h> #include <otawa/icat3/features.h>
#include <lruzdd/features.h> #include <lruzdd/features.h>
#include <lruzdd/MayAnalysis/MayManager.h> #include <lruzdd/MayAnalysis/MayManager.h>
#include <lrumc/features.h>
#include "../ZDD/ZDDManager.h" #include "../ZDD/ZDDManager.h"
#include "../ZDD/MayAbstractValuePolicy.h" #include "../ZDD/MayAbstractValuePolicy.h"
#include "../ZDD/ZDDMayDomainPolicy.h" #include "../ZDD/ZDDMayDomainPolicy.h"
......
...@@ -239,20 +239,20 @@ private: ...@@ -239,20 +239,20 @@ private:
for(int i = 0; i < accs.size(); ++i) { for(int i = 0; i < accs.size(); ++i) {
icat3::LBlock* lb = icat3::LBLOCK(accs[i]); icat3::LBlock* lb = icat3::LBLOCK(accs[i]);
if(lb == focus) { if(lb == focus) {
if(logFor(LOG_BLOCK)) { // if(logFor(LOG_BLOCK)) {
log << "\t\tFunction " << b->cfg()->label() << ", "; // log << "\t\tFunction " << b->cfg()->label() << ", ";
log << const_cast<Block*>(b) << ": " << io::endl; // log << const_cast<Block*>(b) << ": " << io::endl;
log << "\t\t\tAccess (" << accs[i] << ") is "; // log << "\t\t\tAccess (" << accs[i] << ") is ";
} // }
if(man.alwaysMiss()) { if(man.alwaysMiss()) {
MISS_CATEGORY(accs[i]) = MissCategory::AM; MISS_CATEGORY(accs[i]) = MissCategory::AM;
if(logFor(LOG_BLOCK)) // if(logFor(LOG_BLOCK))
log << "AM" << elm::io::endl; // log << "AM" << elm::io::endl;
} }
else { else {
MISS_CATEGORY(accs[i]) = MissCategory::NC; MISS_CATEGORY(accs[i]) = MissCategory::NC;
if(logFor(LOG_BLOCK)) // if(logFor(LOG_BLOCK))
log << "NC" << elm::io::endl; // log << "NC" << elm::io::endl;
} }
} }
man.update(accs[i]); man.update(accs[i]);
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include <otawa/icat3/features.h> #include <otawa/icat3/features.h>
#include <lruzdd/features.h> #include <lruzdd/features.h>
#include <lruzdd/MustAnalysis/MustManager.h> #include <lruzdd/MustAnalysis/MustManager.h>
#include <lrumc/features.h>
#include "../ZDD/ZDDManager.h" #include "../ZDD/ZDDManager.h"
#include "../ZDD/MustAbstractValuePolicy.h" #include "../ZDD/MustAbstractValuePolicy.h"
#include "../ZDD/ZDDMustDomainPolicy.h" #include "../ZDD/ZDDMustDomainPolicy.h"
......
...@@ -239,20 +239,20 @@ private: ...@@ -239,20 +239,20 @@ private:
for(int i = 0; i < accs.size(); ++i) { for(int i = 0; i < accs.size(); ++i) {
icat3::LBlock* lb = icat3::LBLOCK(accs[i]); icat3::LBlock* lb = icat3::LBLOCK(accs[i]);
if(lb == focus) { if(lb == focus) {
if(logFor(LOG_BLOCK)) { // if(logFor(LOG_BLOCK)) {
log << "\t\tFunction " << b->cfg()->label() << ", "; // log << "\t\tFunction " << b->cfg()->label() << ", ";
log << const_cast<Block*>(b) << ": " << io::endl; // log << const_cast<Block*>(b) << ": " << io::endl;
log << "\t\t\tAccess (" << accs[i] << ") is "; // log << "\t\t\tAccess (" << accs[i] << ") is ";
} // }
if(man.alwaysHit()) { if(man.alwaysHit()) {
HIT_CATEGORY(accs[i]) = HitCategory::AH; HIT_CATEGORY(accs[i]) = HitCategory::AH;
if(logFor(LOG_BLOCK)) // if(logFor(LOG_BLOCK))
log << "AH" << elm::io::endl; // log << "AH" << elm::io::endl;
} }
else { else {
HIT_CATEGORY(accs[i]) = HitCategory::NC; HIT_CATEGORY(accs[i]) = HitCategory::NC;
if(logFor(LOG_BLOCK)) // if(logFor(LOG_BLOCK))
log << "NC" << elm::io::endl; // log << "NC" << elm::io::endl;
} }
} }
man.update(accs[i]); man.update(accs[i]);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment