diff options
author | jimblandy <jimblandy@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2010-02-05 18:09:17 +0000 |
---|---|---|
committer | jimblandy <jimblandy@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2010-02-05 18:09:17 +0000 |
commit | 2b48a6a89fda55b5ec2edec42d6183d19454f994 (patch) | |
tree | 50be62e6dcbdf216830c179809ede27dd4768c69 /src/processor/basic_source_line_resolver_unittest.cc | |
parent | Breakpad processor: Segregate STACK WIN vs. traditional stack walking. (diff) | |
download | breakpad-2b48a6a89fda55b5ec2edec42d6183d19454f994.tar.xz |
Breakpad processor: Give Windows stack data Windows-specific names.
Rename BasicSourceLineResolver::Module::StackInfoTypes to
WindowsFrameInfoTypes. This enum really describes the forms of
Windows-specific stack unwinding data (STACK WIN records), and its
name should reflect that, especially since we'll be adding support for
other kinds of stack walking information.
The 'stack' -> 'frame' shift matches the naming of the
WindowsFrameInfo type.
Similarly, rename BasicSourceLineResolver::Module::stack_info_ to
windows_frame_info_.
Do similar renamings in basic_source_line_resolver_unittest.cc.
a=jimblandy, r=mmentovai
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@513 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/processor/basic_source_line_resolver_unittest.cc')
-rw-r--r-- | src/processor/basic_source_line_resolver_unittest.cc | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/processor/basic_source_line_resolver_unittest.cc b/src/processor/basic_source_line_resolver_unittest.cc index 45dfe979..fc9028f2 100644 --- a/src/processor/basic_source_line_resolver_unittest.cc +++ b/src/processor/basic_source_line_resolver_unittest.cc @@ -104,7 +104,7 @@ static bool RunTests() { TestCodeModule module1("module1"); StackFrame frame; - scoped_ptr<WindowsFrameInfo> frame_info; + scoped_ptr<WindowsFrameInfo> windows_frame_info; frame.instruction = 0x1000; frame.module = NULL; resolver.FillSourceLineInfo(&frame); @@ -124,10 +124,10 @@ static bool RunTests() { ASSERT_EQ(frame.source_file_name, "file1_1.cc"); ASSERT_EQ(frame.source_line, 44); ASSERT_EQ(frame.source_line_base, 0x1000); - frame_info.reset(resolver.FindWindowsFrameInfo(&frame)); - ASSERT_TRUE(frame_info.get()); - ASSERT_FALSE(frame_info->allocates_base_pointer); - ASSERT_EQ(frame_info->program_string, + windows_frame_info.reset(resolver.FindWindowsFrameInfo(&frame)); + ASSERT_TRUE(windows_frame_info.get()); + ASSERT_FALSE(windows_frame_info->allocates_base_pointer); + ASSERT_EQ(windows_frame_info->program_string, "$eip 4 + ^ = $esp $ebp 8 + = $ebp $ebp ^ ="); ClearSourceLineInfo(&frame); @@ -135,32 +135,32 @@ static bool RunTests() { frame.module = &module1; resolver.FillSourceLineInfo(&frame); ASSERT_TRUE(VerifyEmpty(frame)); - frame_info.reset(resolver.FindWindowsFrameInfo(&frame)); - ASSERT_FALSE(frame_info.get()); + windows_frame_info.reset(resolver.FindWindowsFrameInfo(&frame)); + ASSERT_FALSE(windows_frame_info.get()); frame.instruction = 0x1280; resolver.FillSourceLineInfo(&frame); ASSERT_EQ(frame.function_name, "Function1_3"); ASSERT_TRUE(frame.source_file_name.empty()); ASSERT_EQ(frame.source_line, 0); - frame_info.reset(resolver.FindWindowsFrameInfo(&frame)); - ASSERT_TRUE(frame_info.get()); - ASSERT_FALSE(frame_info->allocates_base_pointer); - ASSERT_TRUE(frame_info->program_string.empty()); + windows_frame_info.reset(resolver.FindWindowsFrameInfo(&frame)); + ASSERT_TRUE(windows_frame_info.get()); + ASSERT_FALSE(windows_frame_info->allocates_base_pointer); + ASSERT_TRUE(windows_frame_info->program_string.empty()); frame.instruction = 0x1380; resolver.FillSourceLineInfo(&frame); ASSERT_EQ(frame.function_name, "Function1_4"); ASSERT_TRUE(frame.source_file_name.empty()); ASSERT_EQ(frame.source_line, 0); - frame_info.reset(resolver.FindWindowsFrameInfo(&frame)); - ASSERT_TRUE(frame_info.get()); - ASSERT_FALSE(frame_info->allocates_base_pointer); - ASSERT_FALSE(frame_info->program_string.empty()); + windows_frame_info.reset(resolver.FindWindowsFrameInfo(&frame)); + ASSERT_TRUE(windows_frame_info.get()); + ASSERT_FALSE(windows_frame_info->allocates_base_pointer); + ASSERT_FALSE(windows_frame_info->program_string.empty()); frame.instruction = 0x2000; - frame_info.reset(resolver.FindWindowsFrameInfo(&frame)); - ASSERT_FALSE(frame_info.get()); + windows_frame_info.reset(resolver.FindWindowsFrameInfo(&frame)); + ASSERT_FALSE(windows_frame_info.get()); frame.instruction = 0x2900; frame.module = &module1; @@ -184,9 +184,9 @@ static bool RunTests() { ASSERT_EQ(frame.source_file_name, "file2_2.cc"); ASSERT_EQ(frame.source_line, 21); ASSERT_EQ(frame.source_line_base, 0x2180); - frame_info.reset(resolver.FindWindowsFrameInfo(&frame)); - ASSERT_TRUE(frame_info.get()); - ASSERT_EQ(frame_info->prolog_size, 1); + windows_frame_info.reset(resolver.FindWindowsFrameInfo(&frame)); + ASSERT_TRUE(windows_frame_info.get()); + ASSERT_EQ(windows_frame_info->prolog_size, 1); frame.instruction = 0x216f; resolver.FillSourceLineInfo(&frame); |