diff options
| author | Christopher Ferris <cferris@google.com> | 2018-03-15 14:35:01 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2018-03-15 15:14:18 -0700 |
| commit | 704ec9adbac6f7f265afe0d727e685b92f7726d0 (patch) | |
| tree | 66acabd364033fe0b10745a678ca7eadc283063d /libunwindstack/tests/UnwindOfflineTest.cpp | |
| parent | 39273df6516a990f593d89d6259cc89ac6bbecbd (diff) | |
| download | system_core-704ec9adbac6f7f265afe0d727e685b92f7726d0.tar.gz system_core-704ec9adbac6f7f265afe0d727e685b92f7726d0.tar.bz2 system_core-704ec9adbac6f7f265afe0d727e685b92f7726d0.zip | |
Handle ARM thumb function symbols.
ARM thumb functions will have the zero bit set to one, which can cause
function name lookups to fail.
Add an ARM special GetFunctionName that handles this condition.
Fix a couple of the function offsets in unit tests.
Bug: 74844137
Test: Ran unit tests.
Test: Ran debuggerd -b on processes on a bullhead device.
Change-Id: Ibd407db34eaaa641f91fdb4f589c44a0dcc0216a
Diffstat (limited to 'libunwindstack/tests/UnwindOfflineTest.cpp')
| -rw-r--r-- | libunwindstack/tests/UnwindOfflineTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libunwindstack/tests/UnwindOfflineTest.cpp b/libunwindstack/tests/UnwindOfflineTest.cpp index af4a5b59e..515bc8cc7 100644 --- a/libunwindstack/tests/UnwindOfflineTest.cpp +++ b/libunwindstack/tests/UnwindOfflineTest.cpp @@ -188,7 +188,7 @@ TEST_F(UnwindOfflineTest, pc_straddle_arm) { std::string frame_info(DumpFrames(unwinder)); ASSERT_EQ(4U, unwinder.NumFrames()) << "Unwind:\n" << frame_info; EXPECT_EQ( - " #00 pc 0001a9f8 libc.so (abort+63)\n" + " #00 pc 0001a9f8 libc.so (abort+64)\n" " #01 pc 00006a1b libbase.so (_ZN7android4base14DefaultAborterEPKc+6)\n" " #02 pc 00007441 libbase.so (_ZN7android4base10LogMessageD2Ev+748)\n" " #03 pc 00015147 /does/not/exist/libhidlbase.so\n", @@ -575,7 +575,7 @@ TEST_F(UnwindOfflineTest, jit_debug_arm) { std::string frame_info(DumpFrames(unwinder)); ASSERT_EQ(76U, unwinder.NumFrames()) << "Unwind:\n" << frame_info; EXPECT_EQ( - " #00 pc 00018a5e libarttestd.so (Java_Main_unwindInProcess+865)\n" + " #00 pc 00018a5e libarttestd.so (Java_Main_unwindInProcess+866)\n" " #01 pc 0000212d (offset 0x2000) 137-cfi.odex (boolean Main.unwindInProcess(boolean, int, " "boolean)+92)\n" " #02 pc 00011cb1 anonymous:e2796000 (boolean Main.bar(boolean)+72)\n" |