Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
lrusecurity
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Touzeau
lrusecurity
Commits
c71e01f1
Commit
c71e01f1
authored
Jul 02, 2019
by
Valentin Touzeau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactoring
parent
d51a4b37
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
29 additions
and
27 deletions
+29
-27
src/Prev/lrusecurity_ExistHitPrevAnalysis.cpp
src/Prev/lrusecurity_ExistHitPrevAnalysis.cpp
+1
-1
src/Prev_Over/lrusecurity_ExistHitPrevOAnalysis.cpp
src/Prev_Over/lrusecurity_ExistHitPrevOAnalysis.cpp
+1
-1
src/Prev_Under/ExistHitPrevUAdapter.h
src/Prev_Under/ExistHitPrevUAdapter.h
+1
-1
src/Prev_Under/ExistHitPrevUDomain.h
src/Prev_Under/ExistHitPrevUDomain.h
+2
-2
src/Prev_Under/lrusecurity_ExistHitPrevUAdapter.cpp
src/Prev_Under/lrusecurity_ExistHitPrevUAdapter.cpp
+11
-9
src/Prev_Under/lrusecurity_ExistHitPrevUAnalysis.cpp
src/Prev_Under/lrusecurity_ExistHitPrevUAnalysis.cpp
+1
-1
src/Prev_Under/lrusecurity_ExistHitPrevUDomain.cpp
src/Prev_Under/lrusecurity_ExistHitPrevUDomain.cpp
+2
-2
src/lrusecurity_Displayer.cpp
src/lrusecurity_Displayer.cpp
+6
-6
src/lrusecurity_SecurityCatBuilder.cpp
src/lrusecurity_SecurityCatBuilder.cpp
+4
-4
No files found.
src/Prev/lrusecurity_ExistHitPrevAnalysis.cpp
View file @
c71e01f1
...
...
@@ -89,7 +89,7 @@ p::declare ExistHitPrevAnalysis::reg = p::init("lrusecurity::ExistHitPrevAnalysi
.
require
(
COLLECTED_CFG_FEATURE
)
.
require
(
icat3
::
MUST_PERS_ANALYSIS_FEATURE
)
.
require
(
icat3
::
CATEGORY_FEATURE
)
.
require
(
lru
mc
::
EXIST_HIT_ANALYSIS_FEATURE
)
.
require
(
lru
preanalysis
::
eh_em
::
EXIST_HIT_ANALYSIS_FEATURE
)
.
provide
(
EXIST_HIT_PREV_ANALYSIS_FEATURE
)
.
make
<
ExistHitPrevAnalysis
>
();
...
...
src/Prev_Over/lrusecurity_ExistHitPrevOAnalysis.cpp
View file @
c71e01f1
...
...
@@ -89,7 +89,7 @@ p::declare ExistHitPrevOAnalysis::reg = p::init("lrusecurity::ExistHitPrevOAnaly
.
require
(
COLLECTED_CFG_FEATURE
)
.
require
(
icat3
::
MUST_PERS_ANALYSIS_FEATURE
)
.
require
(
icat3
::
CATEGORY_FEATURE
)
.
require
(
lru
mc
::
EXIST_HIT_ANALYSIS_FEATURE
)
.
require
(
lru
preanalysis
::
eh_em
::
EXIST_HIT_ANALYSIS_FEATURE
)
.
provide
(
EXIST_HIT_PREV_O_ANALYSIS_FEATURE
)
.
make
<
ExistHitPrevOAnalysis
>
();
...
...
src/Prev_Under/ExistHitPrevUAdapter.h
View file @
c71e01f1
...
...
@@ -34,7 +34,7 @@ public:
private:
int
_set
;
lru
mc
::
ACSManager
_may
Manager
;
lru
preanalysis
::
eh_em
::
ACSManager
_eh
Manager
;
domain_t
_domain
;
graph_t
_graph
;
store_t
_store
;
...
...
src/Prev_Under/ExistHitPrevUDomain.h
View file @
c71e01f1
...
...
@@ -27,8 +27,8 @@ 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
,
otawa
::
icat3
::
ACS
d_eh
,
otawa
::
icat3
::
ACS
s_eh
);
void
fetch
(
t
&
a
,
const
otawa
::
icache
::
Access
&
ac
,
lru
mc
::
ACSManager
&
mayManager
);
void
update
(
const
otawa
::
icache
::
Access
&
access
,
t
&
a
,
lru
mc
::
ACSManager
&
mayManager
);
void
fetch
(
t
&
a
,
const
otawa
::
icache
::
Access
&
ac
,
lru
preanalysis
::
eh_em
::
ACSManager
&
mayManager
);
void
update
(
const
otawa
::
icache
::
Access
&
access
,
t
&
a
,
lru
preanalysis
::
eh_em
::
ACSManager
&
mayManager
);
private:
int
_n
;
...
...
src/Prev_Under/lrusecurity_ExistHitPrevUAdapter.cpp
View file @
c71e01f1
#include "ExistHitPrevUAdapter.h"
#include <lrupreanalysis/ExistHitDomain.h>
using
namespace
otawa
;
namespace
lrusecurity
...
...
@@ -12,7 +14,7 @@ ExistHitPrevUAdapter::ExistHitPrevUAdapter(
const
CFGCollection
&
cfgs
,
otawa
::
WorkSpace
*
ws
)
:
_set
(
set
),
_
may
Manager
(
ws
),
_
eh
Manager
(
ws
),
_domain
(
coll
,
set
,
init
),
_graph
(
cfgs
),
_store
(
_domain
,
_graph
)
...
...
@@ -22,8 +24,8 @@ ExistHitPrevUAdapter::ExistHitPrevUAdapter(
void
ExistHitPrevUAdapter
::
update
(
const
Bag
<
icache
::
Access
>&
accs
,
t
&
d
)
{
for
(
int
i
=
0
;
i
<
accs
.
count
();
i
++
)
{
_domain
.
update
(
accs
[
i
],
d
,
_
may
Manager
);
_
may
Manager
.
update
(
accs
[
i
]);
_domain
.
update
(
accs
[
i
],
d
,
_
eh
Manager
);
_
eh
Manager
.
update
(
accs
[
i
]);
}
}
...
...
@@ -31,7 +33,7 @@ void ExistHitPrevUAdapter::update(const Bag<icache::Access>& accs, t& d)
void
ExistHitPrevUAdapter
::
update
(
Block
*
v
,
t
&
d
)
{
_domain
.
copy
(
d
,
_domain
.
bot
());
lru
mc
::
ExistHitDomain
::
t
d_eh
;
lru
preanalysis
::
eh_em
::
ExistHitDomain
::
t
d_eh
;
t
s
;
...
...
@@ -41,10 +43,10 @@ void ExistHitPrevUAdapter::update(Block *v, t& d)
Block
*
w
=
e
->
source
();
_domain
.
copy
(
s
,
_store
.
get
(
w
));
_
may
Manager
.
start
(
w
);
_
eh
Manager
.
start
(
w
);
if
(
first
)
{
first
=
false
;
_
mayManager
.
ehDomain
(
_set
).
copy
(
d_eh
,
_may
Manager
.
ehDomain
(
_set
).
bot
());
_
ehManager
.
ehDomain
(
_set
).
copy
(
d_eh
,
_eh
Manager
.
ehDomain
(
_set
).
bot
());
}
// apply block
...
...
@@ -63,11 +65,11 @@ void ExistHitPrevUAdapter::update(Block *v, t& d)
// merge result
lru
mc
::
ExistHitDomain
::
t
*
tmp
=
_may
Manager
.
ehValue
(
_set
);
lru
preanalysis
::
eh_em
::
ExistHitDomain
::
t
*
tmp
=
_eh
Manager
.
ehValue
(
_set
);
ASSERT
(
tmp
&&
"tmp null"
);
lru
mc
::
ExistHitDomain
::
t
&
s_eh
=
*
tmp
;
lru
preanalysis
::
eh_em
::
ExistHitDomain
::
t
&
s_eh
=
*
tmp
;
_domain
.
join
(
d
,
s
,
d_eh
,
s_eh
);
_
may
Manager
.
ehDomain
(
_set
).
join
(
d_eh
,
s_eh
);
_
eh
Manager
.
ehDomain
(
_set
).
join
(
d_eh
,
s_eh
);
}
}
...
...
src/Prev_Under/lrusecurity_ExistHitPrevUAnalysis.cpp
View file @
c71e01f1
...
...
@@ -88,7 +88,7 @@ p::declare ExistHitPrevUAnalysis::reg = p::init("lrusecurity::ExistHitPrevUAnaly
.
require
(
COLLECTED_CFG_FEATURE
)
.
require
(
icat3
::
MUST_PERS_ANALYSIS_FEATURE
)
.
require
(
icat3
::
CATEGORY_FEATURE
)
.
require
(
lru
mc
::
EXIST_HIT_ANALYSIS_FEATURE
)
.
require
(
lru
preanalysis
::
eh_em
::
EXIST_HIT_ANALYSIS_FEATURE
)
.
provide
(
EXIST_HIT_PREV_U_ANALYSIS_FEATURE
)
.
make
<
ExistHitPrevUAnalysis
>
();
...
...
src/Prev_Under/lrusecurity_ExistHitPrevUDomain.cpp
View file @
c71e01f1
...
...
@@ -46,7 +46,7 @@ bool ExistHitPrevUDomain::equals(const t& acss, const t& bcss) const
}
}
}
void
ExistHitPrevUDomain
::
fetch
(
t
&
acss
,
const
icache
::
Access
&
access
,
lru
mc
::
ACSManager
&
ehManager
)
void
ExistHitPrevUDomain
::
fetch
(
t
&
acss
,
const
icache
::
Access
&
access
,
lru
preanalysis
::
eh_em
::
ACSManager
&
ehManager
)
{
icat3
::
LBlock
*
lb
=
icat3
::
LBLOCK
(
access
);
int
b
=
lb
->
index
();
...
...
@@ -59,7 +59,7 @@ bool ExistHitPrevUDomain::equals(const t& acss, const t& bcss) const
}
}
void
ExistHitPrevUDomain
::
update
(
const
icache
::
Access
&
access
,
t
&
a
,
lru
mc
::
ACSManager
&
ehManager
)
void
ExistHitPrevUDomain
::
update
(
const
icache
::
Access
&
access
,
t
&
a
,
lru
preanalysis
::
eh_em
::
ACSManager
&
ehManager
)
{
switch
(
access
.
kind
())
{
...
...
src/lrusecurity_Displayer.cpp
View file @
c71e01f1
...
...
@@ -5,8 +5,8 @@
#include <otawa/proc/BBProcessor.h>
#include <otawa/prog/Process.h>
#include <lru
mc
/features.h>
#include "SecCFGOutput.h"
#include <lru
exact
/features.h>
//
#include "SecCFGOutput.h"
using
namespace
otawa
;
namespace
lrusecurity
...
...
@@ -29,10 +29,10 @@ public:
virtual
void
configure
(
const
PropList
&
props
)
override
{
otawa
::
BBProcessor
::
configure
(
props
);
if
(
props
.
hasProp
(
lru
preanalysis
::
CLASSIFICATION_PATH
))
_path
=
lru
preanalysis
::
CLASSIFICATION_PATH
(
props
);
if
(
props
.
hasProp
(
lru
preanalysis
::
CLASSIFICATION_TO_FILE
))
_toFile
=
lru
preanalysis
::
CLASSIFICATION_TO_FILE
(
props
);
if
(
props
.
hasProp
(
lru
exact
::
CLASSIFICATION_PATH
))
_path
=
lru
exact
::
CLASSIFICATION_PATH
(
props
);
if
(
props
.
hasProp
(
lru
exact
::
CLASSIFICATION_TO_FILE
))
_toFile
=
lru
exact
::
CLASSIFICATION_TO_FILE
(
props
);
}
protected:
...
...
src/lrusecurity_SecurityCatBuilder.cpp
View file @
c71e01f1
...
...
@@ -6,7 +6,7 @@
#include <otawa/hard/Memory.h>
#include <lrumc/ACSManager.h>
#include <lrusecurity/features.h>
#include <lru
preanalysis
/features.h>
#include <lru
exact
/features.h>
using
namespace
otawa
;
namespace
lrusecurity
...
...
@@ -53,8 +53,8 @@ protected:
void
processAccesses
(
Bag
<
icache
::
Access
>&
accs
)
{
for
(
int
i
=
0
;
i
<
accs
.
count
();
i
++
)
{
lrusecurity
::
SecurityCategory
cat
;
if
(
lru
preanalysis
::
EXACT_CATEGORY
(
accs
[
i
])
==
lru
preanalysis
::
ExactCategory
::
DU
)
if
(
lru
exact
::
EXACT_CATEGORY
(
accs
[
i
])
==
lru
exact
::
ExactCategory
::
DU
)
cat
=
SecurityCategory
::
UNSAFE
;
else
cat
=
SecurityCategory
::
SAFE
;
...
...
@@ -86,7 +86,7 @@ p::declare SecurityCatBuilder::reg = p::init("lrusecurity::SecurityCatBuilder",
.
make
<
SecurityCatBuilder
>
()
.
require
(
otawa
::
icat3
::
LBLOCKS_FEATURE
)
.
require
(
otawa
::
hard
::
MEMORY_FEATURE
)
.
require
(
lru
preanalysis
::
LRU_CLASSIFICATION_FEATURE
)
.
require
(
lru
exact
::
LRU_CLASSIFICATION_FEATURE
)
.
provide
(
lrusecurity
::
SECURITY_CATEGORY_FEATURE
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment