From c642ef59cf9edd64426dccd32986501e59e2957a Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Wed, 23 Feb 2022 10:31:52 +0000 Subject: [PATCH] MC seems to just work on ARM now. Remove the forced compilation errors. todo: check if UnwindContext::get_reg needs tweaking, but all mc tests pass --- src/mc/inspect/mc_dwarf.cpp | 2 +- src/mc/inspect/mc_unw.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mc/inspect/mc_dwarf.cpp b/src/mc/inspect/mc_dwarf.cpp index c9360389b5..bf6862f0f3 100644 --- a/src/mc/inspect/mc_dwarf.cpp +++ b/src/mc/inspect/mc_dwarf.cpp @@ -1198,7 +1198,7 @@ namespace dwarf { */ int dwarf_register_to_libunwind(int dwarf_register) { -#if defined(__x86_64__) +#if defined(__x86_64__) || defined(__aarch64__) // It seems for this arch, DWARF and libunwind agree in the numbering: return dwarf_register; #elif defined(__i386__) diff --git a/src/mc/inspect/mc_unw.cpp b/src/mc/inspect/mc_unw.cpp index 8a25eecac7..753c948a33 100644 --- a/src/mc/inspect/mc_unw.cpp +++ b/src/mc/inspect/mc_unw.cpp @@ -228,7 +228,7 @@ void UnwindContext::initialize(simgrid::mc::RemoteProcess* process, unw_context_ // Take a copy of the context for our own purpose: this->unwind_context_ = *c; -#if SIMGRID_PROCESSOR_x86_64 || SIMGRID_PROCESSOR_i686 +#if SIMGRID_PROCESSOR_x86_64 || SIMGRID_PROCESSOR_i686 || defined(__aarch64__) #ifdef __linux__ // On x86_64, ucontext_t contains a pointer to itself for FP registers. // We don't really need support for FR registers as they are caller saved -- 2.20.1