-/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2023. 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. */
#include "src/mc/inspect/mc_dwarf.hpp"
#include "xbt/asserts.h"
+#include "xbt/log.h"
#include "xbt/sysdep.h"
#include <cstddef>
#include <libunwind.h>
#include <utility>
-namespace simgrid {
-namespace dwarf {
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(mc_dwarf);
+
+namespace simgrid::dwarf {
/** Resolve a location expression */
Location resolve(simgrid::dwarf::DwarfExpression const& expression, simgrid::mc::ObjectInformation* object_info,
unw_cursor_t* c, void* frame_pointer_address, const simgrid::mc::AddressSpace* address_space)
{
unw_word_t ip = 0;
- if (c && unw_get_reg(c, UNW_REG_IP, &ip))
- xbt_die("Could not resolve IP");
+ if (c)
+ xbt_assert(unw_get_reg(c, UNW_REG_IP, &ip) == 0, "Could not resolve IP");
simgrid::dwarf::DwarfExpression const* expression = find_expression(locations, ip);
- if (not expression)
- xbt_die("Could not resolve location");
+ xbt_assert(expression != nullptr, "Could not resolve location");
return simgrid::dwarf::resolve(*expression, object_info, c, frame_pointer_address, address_space);
}
offset = dwarf_getlocations(&attr, offset, &base, &start, &end, &ops, &len);
- if (offset == 0)
+ if (offset == -1)
+ XBT_WARN("Error while loading location list: %s", dwarf_errmsg(-1));
+ if (offset <= 0)
break;
- else if (offset == -1)
- xbt_die("Error while loading location list");
auto base_address = reinterpret_cast<std::uint64_t>(info.base_address());
return locations;
}
-} // namespace dwarf
-} // namespace simgrid
+} // namespace simgrid::dwarf