Commit b1d82803 authored by Maeva Ramarjiaona's avatar Maeva Ramarjiaona

more compilation error correction, but there are errors that I don't understand.

parent d65037e1
#ifndef LRUSECURITY_ACSSECURITY_H_
#define LRUSECURITY_ACSSECURITY_H_
#ifndef LRUSECURITY_ACSSECURITY_H_H_
#define LRUSECURITY_ACSSECURITY_H_H_
#include <otawa/icache/features.h>
#include <otawa/icat3/features.h>
#include <otawa/basics/Bag.h>
#include <lrusecurity/features.h>
#include <otawa/util/Bag.h>
namespace lrusecurity
{
class ACSSecurity : public class otawa::icat3::ACS
class ACSSecurity
{
public:
inline ACSSecurity(icat3::ACS acs) {
for (int i = 0; i < ms; i++){
this[i] = acs[i];
}
this._prev = otawa::Bag<icache::Access>::Bag();
ACSSecurity(){
_acs = *new otawa::icat3::ACS();
};
inline ACSSecurity(otawa::icat3::ACS acs) {
this->_acs = acs;
this->_prev = otawa::Bag<otawa::icache::Access>();
}
otawa::Bag<icache::Access> _prev;
}
void copy(ACSSecurity b){
_acs.copy(b._acs);
_prev = otawa::Bag<otawa::icache::Access>(b._prev);
};
otawa::icat3::ACS _acs;
otawa::Bag<otawa::icache::Access> _prev;
};
}
#endif //LRUSECURITY_ACSSECURITY_H
#endif //LRUSECURITY_ACSSECURITY_H_H
......@@ -24,7 +24,7 @@ public:
inline void copy(t& d, const t& s) { d.copy(s); }
bool equals(const t& a, const t& b) const;
void join(t& d, const t& s);
void fetch(t& a, const otawa::icat3::LBlock *lb, lrupreanalysis::ACSManager& mustManager);
void fetch(t& a, const otawa::icache::Access ac, lrupreanalysis::ACSManager& mustManager);
void update(const otawa::icache::Access& access, t& a, lrupreanalysis::ACSManager& mustManager);
private:
......
......@@ -16,7 +16,7 @@ ExistHitPrevDomain::ExistHitPrevDomain(
_coll(coll),
_A(coll.A()),
_init(init ? *init : _top),
_tmp(_n)
_tmp(*new icat3::ACS( _n))
{
}
......@@ -44,7 +44,7 @@ void ExistHitPrevDomain::join(t& dcss, const t& scss)
}
//join of the Prev is a union
dcss._prev = ;
dcss._prev = scss._prev;
}
void ExistHitPrevDomain::fetch(t& acss, const icache::Access ac, lrupreanalysis::ACSManager& mustManager)
......@@ -68,10 +68,10 @@ void ExistHitPrevDomain::fetch(t& acss, const icache::Access ac, lrupreanalysis:
//Updating prev
for(int i = 0; i < _n; i++) {
if (a[i] == icat3::BOT_AGE)
acss._prev = otawa::Bag<icache::Access>::Bag();
acss._prev = *new Bag<icache::Access>();
if (i == b)
acss._prev = otawa::Bag<icache::Access>::Bag(1, &ac);
acss._prev = *new Bag<icache::Access>(1, &ac);
}
}
......@@ -81,13 +81,13 @@ void ExistHitPrevDomain::update(const icache::Access& access, t& a, lrupreanalys
case icache::FETCH:
if(_coll.cache()->set(access.address()) == _set)
fetch(a, icat3::LBLOCK(access), mustManager);
fetch(a, access, mustManager);
break;
case icache::PREFETCH:
if(_coll.cache()->set(access.address()) == _set) {
copy(_tmp, a);
fetch(a, icat3::LBLOCK(access), mustManager);
fetch(a, access, mustManager);
join(a, _tmp);
}
break;
......
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