commit 688e4dfc51c7c1789473e37dd7a29bc455543901
author Yabin Cui <yabinc@google.com> Thu Jun 22 22:06:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 22 22:06:57 2017 +0000
tree b3ed0d5d8e6799ce0733cae9bb6b551856c7c907
parent 9820d0fdcbcf55e94ae7feb379a0aac59d94c775
parent 1815f49dee4f119d8f35b48b04099abb42b717e9

Merge "simpleperf: fix x86 register dump on x86_64." am: 5abacf3bcf
am: 1815f49dee

Change-Id: Ic4eac31d6bde6001e6beb5664b28de25bce3c96c

simpleperf/perf_regs.cpp

diff --git a/simpleperf/perf_regs.cpp b/simpleperf/perf_regs.cpp
index d27b62a..6aa8bad 100644
--- a/simpleperf/perf_regs.cpp
+++ b/simpleperf/perf_regs.cpp
@@ -99,7 +99,8 @@
 uint64_t GetSupportedRegMask(ArchType arch) {
   switch (arch) {
     case ARCH_X86_32:
-      return ((1ULL << PERF_REG_X86_32_MAX) - 1);
+      return ((1ULL << PERF_REG_X86_32_MAX) - 1) & ~(1ULL << PERF_REG_X86_DS) &
+          ~(1ULL << PERF_REG_X86_ES) & ~(1ULL << PERF_REG_X86_FS) & ~(1ULL << PERF_REG_X86_GS);
     case ARCH_X86_64:
       return (((1ULL << PERF_REG_X86_64_MAX) - 1) & ~(1ULL << PERF_REG_X86_DS) &
               ~(1ULL << PERF_REG_X86_ES) & ~(1ULL << PERF_REG_X86_FS) & ~(1ULL << PERF_REG_X86_GS));