another bunch of cleanups

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

diff --git a/src/mc/inspect/DwarfExpression.cpp b/src/mc/inspect/DwarfExpression.cpp
index 42f590e..4c15f5b 100644 (file)
--- a/src/mc/inspect/DwarfExpression.cpp
+++ b/src/mc/inspect/DwarfExpression.cpp
@@ -7,11 +7,11 @@
 #include <cstdint>
 
 #include "src/mc/AddressSpace.hpp"
-#include "src/mc/DwarfExpression.hpp"
-#include "src/mc/Frame.hpp"
-#include "src/mc/LocationList.hpp"
-#include "src/mc/ObjectInformation.hpp"
-#include "src/mc/mc_dwarf.hpp"
+#include "src/mc/inspect/DwarfExpression.hpp"
+#include "src/mc/inspect/Frame.hpp"
+#include "src/mc/inspect/LocationList.hpp"
+#include "src/mc/inspect/ObjectInformation.hpp"
+#include "src/mc/inspect/mc_dwarf.hpp"
 #include "src/mc/mc_private.hpp"
 
 using simgrid::mc::remote;
@@ -28,9 +28,7 @@ void execute(const Dwarf_Op* ops, std::size_t n, const ExpressionContext& contex
     intptr_t second;
 
     switch (atom) {
-
         // Registers:
-
       case DW_OP_breg0:
       case DW_OP_breg1:
       case DW_OP_breg2:
@@ -256,7 +254,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.process_index);
+        context.address_space->read_bytes(&stack.top(), sizeof(uintptr_t), remote(stack.top()));
         break;
 
         // Not handled: