maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

rdar://problem/11541676 

Do not show the derived registers like "eax", ... for the vanilla "register read" command.
Also add a test scenario for that.

llvm-svn: 157647
This commit is contained in:
Johnny Chen 2012-05-29 21:55:08 +00:00
parent b6499eb60d
commit 6d4d4f7db3
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lldb/source/Commands/CommandObjectRegister.cpp
View File

@ -124,7 +124,8 @@ public:
DumpRegisterSet (const ExecutionContext &exe_ctx, DumpRegisterSet (const ExecutionContext &exe_ctx,
Stream &strm, Stream &strm,
RegisterContext *reg_ctx, RegisterContext *reg_ctx,
uint32_t set_idx) uint32_t set_idx,
bool primitive_only=false)
{ {
uint32_t unavailable_count = 0; uint32_t unavailable_count = 0;
uint32_t available_count = 0; uint32_t available_count = 0;
@ -137,7 +138,11 @@ public:
for (uint32_t reg_idx = 0; reg_idx < num_registers; ++reg_idx) for (uint32_t reg_idx = 0; reg_idx < num_registers; ++reg_idx)
{ {
const uint32_t reg = reg_set->registers[reg_idx]; const uint32_t reg = reg_set->registers[reg_idx];
if (DumpRegister (exe_ctx, strm, reg_ctx, reg_ctx->GetRegisterInfoAtIndex(reg))) const RegisterInfo *reg_info = reg_ctx->GetRegisterInfoAtIndex(reg);
// Skip the dumping of derived register if primitive_only is true.
if (primitive_only && reg_info && reg_info->value_regs)
continue;
if (DumpRegister (exe_ctx, strm, reg_ctx, reg_info))
++available_count; ++available_count;
else else
++unavailable_count; ++unavailable_count;
@ -202,7 +207,8 @@ public:
for (set_idx = 0; set_idx < num_register_sets; ++set_idx) for (set_idx = 0; set_idx < num_register_sets; ++set_idx)
{ {
DumpRegisterSet (exe_ctx, strm, reg_ctx, set_idx); // When dump_all_sets option is set, dump primitive as well as derived registers.
DumpRegisterSet (exe_ctx, strm, reg_ctx, set_idx, !m_command_options.dump_all_sets.GetCurrentValue());
} }
} }
} }

7
lldb/test/functionalities/register/TestRegisters.py
View File

@ -71,6 +71,13 @@ class RegisterCommandsTestCase(TestBase):
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
substrs = ['stopped', 'stop reason = breakpoint']) substrs = ['stopped', 'stop reason = breakpoint'])
# The vanilla "register read" command does not output derived register like eax.
self.expect("register read", matching=False,
substrs = ['eax'])
# While "register read -a" does output derived register like eax.
self.expect("register read -a", matching=True,
substrs = ['eax'])
# Test reading of rax and eax. # Test reading of rax and eax.
self.runCmd("register read rax eax") self.runCmd("register read rax eax")