diff options
Diffstat (limited to 'libunwindstack/tests')
-rw-r--r-- | libunwindstack/tests/DexFileTest.cpp | 45 | ||||
-rw-r--r-- | libunwindstack/tests/RegsFake.h | 3 | ||||
-rw-r--r-- | libunwindstack/tests/RegsTest.cpp | 159 | ||||
-rw-r--r-- | libunwindstack/tests/UnwinderTest.cpp | 44 |
4 files changed, 137 insertions, 114 deletions
diff --git a/libunwindstack/tests/DexFileTest.cpp b/libunwindstack/tests/DexFileTest.cpp index 1b54da6fb..dc935a36e 100644 --- a/libunwindstack/tests/DexFileTest.cpp +++ b/libunwindstack/tests/DexFileTest.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#include <malloc.h> #include <stdint.h> #include <sys/types.h> #include <unistd.h> @@ -72,6 +73,37 @@ TEST(DexFileTest, from_file_open_non_zero_offset) { EXPECT_TRUE(DexFileFromFile::Create(0x100, tf.path) != nullptr); } +static constexpr size_t kNumLeakLoops = 5000; +static constexpr size_t kMaxAllowedLeakBytes = 1024; + +static void CheckForLeak(size_t loop, size_t* first_allocated_bytes, size_t* last_allocated_bytes) { + size_t allocated_bytes = mallinfo().uordblks; + if (*first_allocated_bytes == 0) { + *first_allocated_bytes = allocated_bytes; + } else if (*last_allocated_bytes > *first_allocated_bytes) { + // Check that the total memory did not increase too much over the first loop. + ASSERT_LE(*last_allocated_bytes - *first_allocated_bytes, kMaxAllowedLeakBytes) + << "Failed in loop " << loop << " first_allocated_bytes " << *first_allocated_bytes + << " last_allocated_bytes " << *last_allocated_bytes; + } + *last_allocated_bytes = allocated_bytes; +} + +TEST(DexFileTest, from_file_no_leak) { + TemporaryFile tf; + ASSERT_TRUE(tf.fd != -1); + + ASSERT_EQ(sizeof(kDexData), + static_cast<size_t>(TEMP_FAILURE_RETRY(write(tf.fd, kDexData, sizeof(kDexData))))); + + size_t first_allocated_bytes = 0; + size_t last_allocated_bytes = 0; + for (size_t i = 0; i < kNumLeakLoops; i++) { + EXPECT_TRUE(DexFileFromFile::Create(0, tf.path) != nullptr); + ASSERT_NO_FATAL_FAILURE(CheckForLeak(i, &first_allocated_bytes, &last_allocated_bytes)); + } +} + TEST(DexFileTest, from_memory_fail_too_small_for_header) { MemoryFake memory; @@ -96,6 +128,19 @@ TEST(DexFileTest, from_memory_open) { EXPECT_TRUE(DexFileFromMemory::Create(0x1000, &memory, "") != nullptr); } +TEST(DexFileTest, from_memory_no_leak) { + MemoryFake memory; + + memory.SetMemory(0x1000, kDexData, sizeof(kDexData)); + + size_t first_allocated_bytes = 0; + size_t last_allocated_bytes = 0; + for (size_t i = 0; i < kNumLeakLoops; i++) { + EXPECT_TRUE(DexFileFromMemory::Create(0x1000, &memory, "") != nullptr); + ASSERT_NO_FATAL_FAILURE(CheckForLeak(i, &first_allocated_bytes, &last_allocated_bytes)); + } +} + TEST(DexFileTest, create_using_file) { TemporaryFile tf; ASSERT_TRUE(tf.fd != -1); diff --git a/libunwindstack/tests/RegsFake.h b/libunwindstack/tests/RegsFake.h index 207d46efe..75fc9d02d 100644 --- a/libunwindstack/tests/RegsFake.h +++ b/libunwindstack/tests/RegsFake.h @@ -54,8 +54,6 @@ class RegsFake : public Regs { return fake_arch_ == ARCH_ARM || fake_arch_ == ARCH_X86 || fake_arch_ == ARCH_MIPS; } - uint64_t GetPcAdjustment(uint64_t, Elf*) override { return 2; } - bool StepIfSignalHandler(uint64_t, Elf*, Memory*) override { return false; } void FakeSetArch(ArchEnum arch) { fake_arch_ = arch; } @@ -86,7 +84,6 @@ class RegsImplFake : public RegsImpl<TypeParam> { void set_pc(uint64_t pc) override { fake_pc_ = pc; } void set_sp(uint64_t sp) override { fake_sp_ = sp; } - uint64_t GetPcAdjustment(uint64_t, Elf*) override { return 0; } bool SetPcFromReturnAddress(Memory*) override { return false; } bool StepIfSignalHandler(uint64_t, Elf*, Memory*) override { return false; } diff --git a/libunwindstack/tests/RegsTest.cpp b/libunwindstack/tests/RegsTest.cpp index 0a33e2ff4..e4fc6f070 100644 --- a/libunwindstack/tests/RegsTest.cpp +++ b/libunwindstack/tests/RegsTest.cpp @@ -93,123 +93,104 @@ TEST_F(RegsTest, regs64) { } TEST_F(RegsTest, rel_pc) { - RegsArm64 arm64; - EXPECT_EQ(4U, arm64.GetPcAdjustment(0x10, elf_.get())); - EXPECT_EQ(4U, arm64.GetPcAdjustment(0x4, elf_.get())); - EXPECT_EQ(0U, arm64.GetPcAdjustment(0x3, elf_.get())); - EXPECT_EQ(0U, arm64.GetPcAdjustment(0x2, elf_.get())); - EXPECT_EQ(0U, arm64.GetPcAdjustment(0x1, elf_.get())); - EXPECT_EQ(0U, arm64.GetPcAdjustment(0x0, elf_.get())); - - RegsX86 x86; - EXPECT_EQ(1U, x86.GetPcAdjustment(0x100, elf_.get())); - EXPECT_EQ(1U, x86.GetPcAdjustment(0x2, elf_.get())); - EXPECT_EQ(1U, x86.GetPcAdjustment(0x1, elf_.get())); - EXPECT_EQ(0U, x86.GetPcAdjustment(0x0, elf_.get())); - - RegsX86_64 x86_64; - EXPECT_EQ(1U, x86_64.GetPcAdjustment(0x100, elf_.get())); - EXPECT_EQ(1U, x86_64.GetPcAdjustment(0x2, elf_.get())); - EXPECT_EQ(1U, x86_64.GetPcAdjustment(0x1, elf_.get())); - EXPECT_EQ(0U, x86_64.GetPcAdjustment(0x0, elf_.get())); - - RegsMips mips; - EXPECT_EQ(8U, mips.GetPcAdjustment(0x10, elf_.get())); - EXPECT_EQ(8U, mips.GetPcAdjustment(0x8, elf_.get())); - EXPECT_EQ(0U, mips.GetPcAdjustment(0x7, elf_.get())); - EXPECT_EQ(0U, mips.GetPcAdjustment(0x6, elf_.get())); - EXPECT_EQ(0U, mips.GetPcAdjustment(0x5, elf_.get())); - EXPECT_EQ(0U, mips.GetPcAdjustment(0x4, elf_.get())); - EXPECT_EQ(0U, mips.GetPcAdjustment(0x3, elf_.get())); - EXPECT_EQ(0U, mips.GetPcAdjustment(0x2, elf_.get())); - EXPECT_EQ(0U, mips.GetPcAdjustment(0x1, elf_.get())); - EXPECT_EQ(0U, mips.GetPcAdjustment(0x0, elf_.get())); - - RegsMips64 mips64; - EXPECT_EQ(8U, mips64.GetPcAdjustment(0x10, elf_.get())); - EXPECT_EQ(8U, mips64.GetPcAdjustment(0x8, elf_.get())); - EXPECT_EQ(0U, mips64.GetPcAdjustment(0x7, elf_.get())); - EXPECT_EQ(0U, mips64.GetPcAdjustment(0x6, elf_.get())); - EXPECT_EQ(0U, mips64.GetPcAdjustment(0x5, elf_.get())); - EXPECT_EQ(0U, mips64.GetPcAdjustment(0x4, elf_.get())); - EXPECT_EQ(0U, mips64.GetPcAdjustment(0x3, elf_.get())); - EXPECT_EQ(0U, mips64.GetPcAdjustment(0x2, elf_.get())); - EXPECT_EQ(0U, mips64.GetPcAdjustment(0x1, elf_.get())); - EXPECT_EQ(0U, mips64.GetPcAdjustment(0x0, elf_.get())); + EXPECT_EQ(4U, GetPcAdjustment(0x10, elf_.get(), ARCH_ARM64)); + EXPECT_EQ(4U, GetPcAdjustment(0x4, elf_.get(), ARCH_ARM64)); + EXPECT_EQ(0U, GetPcAdjustment(0x3, elf_.get(), ARCH_ARM64)); + EXPECT_EQ(0U, GetPcAdjustment(0x2, elf_.get(), ARCH_ARM64)); + EXPECT_EQ(0U, GetPcAdjustment(0x1, elf_.get(), ARCH_ARM64)); + EXPECT_EQ(0U, GetPcAdjustment(0x0, elf_.get(), ARCH_ARM64)); + + EXPECT_EQ(1U, GetPcAdjustment(0x100, elf_.get(), ARCH_X86)); + EXPECT_EQ(1U, GetPcAdjustment(0x2, elf_.get(), ARCH_X86)); + EXPECT_EQ(1U, GetPcAdjustment(0x1, elf_.get(), ARCH_X86)); + EXPECT_EQ(0U, GetPcAdjustment(0x0, elf_.get(), ARCH_X86)); + + EXPECT_EQ(1U, GetPcAdjustment(0x100, elf_.get(), ARCH_X86_64)); + EXPECT_EQ(1U, GetPcAdjustment(0x2, elf_.get(), ARCH_X86_64)); + EXPECT_EQ(1U, GetPcAdjustment(0x1, elf_.get(), ARCH_X86_64)); + EXPECT_EQ(0U, GetPcAdjustment(0x0, elf_.get(), ARCH_X86_64)); + + EXPECT_EQ(8U, GetPcAdjustment(0x10, elf_.get(), ARCH_MIPS)); + EXPECT_EQ(8U, GetPcAdjustment(0x8, elf_.get(), ARCH_MIPS)); + EXPECT_EQ(0U, GetPcAdjustment(0x7, elf_.get(), ARCH_MIPS)); + EXPECT_EQ(0U, GetPcAdjustment(0x6, elf_.get(), ARCH_MIPS)); + EXPECT_EQ(0U, GetPcAdjustment(0x5, elf_.get(), ARCH_MIPS)); + EXPECT_EQ(0U, GetPcAdjustment(0x4, elf_.get(), ARCH_MIPS)); + EXPECT_EQ(0U, GetPcAdjustment(0x3, elf_.get(), ARCH_MIPS)); + EXPECT_EQ(0U, GetPcAdjustment(0x2, elf_.get(), ARCH_MIPS)); + EXPECT_EQ(0U, GetPcAdjustment(0x1, elf_.get(), ARCH_MIPS)); + EXPECT_EQ(0U, GetPcAdjustment(0x0, elf_.get(), ARCH_MIPS)); + + EXPECT_EQ(8U, GetPcAdjustment(0x10, elf_.get(), ARCH_MIPS64)); + EXPECT_EQ(8U, GetPcAdjustment(0x8, elf_.get(), ARCH_MIPS64)); + EXPECT_EQ(0U, GetPcAdjustment(0x7, elf_.get(), ARCH_MIPS64)); + EXPECT_EQ(0U, GetPcAdjustment(0x6, elf_.get(), ARCH_MIPS64)); + EXPECT_EQ(0U, GetPcAdjustment(0x5, elf_.get(), ARCH_MIPS64)); + EXPECT_EQ(0U, GetPcAdjustment(0x4, elf_.get(), ARCH_MIPS64)); + EXPECT_EQ(0U, GetPcAdjustment(0x3, elf_.get(), ARCH_MIPS64)); + EXPECT_EQ(0U, GetPcAdjustment(0x2, elf_.get(), ARCH_MIPS64)); + EXPECT_EQ(0U, GetPcAdjustment(0x1, elf_.get(), ARCH_MIPS64)); + EXPECT_EQ(0U, GetPcAdjustment(0x0, elf_.get(), ARCH_MIPS64)); } TEST_F(RegsTest, rel_pc_arm) { - RegsArm arm; - // Check fence posts. elf_->FakeSetLoadBias(0); - EXPECT_EQ(2U, arm.GetPcAdjustment(0x5, elf_.get())); - EXPECT_EQ(2U, arm.GetPcAdjustment(0x4, elf_.get())); - EXPECT_EQ(2U, arm.GetPcAdjustment(0x3, elf_.get())); - EXPECT_EQ(2U, arm.GetPcAdjustment(0x2, elf_.get())); - EXPECT_EQ(0U, arm.GetPcAdjustment(0x1, elf_.get())); - EXPECT_EQ(0U, arm.GetPcAdjustment(0x0, elf_.get())); + EXPECT_EQ(2U, GetPcAdjustment(0x5, elf_.get(), ARCH_ARM)); + EXPECT_EQ(2U, GetPcAdjustment(0x4, elf_.get(), ARCH_ARM)); + EXPECT_EQ(2U, GetPcAdjustment(0x3, elf_.get(), ARCH_ARM)); + EXPECT_EQ(2U, GetPcAdjustment(0x2, elf_.get(), ARCH_ARM)); + EXPECT_EQ(0U, GetPcAdjustment(0x1, elf_.get(), ARCH_ARM)); + EXPECT_EQ(0U, GetPcAdjustment(0x0, elf_.get(), ARCH_ARM)); elf_->FakeSetLoadBias(0x100); - EXPECT_EQ(0U, arm.GetPcAdjustment(0x1, elf_.get())); - EXPECT_EQ(2U, arm.GetPcAdjustment(0x2, elf_.get())); - EXPECT_EQ(2U, arm.GetPcAdjustment(0xff, elf_.get())); - EXPECT_EQ(2U, arm.GetPcAdjustment(0x105, elf_.get())); - EXPECT_EQ(2U, arm.GetPcAdjustment(0x104, elf_.get())); - EXPECT_EQ(2U, arm.GetPcAdjustment(0x103, elf_.get())); - EXPECT_EQ(2U, arm.GetPcAdjustment(0x102, elf_.get())); - EXPECT_EQ(0U, arm.GetPcAdjustment(0x101, elf_.get())); - EXPECT_EQ(0U, arm.GetPcAdjustment(0x100, elf_.get())); + EXPECT_EQ(0U, GetPcAdjustment(0x1, elf_.get(), ARCH_ARM)); + EXPECT_EQ(2U, GetPcAdjustment(0x2, elf_.get(), ARCH_ARM)); + EXPECT_EQ(2U, GetPcAdjustment(0xff, elf_.get(), ARCH_ARM)); + EXPECT_EQ(2U, GetPcAdjustment(0x105, elf_.get(), ARCH_ARM)); + EXPECT_EQ(2U, GetPcAdjustment(0x104, elf_.get(), ARCH_ARM)); + EXPECT_EQ(2U, GetPcAdjustment(0x103, elf_.get(), ARCH_ARM)); + EXPECT_EQ(2U, GetPcAdjustment(0x102, elf_.get(), ARCH_ARM)); + EXPECT_EQ(0U, GetPcAdjustment(0x101, elf_.get(), ARCH_ARM)); + EXPECT_EQ(0U, GetPcAdjustment(0x100, elf_.get(), ARCH_ARM)); // Check thumb instructions handling. elf_->FakeSetLoadBias(0); memory_->SetData32(0x2000, 0); - EXPECT_EQ(2U, arm.GetPcAdjustment(0x2005, elf_.get())); + EXPECT_EQ(2U, GetPcAdjustment(0x2005, elf_.get(), ARCH_ARM)); memory_->SetData32(0x2000, 0xe000f000); - EXPECT_EQ(4U, arm.GetPcAdjustment(0x2005, elf_.get())); + EXPECT_EQ(4U, GetPcAdjustment(0x2005, elf_.get(), ARCH_ARM)); elf_->FakeSetLoadBias(0x400); memory_->SetData32(0x2100, 0); - EXPECT_EQ(2U, arm.GetPcAdjustment(0x2505, elf_.get())); + EXPECT_EQ(2U, GetPcAdjustment(0x2505, elf_.get(), ARCH_ARM)); memory_->SetData32(0x2100, 0xf111f111); - EXPECT_EQ(4U, arm.GetPcAdjustment(0x2505, elf_.get())); + EXPECT_EQ(4U, GetPcAdjustment(0x2505, elf_.get(), ARCH_ARM)); } TEST_F(RegsTest, elf_invalid) { - RegsArm regs_arm; - RegsArm64 regs_arm64; - RegsX86 regs_x86; - RegsX86_64 regs_x86_64; - RegsMips regs_mips; - RegsMips64 regs_mips64; MapInfo map_info(nullptr, nullptr, 0x1000, 0x2000, 0, 0, ""); Elf* invalid_elf = new Elf(nullptr); map_info.elf.reset(invalid_elf); - regs_arm.set_pc(0x1500); - EXPECT_EQ(0x500U, invalid_elf->GetRelPc(regs_arm.pc(), &map_info)); - EXPECT_EQ(2U, regs_arm.GetPcAdjustment(0x500U, invalid_elf)); - EXPECT_EQ(2U, regs_arm.GetPcAdjustment(0x511U, invalid_elf)); + EXPECT_EQ(0x500U, invalid_elf->GetRelPc(0x1500, &map_info)); + EXPECT_EQ(2U, GetPcAdjustment(0x500U, invalid_elf, ARCH_ARM)); + EXPECT_EQ(2U, GetPcAdjustment(0x511U, invalid_elf, ARCH_ARM)); - regs_arm64.set_pc(0x1600); - EXPECT_EQ(0x600U, invalid_elf->GetRelPc(regs_arm64.pc(), &map_info)); - EXPECT_EQ(4U, regs_arm64.GetPcAdjustment(0x600U, invalid_elf)); + EXPECT_EQ(0x600U, invalid_elf->GetRelPc(0x1600, &map_info)); + EXPECT_EQ(4U, GetPcAdjustment(0x600U, invalid_elf, ARCH_ARM64)); - regs_x86.set_pc(0x1700); - EXPECT_EQ(0x700U, invalid_elf->GetRelPc(regs_x86.pc(), &map_info)); - EXPECT_EQ(1U, regs_x86.GetPcAdjustment(0x700U, invalid_elf)); + EXPECT_EQ(0x700U, invalid_elf->GetRelPc(0x1700, &map_info)); + EXPECT_EQ(1U, GetPcAdjustment(0x700U, invalid_elf, ARCH_X86)); - regs_x86_64.set_pc(0x1800); - EXPECT_EQ(0x800U, invalid_elf->GetRelPc(regs_x86_64.pc(), &map_info)); - EXPECT_EQ(1U, regs_x86_64.GetPcAdjustment(0x800U, invalid_elf)); + EXPECT_EQ(0x800U, invalid_elf->GetRelPc(0x1800, &map_info)); + EXPECT_EQ(1U, GetPcAdjustment(0x800U, invalid_elf, ARCH_X86_64)); - regs_mips.set_pc(0x1900); - EXPECT_EQ(0x900U, invalid_elf->GetRelPc(regs_mips.pc(), &map_info)); - EXPECT_EQ(8U, regs_mips.GetPcAdjustment(0x900U, invalid_elf)); + EXPECT_EQ(0x900U, invalid_elf->GetRelPc(0x1900, &map_info)); + EXPECT_EQ(8U, GetPcAdjustment(0x900U, invalid_elf, ARCH_MIPS)); - regs_mips64.set_pc(0x1a00); - EXPECT_EQ(0xa00U, invalid_elf->GetRelPc(regs_mips64.pc(), &map_info)); - EXPECT_EQ(8U, regs_mips64.GetPcAdjustment(0xa00U, invalid_elf)); + EXPECT_EQ(0xa00U, invalid_elf->GetRelPc(0x1a00, &map_info)); + EXPECT_EQ(8U, GetPcAdjustment(0xa00U, invalid_elf, ARCH_MIPS64)); } TEST_F(RegsTest, arm_verify_sp_pc) { diff --git a/libunwindstack/tests/UnwinderTest.cpp b/libunwindstack/tests/UnwinderTest.cpp index ef1950ccc..dd33aa9d7 100644 --- a/libunwindstack/tests/UnwinderTest.cpp +++ b/libunwindstack/tests/UnwinderTest.cpp @@ -161,8 +161,8 @@ TEST_F(UnwinderTest, multiple_frames) { regs_.set_pc(0x1000); regs_.set_sp(0x10000); - ElfInterfaceFake::FakePushStepData(StepData(0x1102, 0x10010, false)); - ElfInterfaceFake::FakePushStepData(StepData(0x1202, 0x10020, false)); + ElfInterfaceFake::FakePushStepData(StepData(0x1104, 0x10010, false)); + ElfInterfaceFake::FakePushStepData(StepData(0x1204, 0x10020, false)); ElfInterfaceFake::FakePushStepData(StepData(0, 0, true)); Unwinder unwinder(64, maps_.get(), ®s_, process_memory_); @@ -225,8 +225,8 @@ TEST_F(UnwinderTest, multiple_frames_dont_resolve_names) { regs_.set_pc(0x1000); regs_.set_sp(0x10000); - ElfInterfaceFake::FakePushStepData(StepData(0x1102, 0x10010, false)); - ElfInterfaceFake::FakePushStepData(StepData(0x1202, 0x10020, false)); + ElfInterfaceFake::FakePushStepData(StepData(0x1104, 0x10010, false)); + ElfInterfaceFake::FakePushStepData(StepData(0x1204, 0x10020, false)); ElfInterfaceFake::FakePushStepData(StepData(0, 0, true)); Unwinder unwinder(64, maps_.get(), ®s_, process_memory_); @@ -445,7 +445,7 @@ TEST_F(UnwinderTest, no_frames_after_finished) { TEST_F(UnwinderTest, max_frames) { for (size_t i = 0; i < 30; i++) { ElfInterfaceFake::FakePushFunctionData(FunctionData("Frame" + std::to_string(i), i)); - ElfInterfaceFake::FakePushStepData(StepData(0x1102 + i * 0x100, 0x10010 + i * 0x10, false)); + ElfInterfaceFake::FakePushStepData(StepData(0x1104 + i * 0x100, 0x10010 + i * 0x10, false)); } regs_.set_pc(0x1000); @@ -484,12 +484,12 @@ TEST_F(UnwinderTest, verify_frames_skipped) { regs_.set_pc(0x20000); regs_.set_sp(0x10000); - ElfInterfaceFake::FakePushStepData(StepData(0x23002, 0x10010, false)); - ElfInterfaceFake::FakePushStepData(StepData(0x23102, 0x10020, false)); - ElfInterfaceFake::FakePushStepData(StepData(0x20002, 0x10030, false)); - ElfInterfaceFake::FakePushStepData(StepData(0x21002, 0x10040, false)); + ElfInterfaceFake::FakePushStepData(StepData(0x23004, 0x10010, false)); + ElfInterfaceFake::FakePushStepData(StepData(0x23104, 0x10020, false)); + ElfInterfaceFake::FakePushStepData(StepData(0x20004, 0x10030, false)); + ElfInterfaceFake::FakePushStepData(StepData(0x21004, 0x10040, false)); ElfInterfaceFake::FakePushStepData(StepData(0x1002, 0x10050, false)); - ElfInterfaceFake::FakePushStepData(StepData(0x21002, 0x10060, false)); + ElfInterfaceFake::FakePushStepData(StepData(0x21004, 0x10060, false)); ElfInterfaceFake::FakePushStepData(StepData(0x23002, 0x10070, false)); ElfInterfaceFake::FakePushStepData(StepData(0, 0, true)); @@ -553,7 +553,7 @@ TEST_F(UnwinderTest, sp_not_in_map) { regs_.set_pc(0x1000); regs_.set_sp(0x63000); - ElfInterfaceFake::FakePushStepData(StepData(0x21002, 0x50020, false)); + ElfInterfaceFake::FakePushStepData(StepData(0x21004, 0x50020, false)); ElfInterfaceFake::FakePushStepData(StepData(0, 0, true)); Unwinder unwinder(64, maps_.get(), ®s_, process_memory_); @@ -670,10 +670,10 @@ TEST_F(UnwinderTest, speculative_frame) { // Fake as if code called a nullptr function. regs_.set_pc(0); regs_.set_sp(0x10000); - regs_.FakeSetReturnAddress(0x1202); + regs_.FakeSetReturnAddress(0x1204); regs_.FakeSetReturnAddressValid(true); - ElfInterfaceFake::FakePushStepData(StepData(0x23102, 0x10020, false)); + ElfInterfaceFake::FakePushStepData(StepData(0x23104, 0x10020, false)); ElfInterfaceFake::FakePushStepData(StepData(0, 0, true)); Unwinder unwinder(64, maps_.get(), ®s_, process_memory_); @@ -789,7 +789,7 @@ TEST_F(UnwinderTest, speculative_frame_not_removed_pc_bad) { // Fake as if code called a nullptr function. regs_.set_pc(0); regs_.set_sp(0x10000); - regs_.FakeSetReturnAddress(0x1202); + regs_.FakeSetReturnAddress(0x1204); regs_.FakeSetReturnAddressValid(true); Unwinder unwinder(64, maps_.get(), ®s_, process_memory_); @@ -858,8 +858,8 @@ TEST_F(UnwinderTest, map_ignore_suffixes) { // Fake as if code called a nullptr function. regs_.set_pc(0x1000); regs_.set_sp(0x10000); - ElfInterfaceFake::FakePushStepData(StepData(0x43402, 0x10010, false)); - ElfInterfaceFake::FakePushStepData(StepData(0x53502, 0x10020, false)); + ElfInterfaceFake::FakePushStepData(StepData(0x43404, 0x10010, false)); + ElfInterfaceFake::FakePushStepData(StepData(0x53504, 0x10020, false)); ElfInterfaceFake::FakePushStepData(StepData(0, 0, true)); Unwinder unwinder(64, maps_.get(), ®s_, process_memory_); @@ -915,11 +915,11 @@ TEST_F(UnwinderTest, sp_pc_do_not_change) { regs_.set_pc(0x1000); regs_.set_sp(0x10000); - ElfInterfaceFake::FakePushStepData(StepData(0x33402, 0x10010, false)); - ElfInterfaceFake::FakePushStepData(StepData(0x33502, 0x10020, false)); - ElfInterfaceFake::FakePushStepData(StepData(0x33502, 0x10020, false)); - ElfInterfaceFake::FakePushStepData(StepData(0x33502, 0x10020, false)); - ElfInterfaceFake::FakePushStepData(StepData(0x33502, 0x10020, false)); + ElfInterfaceFake::FakePushStepData(StepData(0x33404, 0x10010, false)); + ElfInterfaceFake::FakePushStepData(StepData(0x33504, 0x10020, false)); + ElfInterfaceFake::FakePushStepData(StepData(0x33504, 0x10020, false)); + ElfInterfaceFake::FakePushStepData(StepData(0x33504, 0x10020, false)); + ElfInterfaceFake::FakePushStepData(StepData(0x33504, 0x10020, false)); ElfInterfaceFake::FakePushStepData(StepData(0, 0, true)); Unwinder unwinder(64, maps_.get(), ®s_, process_memory_); @@ -1113,7 +1113,7 @@ TEST_F(UnwinderTest, dex_pc_multiple_frames) { regs_.set_pc(0x1000); regs_.set_sp(0x10000); regs_.FakeSetDexPc(0xa3400); - ElfInterfaceFake::FakePushStepData(StepData(0x33402, 0x10010, false)); + ElfInterfaceFake::FakePushStepData(StepData(0x33404, 0x10010, false)); ElfInterfaceFake::FakePushStepData(StepData(0, 0, true)); Unwinder unwinder(64, maps_.get(), ®s_, process_memory_); |