X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b81d0b9c9c365d2b195c8a189e2315adbdaa6af6..30d60b272963b1b130ea80840af783ee9c146b97:/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 5184e48e4e..f059b2c058 100644
--- a/teshsuite/mc/dwarf_expression/dwarf_expression.cpp
+++ b/teshsuite/mc/dwarf_expression/dwarf_expression.cpp
@@ -12,147 +12,176 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "mc/mc_process.h"
-#include "mc/mc_private.h"
-#include "mc/mc_dwarf.hpp"
+#include "src/mc/mc_private.h"
 
-#include "mc/Type.hpp"
-#include "mc/ObjectInformation.hpp"
-#include "mc/Variable.hpp"
+#include "src/mc/Process.hpp"
+#include "src/mc/Type.hpp"
+#include "src/mc/ObjectInformation.hpp"
+#include "src/mc/Variable.hpp"
 
 static simgrid::mc::Process* process;
 
 static
-uintptr_t eval_binary_operation(mc_expression_state_t state, int op, uintptr_t a, uintptr_t b) {
-  state->stack_size = 0;
+uintptr_t eval_binary_operation(
+  simgrid::dwarf::ExpressionContext& state, int op, uintptr_t a, uintptr_t b) {
 
-  simgrid::mc::DwarfInstruction ops[15];
+  Dwarf_Op ops[15];
   ops[0].atom = DW_OP_const8u;
   ops[0].number = a;
   ops[1].atom = DW_OP_const8u;
   ops[1].number = b;
   ops[2].atom = op;
 
-  assert(mc_dwarf_execute_expression(3, ops, state) == MC_EXPRESSION_OK);
-  assert(state->stack_size==1);
-  return state->stack[state->stack_size - 1];
+  simgrid::dwarf::ExpressionStack stack;
+
+  try {
+    simgrid::dwarf::execute(ops, 3, state, stack);
+  }
+  catch(std::runtime_error& e) {
+    fprintf(stderr,"Expression evaluation error");
+  }
+
+  assert(stack.size() == 1);
+  return stack.top();
 }
 
 static
-void basic_test(mc_expression_state_t state) {
-  simgrid::mc::DwarfInstruction ops[60];
+void basic_test(simgrid::dwarf::ExpressionContext const& state) {
+  try {
+
+  Dwarf_Op ops[60];
 
   uintptr_t a = rand();
   uintptr_t b = rand();
 
-  ops[0].atom = DW_OP_drop;
-  assert(mc_dwarf_execute_expression(1, ops, state) == MC_EXPRESSION_E_STACK_UNDERFLOW);
+  simgrid::dwarf::ExpressionStack stack;
+
+  try {
+    ops[0].atom = DW_OP_drop;
+    simgrid::dwarf::execute(ops, 1, state, stack);
+    fprintf(stderr,"Exception expected");
+  }
+  catch(simgrid::dwarf::evaluation_error& e) {}
 
   ops[0].atom = DW_OP_lit21;
-  assert(mc_dwarf_execute_expression(1, ops, state) == MC_EXPRESSION_OK);
-  assert(state->stack_size==1);
-  assert(state->stack[state->stack_size-1]==21);
+  simgrid::dwarf::execute(ops, 1, state, stack);
+  assert(stack.size() == 1);
+  assert(stack.top() == 21);
 
   ops[0].atom = DW_OP_const8u;
   ops[0].number = a;
-  assert(mc_dwarf_execute_expression(1, ops, state) == MC_EXPRESSION_OK);
-  assert(state->stack_size==2);
-  assert(state->stack[state->stack_size-1] == a);
+  simgrid::dwarf::execute(ops, 1, state, stack);
+  assert(stack.size() == 2);
+  assert(stack.top() == a);
 
   ops[0].atom = DW_OP_drop;
   ops[1].atom = DW_OP_drop;
-  assert(mc_dwarf_execute_expression(2, ops, state) == MC_EXPRESSION_OK);
-  assert(state->stack_size==0);
+  simgrid::dwarf::execute(ops, 2, state, stack);
+  assert(stack.empty());
 
+  stack.clear();
   ops[0].atom = DW_OP_lit21;
   ops[1].atom = DW_OP_plus_uconst;
   ops[1].number = a;
-  assert(mc_dwarf_execute_expression(2, ops, state) == MC_EXPRESSION_OK);
-  assert(state->stack_size==1);
-  assert(state->stack[state->stack_size-1]== a + 21);
+  simgrid::dwarf::execute(ops, 2, state, stack);
+  assert(stack.size() == 1);
+  assert(stack.top() == a + 21);
 
-  state->stack_size = 0;
+  stack.clear();
   ops[0].atom = DW_OP_const8u;
   ops[0].number = a;
   ops[1].atom = DW_OP_dup;
   ops[2].atom = DW_OP_plus;
-  assert(mc_dwarf_execute_expression(3, ops, state) == MC_EXPRESSION_OK);
-  assert(state->stack_size==1);
-  assert(state->stack[state->stack_size-1]== a + a);
+  simgrid::dwarf::execute(ops, 3, state, stack);
+  assert(stack.size() == 1);
+  assert(stack.top() == a + a);
 
-  state->stack_size = 0;
+  stack.clear();
   ops[0].atom = DW_OP_const8u;
   ops[0].number = a;
   ops[1].atom = DW_OP_const8u;
   ops[1].number = b;
   ops[2].atom = DW_OP_over;
-  assert(mc_dwarf_execute_expression(3, ops, state) == MC_EXPRESSION_OK);
-  assert(state->stack_size==3);
-  assert(state->stack[state->stack_size-1]== a);
-  assert(state->stack[state->stack_size-2]== b);
-  assert(state->stack[state->stack_size-3]== a);
+  simgrid::dwarf::execute(ops, 3, state, stack);
+  assert(stack.size() == 3);
+  assert(stack.top()  == a);
+  assert(stack.top(1) == b);
+  assert(stack.top(2) == a);
 
-  state->stack_size = 0;
+  stack.clear();
   ops[0].atom = DW_OP_const8u;
   ops[0].number = a;
   ops[1].atom = DW_OP_const8u;
   ops[1].number = b;
   ops[2].atom = DW_OP_swap;
-  assert(mc_dwarf_execute_expression(3, ops, state) == MC_EXPRESSION_OK);
-  assert(state->stack_size=2);
-  assert(state->stack[state->stack_size-1]== a);
-  assert(state->stack[state->stack_size-2]== b);
+  simgrid::dwarf::execute(ops, 3, state, stack);
+  assert(stack.size() == 2);
+  assert(stack.top()  == a);
+  assert(stack.top(1) == b);
+
+  }
+  catch(std::runtime_error& e) {
+    fprintf(stderr,"Expression evaluation error");
+  }
 }
 
 static
-void test_deref(mc_expression_state_t state) {
+void test_deref(simgrid::dwarf::ExpressionContext const& state) {
+  try {
+
   uintptr_t foo = 42;
 
-  simgrid::mc::DwarfInstruction ops[60];
+  Dwarf_Op ops[60];
   ops[0].atom = DW_OP_const8u;
   ops[0].number = (uintptr_t) &foo;
   ops[1].atom = DW_OP_deref;
-  state->stack_size = 0;
 
-  assert(mc_dwarf_execute_expression(2, ops, state) == MC_EXPRESSION_OK);
-  assert(state->stack_size==1);
-  assert(state->stack[state->stack_size-1] == foo);
+  simgrid::dwarf::ExpressionStack stack;
+
+  simgrid::dwarf::execute(ops, 2, state, stack);
+  assert(stack.size() == 1);
+  assert(stack.top()  == foo);
+
+  }
+  catch(std::runtime_error& e) {
+    fprintf(stderr,"Expression evaluation error");
+  }
 }
 
 int main(int argc, char** argv) {
   process = new simgrid::mc::Process(getpid(), -1);
+  process->init();
 
-  s_mc_expression_state_t state;
-  memset(&state, 0, sizeof(s_mc_expression_state_t));
+  simgrid::dwarf::ExpressionContext state;
   state.address_space = (simgrid::mc::AddressSpace*) process;
 
-  basic_test(&state);
+  basic_test(state);
 
   for(int i=0; i!=100; ++i) {
     uintptr_t a = rand();
     uintptr_t b = rand();
-    assert(eval_binary_operation(&state, DW_OP_plus, a, b) == (a + b));
+    assert(eval_binary_operation(state, DW_OP_plus, a, b) == (a + b));
   }
 
   for(int i=0; i!=100; ++i) {
     uintptr_t a = rand();
     uintptr_t b = rand();
-    assert(eval_binary_operation(&state, DW_OP_or, a, b) == (a | b));
+    assert(eval_binary_operation(state, DW_OP_or, a, b) == (a | b));
   }
 
   for(int i=0; i!=100; ++i) {
     uintptr_t a = rand();
     uintptr_t b = rand();
-    assert(eval_binary_operation(&state, DW_OP_and, a, b) == (a & b));
+    assert(eval_binary_operation(state, DW_OP_and, a, b) == (a & b));
   }
 
   for(int i=0; i!=100; ++i) {
     uintptr_t a = rand();
     uintptr_t b = rand();
-    assert(eval_binary_operation(&state, DW_OP_xor, a, b) == (a ^ b));
+    assert(eval_binary_operation(state, DW_OP_xor, a, b) == (a ^ b));
   }
 
-  test_deref(&state);
+  test_deref(state);
 
   return 0;
 }