diff options
| -rw-r--r-- | lldb/source/Commands/CommandObjectFrame.cpp | 2 | ||||
| -rw-r--r-- | lldb/source/Commands/CommandObjectThread.cpp | 6 | ||||
| -rw-r--r-- | lldb/source/Core/ValueObjectVariable.cpp | 7 |
3 files changed, 11 insertions, 4 deletions
diff --git a/lldb/source/Commands/CommandObjectFrame.cpp b/lldb/source/Commands/CommandObjectFrame.cpp index fdd47bc73b4..547acd679f6 100644 --- a/lldb/source/Commands/CommandObjectFrame.cpp +++ b/lldb/source/Commands/CommandObjectFrame.cpp @@ -330,7 +330,7 @@ public: //const char *loc_cstr = valobj->GetLocationAsCString(); if (m_options.show_location) { - s.Printf("@ %s: ", valobj->GetLocationAsCString(exe_scope)); + s.Printf("%s: ", valobj->GetLocationAsCString(exe_scope)); } if (m_options.debug) s.Printf ("%p ValueObject{%u} ", valobj, valobj->GetID()); diff --git a/lldb/source/Commands/CommandObjectThread.cpp b/lldb/source/Commands/CommandObjectThread.cpp index d5614688a32..ee411e5f952 100644 --- a/lldb/source/Commands/CommandObjectThread.cpp +++ b/lldb/source/Commands/CommandObjectThread.cpp @@ -772,9 +772,9 @@ g_duo_running_mode[] = lldb::OptionDefinition CommandObjectThreadStepWithTypeAndScope::CommandOptions::g_option_table[] = { -{ LLDB_OPT_SET_1, false, "avoid-no-debug", 'a', required_argument, NULL, 0, "<bool>", "A boolean value that sets whether step-in will step over functions with no debug information."}, -{ LLDB_OPT_SET_1, false, "run-mode", 'm', required_argument, g_tri_running_mode, 0, "<run-mode>","Determine how to run other threads while stepping the current thread."}, -{ LLDB_OPT_SET_1, false, "step-over-regexp",'r', required_argument, NULL, 0, "<regexp>", "A regular expression that defines function names to step over."}, +{ LLDB_OPT_SET_1, false, "avoid-no-debug", 'a', required_argument, NULL, 0, "<bool>", "A boolean value that sets whether step-in will step over functions with no debug information."}, +{ LLDB_OPT_SET_1, false, "run-mode", 'm', required_argument, g_tri_running_mode, 0, "<run-mode>", "Determine how to run other threads while stepping the current thread."}, +{ LLDB_OPT_SET_1, false, "step-over-regexp",'r', required_argument, NULL, 0, "<regexp>", "A regular expression that defines function names to step over."}, { 0, false, NULL, 0, 0, NULL, 0, NULL, NULL } }; diff --git a/lldb/source/Core/ValueObjectVariable.cpp b/lldb/source/Core/ValueObjectVariable.cpp index 86cc46d207b..bba4ba1b47c 100644 --- a/lldb/source/Core/ValueObjectVariable.cpp +++ b/lldb/source/Core/ValueObjectVariable.cpp @@ -105,6 +105,13 @@ ValueObjectVariable::UpdateValue (ExecutionContextScope *exe_scope) DWARFExpression &expr = variable->LocationExpression(); lldb::addr_t loclist_base_load_addr = LLDB_INVALID_ADDRESS; ExecutionContext exe_ctx (exe_scope); + + if (exe_ctx.process) + { + m_data.SetByteOrder(exe_ctx.process->GetByteOrder()); + m_data.SetAddressByteSize(exe_ctx.process->GetAddressByteSize()); + } + if (expr.IsLocationList()) { SymbolContext sc; |
