Merge "Add __s32 define."

[android-x86/system-extras.git] / simpleperf / dwarf_unwind.cpp

diff --git a/simpleperf/dwarf_unwind.cpp b/simpleperf/dwarf_unwind.cpp
index cd51a13..fd84feb 100644 (file)
--- a/simpleperf/dwarf_unwind.cpp
+++ b/simpleperf/dwarf_unwind.cpp
@@ -19,16 +19,16 @@
 #include <ucontext.h>
 
 #include <backtrace/Backtrace.h>
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 #include "thread_tree.h"
 
-#define SetUContextReg(dst, perf_regno) \
-  do { \
-    uint64_t value; \
+#define SetUContextReg(dst, perf_regno)          \
+  do {                                           \
+    uint64_t value;                              \
     if (GetRegValue(regs, perf_regno, &value)) { \
-      dst = value; \
-    } \
+      dst = value;                               \
+    }                                            \
   } while (0)
 
 static ucontext_t BuildUContextFromRegs(const RegSet& regs __attribute__((unused))) {
@@ -94,8 +94,7 @@ static ucontext_t BuildUContextFromRegs(const RegSet& regs __attribute__((unused
   return ucontext;
 }
 
-std::vector<uint64_t> UnwindCallChain(const ThreadEntry& thread,
-                                      const RegSet& regs,
+std::vector<uint64_t> UnwindCallChain(const ThreadEntry& thread, const RegSet& regs,
                                       const std::vector<char>& stack) {
   std::vector<uint64_t> result;
   if (GetCurrentArch() != GetBuildArch()) {