Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Otawa Polymalys
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ballabriga Clément
Otawa Polymalys
Commits
8521b31b
Commit
8521b31b
authored
Dec 11, 2019
by
Hugues Cassé
Browse files
Options
Downloads
Patches
Plain Diff
hai: small fix.
parent
d8baf12e
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/otawa/dfa/hai/HalfAbsInt.h
+1
-1
1 addition, 1 deletion
include/otawa/dfa/hai/HalfAbsInt.h
src/config/config.cpp
+17
-5
17 additions, 5 deletions
src/config/config.cpp
with
18 additions
and
6 deletions
include/otawa/dfa/hai/HalfAbsInt.h
+
1
−
1
View file @
8521b31b
...
@@ -463,7 +463,7 @@ Edge *HalfAbsInt<FixPoint>::detectCalls(bool &enter_call, Vector<Edge*> &call_ed
...
@@ -463,7 +463,7 @@ Edge *HalfAbsInt<FixPoint>::detectCalls(bool &enter_call, Vector<Edge*> &call_ed
Edge
*
next_edge
=
0
;
Edge
*
next_edge
=
0
;
enter_call
=
true
;
enter_call
=
true
;
call_edges
.
clear
();
call_edges
.
clear
();
for
(
Block
::
EdgeIter
outedge
=
bb
->
outs
();
outedge
;
outedge
++
)
for
(
Block
::
EdgeIter
outedge
=
bb
->
outs
();
outedge
()
;
outedge
++
)
// TODO special support with unknown sink is needed here
// TODO special support with unknown sink is needed here
if
(
outedge
->
sink
()
->
isSynth
()
&&
!
HAI_DONT_ENTER
(
outedge
->
sink
()
->
toSynth
()
->
callee
()))
{
if
(
outedge
->
sink
()
->
isSynth
()
&&
!
HAI_DONT_ENTER
(
outedge
->
sink
()
->
toSynth
()
->
callee
()))
{
call_edges
.
add
(
*
outedge
);
call_edges
.
add
(
*
outedge
);
...
...
This diff is collapsed.
Click to expand it.
src/config/config.cpp
+
17
−
5
View file @
8521b31b
...
@@ -240,17 +240,17 @@ protected:
...
@@ -240,17 +240,17 @@ protected:
// display C flags
// display C flags
if
(
cflags
)
{
if
(
cflags
)
{
cout
<<
"-I"
<<
MANAGER
.
prefixPath
()
/
"include"
<<
io
::
endl
;
cout
<<
quote
(
_
<<
"-I"
<<
MANAGER
.
prefixPath
()
/
"include"
)
<<
io
::
endl
;
return
;
return
;
}
}
// output libs
// output libs
if
(
libs
)
{
if
(
libs
)
{
cout
<<
"-L"
<<
getLibDir
()
<<
" -lotawa -lelm -lgel"
;
cout
<<
quote
(
_
<<
"-L"
<<
getLibDir
()
)
<<
" -lotawa -lelm -lgel"
;
// output dependencies
// output dependencies
for
(
elm
::
Vector
<
sys
::
Plugin
*>::
Iter
p
=
plugs
;
p
();
p
++
)
for
(
elm
::
Vector
<
sys
::
Plugin
*>::
Iter
p
=
plugs
;
p
();
p
++
)
cout
<<
' '
<<
p
->
path
();
cout
<<
' '
<<
quote
(
p
->
path
()
)
;
// output RPath
// output RPath
if
(
rpath
)
{
if
(
rpath
)
{
...
@@ -263,9 +263,9 @@ protected:
...
@@ -263,9 +263,9 @@ protected:
if
(
!
rpaths
.
contains
(
rpath
))
{
if
(
!
rpaths
.
contains
(
rpath
))
{
rpaths
.
add
(
rpath
);
rpaths
.
add
(
rpath
);
if
(
make_app
)
if
(
make_app
)
cout
<<
" -Wl,-rpath -Wl,"
<<
rpath
;
cout
<<
" -Wl,-rpath
"
<<
quote
(
_
<<
"
-Wl,"
<<
rpath
)
;
else
else
cout
<<
" -Wl,-rpath -Wl,"
<<
rpath
;
cout
<<
" -Wl,-rpath
"
<<
quote
(
_
<<
"
-Wl,"
<<
rpath
)
;
}
}
}
}
}
}
...
@@ -276,6 +276,18 @@ protected:
...
@@ -276,6 +276,18 @@ protected:
private
:
private
:
/**
* Put quotes around text containing spaces or tabulations.
* @param s String to quote.
* @return Quoted string if needed.
*/
string
quote
(
string
s
)
{
for
(
auto
c
:
s
)
if
(
c
==
' '
||
c
==
'\r'
)
return
_
<<
'\''
<<
s
<<
'\''
;
return
s
;
}
/**
/**
* Lookup for a local plugin.
* Lookup for a local plugin.
* @param ppath Plugin path.
* @param ppath Plugin path.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment