X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8d73e39d7ad879522cdb542e4ed69e2077a6f9e..ee045f4f1937caf0bfa24c09381ccea281300796:/testsuite/mc/dwarf_expression.c

diff --git a/testsuite/mc/dwarf_expression.c b/testsuite/mc/dwarf_expression.c
index 98ee29adb9..905f88aee8 100644
--- a/testsuite/mc/dwarf_expression.c
+++ b/testsuite/mc/dwarf_expression.c
@@ -1,3 +1,9 @@
+/* Copyright (c) 2014. 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. */
+
 #ifdef NDEBUG
 #undef NDEBUG
 #endif
@@ -13,9 +19,9 @@ uintptr_t eval_binary_operation(mc_expression_state_t state, int op, uintptr_t a
   state->stack_size = 0;
 
   Dwarf_Op ops[15];
-  ops[0].atom = DW_OP_addr;
+  ops[0].atom = DW_OP_const8u;
   ops[0].number = a;
-  ops[1].atom = DW_OP_addr;
+  ops[1].atom = DW_OP_const8u;
   ops[1].number = b;
   ops[2].atom = op;
 
@@ -39,7 +45,7 @@ void basic_test(mc_expression_state_t state) {
   assert(state->stack_size==1);
   assert(state->stack[state->stack_size-1]==21);
 
-  ops[0].atom = DW_OP_addr;
+  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);
@@ -58,7 +64,7 @@ void basic_test(mc_expression_state_t state) {
   assert(state->stack[state->stack_size-1]== a + 21);
 
   state->stack_size = 0;
-  ops[0].atom = DW_OP_addr;
+  ops[0].atom = DW_OP_const8u;
   ops[0].number = a;
   ops[1].atom = DW_OP_dup;
   ops[2].atom = DW_OP_plus;
@@ -67,9 +73,9 @@ void basic_test(mc_expression_state_t state) {
   assert(state->stack[state->stack_size-1]== a + a);
 
   state->stack_size = 0;
-  ops[0].atom = DW_OP_addr;
+  ops[0].atom = DW_OP_const8u;
   ops[0].number = a;
-  ops[1].atom = DW_OP_addr;
+  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);
@@ -79,9 +85,9 @@ void basic_test(mc_expression_state_t state) {
   assert(state->stack[state->stack_size-3]== a);
 
   state->stack_size = 0;
-  ops[0].atom = DW_OP_addr;
+  ops[0].atom = DW_OP_const8u;
   ops[0].number = a;
-  ops[1].atom = DW_OP_addr;
+  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);
@@ -95,8 +101,8 @@ void test_deref(mc_expression_state_t state) {
   uintptr_t foo = 42;
 
   Dwarf_Op ops[60];
-  ops[0].atom = DW_OP_addr;
-  ops[0].number = (Dwarf_Word) &foo;
+  ops[0].atom = DW_OP_const8u;
+  ops[0].number = (uintptr_t) &foo;
   ops[1].atom = DW_OP_deref;
   state->stack_size = 0;