Commit 6f1c9107 authored by Maeva Ramarjiaona's avatar Maeva Ramarjiaona

still trying to figure out how to connect existhitprev with the rest

parent cc0398b3
......@@ -11,9 +11,9 @@
namespace lrusecurity {
// Exist-Hit
extern otawa::p::feature EXIST_HIT_ANALYSIS_FEATURE;
extern otawa::p::id<otawa::icat3::Container<otawa::icat3::ACS> > EXIST_HIT_INIT;
extern otawa::p::id<otawa::icat3::Container<otawa::icat3::ACS> > EXIST_HIT_IN;
extern otawa::p::feature EXIST_HIT_PREV_ANALYSIS_FEATURE;
extern otawa::p::id<otawa::icat3::Container<otawa::icat3::ACS> > EXIST_HIT_PREV_INIT;
extern otawa::p::id<otawa::icat3::Container<otawa::icat3::ACS> > EXIST_HIT_PREV_IN;
extern otawa::p::feature REFINEMENT_CATEGORY_FEATURE;
//hook: access
......
......@@ -56,7 +56,7 @@ extern otawa::p::feature EXIST_HIT_PREV_ANALYSIS_FEATURE;
*
* @ingroup lrusecurity
*/
extern otawa::p::id<otawa::icat3::Container<otawa::icat3::ACS> > EXIST_HIT_PREV_IN;
extern otawa::p::id<otawa::icat3::Container<ACSSecurity> > EXIST_HIT_PREV_IN;
/**
......@@ -70,7 +70,7 @@ extern otawa::p::id<otawa::icat3::Container<otawa::icat3::ACS> > EXIST_HIT_PREV_
*
* @ingroup lrusecurity
*/
extern otawa::p::id<otawa::icat3::Container<otawa::icat3::ACS> > EXIST_HIT_PREV_INIT;
extern otawa::p::id<otawa::icat3::Container<ACSSecurity> > EXIST_HIT_PREV_INIT;
}; // namespace lrusecurity
......
......@@ -28,8 +28,8 @@ ExistHitPrevAnalysis::ExistHitPrevAnalysis(p::declare& r) :
void ExistHitPrevAnalysis::configure(const PropList& props)
{
Processor::configure(props);
if(props.hasProp(EXIST_HIT_INIT))
_initExistHitPrev = &EXIST_HIT_INIT(props);
if(props.hasProp(EXIST_HIT_PREV_INIT))
_initExistHitPrev = &EXIST_HIT_PREV_INIT(props);
}
void ExistHitPrevAnalysis::setup(WorkSpace* ws)
......@@ -46,7 +46,7 @@ void ExistHitPrevAnalysis::setup(WorkSpace* ws)
// prepare containers
for(CFGCollection::BlockIter b(_cfgs); b; b++)
(*EXIST_HIT_IN(b)).configure(*_coll);
(*EXIST_HIT_PREV_IN(b)).configure(*_coll);
// compute ACS
for(int i = 0; i < _coll->cache()->setCount(); i++) {
......@@ -66,7 +66,7 @@ void ExistHitPrevAnalysis::setup(WorkSpace* ws)
void ExistHitPrevAnalysis::destroy(WorkSpace*)
{
for(CFGCollection::BlockIter b(_cfgs); b; b++)
EXIST_HIT_IN(b).remove();
EXIST_HIT_PREV_IN(b).remove();
}
void ExistHitPrevAnalysis::processSet(int set, WorkSpace* ws)
......@@ -79,7 +79,7 @@ void ExistHitPrevAnalysis::processSet(int set, WorkSpace* ws)
// store the results
for(CFGCollection::BlockIter b(_cfgs); b; b++)
if(b->isBasic()) {
ada.domain().copy((*EXIST_HIT_IN(b))[set], ada.store().get(b));
ada.domain().copy((*EXIST_HIT_PREV_IN(b))[set], ada.store().get(b));
if(logFor(LOG_BLOCK))
log << "\t\t\t" << *b << ": " << ada.domain().print(ada.store().get(b)) << io::endl;
}
......@@ -95,8 +95,8 @@ p::declare ExistHitPrevAnalysis::reg = p::init("lrusecurity::ExistHitPrevAnalysi
p::feature EXIST_HIT_PREV_ANALYSIS_FEATURE("lrusecurity::EXIST_HIT_PREV_ANALYSIS_FEATURE", p::make<ExistHitPrevAnalysis>());
p::id<icat3::Container<icat3::ACS> > EXIST_HIT_PREV_IN("lrusecurity::EXIST_HIT_PREV_IN");
p::id<icat3::Container<ACSSecurity> > EXIST_HIT_PREV_IN("lrusecurity::EXIST_HIT_PREV_IN");
p::id<icat3::Container<icat3::ACS> > EXIST_HIT_PREV_INIT("lrusecurity::EXIST_HIT_PREV_INIT");
p::id<icat3::Container<ACSSecurity> > EXIST_HIT_PREV_INIT("lrusecurity::EXIST_HIT_PREV_INIT");
}; // namespace lrusecurity
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