aboutsummaryrefslogtreecommitdiff
path: root/src/processor/disassembler_x86_unittest.cc
diff options
context:
space:
mode:
authorted.mielczarek <ted.mielczarek@4c0a9323-5329-0410-9bdc-e9ce6186880e>2011-01-26 22:13:37 +0000
committerted.mielczarek <ted.mielczarek@4c0a9323-5329-0410-9bdc-e9ce6186880e>2011-01-26 22:13:37 +0000
commited1c70b5b8b04911a1c357b0f49a51ff65c7d30e (patch)
treef8bb04a26f0b14cecb29fed4e92beef05e6ae64d /src/processor/disassembler_x86_unittest.cc
parentRename duplicate argument names to make it compile with CLang. (diff)
downloadbreakpad-ed1c70b5b8b04911a1c357b0f49a51ff65c7d30e.tar.xz
Expose actual instruction from DisassemblerX86
R=cdn at http://breakpad.appspot.com/260001 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@766 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/processor/disassembler_x86_unittest.cc')
-rw-r--r--src/processor/disassembler_x86_unittest.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/processor/disassembler_x86_unittest.cc b/src/processor/disassembler_x86_unittest.cc
index cc4754b2..b6884c1e 100644
--- a/src/processor/disassembler_x86_unittest.cc
+++ b/src/processor/disassembler_x86_unittest.cc
@@ -96,8 +96,12 @@ TEST(DisassemblerX86Test, SimpleReturnInstruction) {
EXPECT_EQ(0, dis.flags());
EXPECT_EQ(true, dis.endOfBlock());
EXPECT_EQ(libdis::insn_controlflow, dis.currentInstructionGroup());
+ const libdis::x86_insn_t* instruction = dis.currentInstruction();
+ EXPECT_EQ(libdis::insn_controlflow, instruction->group);
+ EXPECT_EQ(libdis::insn_return, instruction->type);
EXPECT_EQ(0, dis.NextInstruction());
EXPECT_EQ(false, dis.currentInstructionValid());
+ EXPECT_EQ(NULL, dis.currentInstruction());
}
TEST(DisassemblerX86Test, SimpleInvalidInstruction) {