Merge branch 'master' of framagit.org:simgrid/simgrid

[simgrid.git] / src / mc / inspect / DwarfExpression.cpp

diff --git a/src/mc/inspect/DwarfExpression.cpp b/src/mc/inspect/DwarfExpression.cpp
index 0963f8a..2e74410 100644 (file)
--- a/src/mc/inspect/DwarfExpression.cpp
+++ b/src/mc/inspect/DwarfExpression.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2014-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. */
@@ -15,10 +15,7 @@
 #include "src/mc/inspect/mc_dwarf.hpp"
 #include "src/mc/mc_private.hpp"
 
-using simgrid::mc::remote;
-
-namespace simgrid {
-namespace dwarf {
+namespace simgrid::dwarf {
 
 void execute(const Dwarf_Op* ops, std::size_t n, const ExpressionContext& context, ExpressionStack& stack)
 {
@@ -155,7 +152,7 @@ void execute(const Dwarf_Op* ops, std::size_t n, const ExpressionContext& contex
         // Computed address:
         if (not context.address_space)
           throw evaluation_error("Missing address space");
-        context.address_space->read_bytes(&stack.top(), sizeof(uintptr_t), remote(stack.top()));
+        context.address_space->read_bytes(&stack.top(), sizeof(uintptr_t), mc::remote(stack.top()));
         break;
 
       default:
@@ -169,7 +166,7 @@ void execute(const Dwarf_Op* ops, std::size_t n, const ExpressionContext& contex
                  DW_OP_breg28, DW_OP_breg29, DW_OP_breg30, DW_OP_breg31};
             registers.count(atom) > 0) {
           // Push register + constant:
-          int register_id = simgrid::dwarf::dwarf_register_to_libunwind(op->atom - DW_OP_breg0);
+          int register_id = dwarf_register_to_libunwind(op->atom - DW_OP_breg0);
           unw_word_t res;
           if (not context.cursor)
             throw evaluation_error("Missing stack context");
@@ -212,5 +209,4 @@ void execute(const Dwarf_Op* ops, std::size_t n, const ExpressionContext& contex
   }
 }
 
-} // namespace dwarf
-} // namespace simgrid
+} // namespace simgrid::dwarf