Merge branch 'master' of github.com:mquinson/simgrid

[simgrid.git] / teshsuite / mc / dwarf_expression / dwarf_expression.cpp

diff --git a/teshsuite/mc/dwarf_expression/dwarf_expression.cpp b/teshsuite/mc/dwarf_expression/dwarf_expression.cpp
index afd40aa..5184e48 100644 (file)
--- a/teshsuite/mc/dwarf_expression/dwarf_expression.cpp
+++ b/teshsuite/mc/dwarf_expression/dwarf_expression.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014. The SimGrid Team.
+/* Copyright (c) 2014-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -12,8 +12,13 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "../src/mc/mc_private.h"
-#include "../src/mc/mc_object_info.h"
+#include "mc/mc_process.h"
+#include "mc/mc_private.h"
+#include "mc/mc_dwarf.hpp"
+
+#include "mc/Type.hpp"
+#include "mc/ObjectInformation.hpp"
+#include "mc/Variable.hpp"
 
 static simgrid::mc::Process* process;
 
@@ -21,7 +26,7 @@ static
 uintptr_t eval_binary_operation(mc_expression_state_t state, int op, uintptr_t a, uintptr_t b) {
   state->stack_size = 0;
 
-  Dwarf_Op ops[15];
+  simgrid::mc::DwarfInstruction ops[15];
   ops[0].atom = DW_OP_const8u;
   ops[0].number = a;
   ops[1].atom = DW_OP_const8u;
@@ -35,7 +40,7 @@ uintptr_t eval_binary_operation(mc_expression_state_t state, int op, uintptr_t a
 
 static
 void basic_test(mc_expression_state_t state) {
-  Dwarf_Op ops[60];
+  simgrid::mc::DwarfInstruction ops[60];
 
   uintptr_t a = rand();
   uintptr_t b = rand();
@@ -103,7 +108,7 @@ static
 void test_deref(mc_expression_state_t state) {
   uintptr_t foo = 42;
 
-  Dwarf_Op ops[60];
+  simgrid::mc::DwarfInstruction ops[60];
   ops[0].atom = DW_OP_const8u;
   ops[0].number = (uintptr_t) &foo;
   ops[1].atom = DW_OP_deref;