Commit cb7dfd4c authored by Mishigan's avatar Mishigan

changement affichage pour multiple accès précédents

parent 78096317
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <otawa/prog/Process.h> #include <otawa/prog/Process.h>
#include <lruexact/features.h> #include <lruexact/features.h>
//#include "SecCFGOutput.h" //#include "SecCFGOutput.h"
using namespace otawa; using namespace otawa;
namespace lrusecurity namespace lrusecurity
{ {
...@@ -57,7 +57,7 @@ protected: ...@@ -57,7 +57,7 @@ protected:
_out.setStream(*_stream); _out.setStream(*_stream);
} }
_out << "ACCESS\t\tKIND\tCATEGORY\tBB\t"; _out << "ACCESS\t\tKIND\tCATEGORY\t\tBB\t";
if(_line) if(_line)
_out << "\tLINE"; _out << "\tLINE";
...@@ -105,19 +105,29 @@ protected: ...@@ -105,19 +105,29 @@ protected:
} }
_out << "UNSAFE "; _out << "UNSAFE ";
int set = otawa::icat3::LBLOCK(access)->set(); int set = otawa::icat3::LBLOCK(access)->set();
int number = 0;
if (bb->hasProp(EXIST_HIT_PREV_IN)) { if (bb->hasProp(EXIST_HIT_PREV_IN)) {
ACSSecurity prev = (*EXIST_HIT_PREV_IN(bb))[set]; ACSSecurity prev = (*EXIST_HIT_PREV_IN(bb))[set];
int index = otawa::icat3::LBLOCK(access)->index(); int index = otawa::icat3::LBLOCK(access)->index();
for (int i = 0; i < prev[index].size(); i++) number = prev[index].size();
_out << prev[index][i]; for (int i = 0; i < number; i++)
_out << prev[index][i] << "\n\t\t\t\t\b";
// REMONTEE
for (int j = 0; j < number; j++)
_out << "\033[1A";
} }
_out << "\t\t\tBB " << bb->index() << "\t\t";
_out << "\t\t";
_out << "BB " << bb->index() << "\t\t";
printLine(ws, bb->address(), bb->topAddress().offset()); printLine(ws, bb->address(), bb->topAddress().offset());
_out << io::endl;
} // DESCENTE
for (int i = 0; i < number-1; i++)
_out << "\n//";
_out << io::endl;
}
} }
void printLine(WorkSpace* ws, Address begin, Address::offset_t offset) void printLine(WorkSpace* ws, Address begin, Address::offset_t offset)
......
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