A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
try to make Engine::on_config_in_platform_done() useless my better placing Engine...
[simgrid.git]
/
src
/
mc
/
Frame.cpp
diff --git
a/src/mc/Frame.cpp
b/src/mc/Frame.cpp
index
5a114d8
..
3481748
100644
(file)
--- a/
src/mc/Frame.cpp
+++ b/
src/mc/Frame.cpp
@@
-1,9
+1,13
@@
-/* Copyright (c) 2007-201
5
. The SimGrid Team.
+/* Copyright (c) 2007-201
8
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#include <libunwind.h>
+
+#include "xbt/sysdep.h"
+
#include "src/mc/Frame.hpp"
namespace simgrid {
#include "src/mc/Frame.hpp"
namespace simgrid {
@@
-13,13
+17,13
@@
void* Frame::frame_base(unw_cursor_t& unw_cursor) const
{
simgrid::dwarf::Location location = simgrid::dwarf::resolve(
frame_base_location, object_info,
{
simgrid::dwarf::Location location = simgrid::dwarf::resolve(
frame_base_location, object_info,
- &unw_cursor,
NULL, NULL
, -1);
+ &unw_cursor,
nullptr, nullptr
, -1);
if (location.in_memory())
return location.address();
else if (location.in_register()) {
// This is a special case.
if (location.in_memory())
return location.address();
else if (location.in_register()) {
// This is a special case.
- // The register i
f
not the location of the frame base
- // (a frame base cannot be located in a register)
+ // The register i
s
not the location of the frame base
+ // (a frame base cannot be located in a register)
.
// Instead, DWARF defines this to mean that the register
// contains the address of the frame base.
unw_word_t word;
// Instead, DWARF defines this to mean that the register
// contains the address of the frame base.
unw_word_t word;
@@
-30,4
+34,4
@@
void* Frame::frame_base(unw_cursor_t& unw_cursor) const
}
}
}
}
-}
\ No newline at end of file
+}