From 97cc0fc3eb2ed9773ecd1d612da40bee60727b32 Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Thu, 17 Sep 2015 14:29:52 +0200 Subject: [PATCH 1/1] [mc] Remove remaining bits of libdw outside of mc_libdw.{h,c}pp --- src/mc/mc_dwarf_expression.cpp | 7 ++++--- src/mc/mc_libdw.cpp | 1 + src/mc/mc_location.h | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mc/mc_dwarf_expression.cpp b/src/mc/mc_dwarf_expression.cpp index 5f9e1622cf..bf8003730b 100644 --- a/src/mc/mc_dwarf_expression.cpp +++ b/src/mc/mc_dwarf_expression.cpp @@ -4,11 +4,12 @@ /* 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. */ +#include + #include #include #include -#include #include "mc_dwarf.hpp" #include "mc_private.h" @@ -21,7 +22,7 @@ using simgrid::mc::remote; extern "C" { -static int mc_dwarf_push_value(mc_expression_state_t state, Dwarf_Off value) +static int mc_dwarf_push_value(mc_expression_state_t state, std::uint64_t value) { if (state->stack_size >= MC_EXPRESSION_STACK_SIZE) return MC_EXPRESSION_E_STACK_OVERFLOW; @@ -233,7 +234,7 @@ int mc_dwarf_execute_expression(size_t n, const simgrid::mc::DwarfInstruction* o return MC_EXPRESSION_E_NO_BASE_ADDRESS; if (state->stack_size == MC_EXPRESSION_STACK_SIZE) return MC_EXPRESSION_E_STACK_OVERFLOW; - Dwarf_Off addr = (Dwarf_Off) (uintptr_t) + std::uint64_t addr = (std::uint64_t) (uintptr_t) state->object_info->base_address() + op->number; error = mc_dwarf_push_value(state, addr); break; diff --git a/src/mc/mc_libdw.cpp b/src/mc/mc_libdw.cpp index 1f04ca04ec..7c589bd6f8 100644 --- a/src/mc/mc_libdw.cpp +++ b/src/mc/mc_libdw.cpp @@ -12,6 +12,7 @@ #include #include +#include #include diff --git a/src/mc/mc_location.h b/src/mc/mc_location.h index 051a56fa02..0143f2d3da 100644 --- a/src/mc/mc_location.h +++ b/src/mc/mc_location.h @@ -13,7 +13,6 @@ #include #include -#include #include #include "mc_base.h" -- 2.20.1