Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit b1d82803 authored by Maeva Ramarjiaona's avatar Maeva Ramarjiaona
Browse files

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

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