aboutsummaryrefslogtreecommitdiff
path: root/lldb
diff options
context:
space:
mode:
authorDavid Spickett <david.spickett@linaro.org>2023-01-13 14:23:53 +0000
committerDavid Spickett <david.spickett@linaro.org>2023-01-23 10:52:20 +0000
commitae361d3d90a83ede308dd4ee56811966e8a42fe2 (patch)
tree01676f62fb31d18be69aa4df18f8905983de0335 /lldb
parent9c4c32a3d0d09414325ec002242feda4eb9e818c (diff)
downloadllvm-ae361d3d90a83ede308dd4ee56811966e8a42fe2.zip
llvm-ae361d3d90a83ede308dd4ee56811966e8a42fe2.tar.gz
llvm-ae361d3d90a83ede308dd4ee56811966e8a42fe2.tar.bz2
[LLDB] Remove return value from DumpRegisterValue
No one ever checks it. Also convert to early return. Reviewed By: labath Differential Revision: https://reviews.llvm.org/D141687
Diffstat (limited to 'lldb')
-rw-r--r--lldb/include/lldb/Core/DumpRegisterValue.h2
-rw-r--r--lldb/source/Core/DumpRegisterValue.cpp103
2 files changed, 52 insertions, 53 deletions
diff --git a/lldb/include/lldb/Core/DumpRegisterValue.h b/lldb/include/lldb/Core/DumpRegisterValue.h
index 655003a..08bf0af 100644
--- a/lldb/include/lldb/Core/DumpRegisterValue.h
+++ b/lldb/include/lldb/Core/DumpRegisterValue.h
@@ -21,7 +21,7 @@ class Stream;
// The default value of 0 for reg_name_right_align_at means no alignment at
// all.
-bool DumpRegisterValue(const RegisterValue &reg_val, Stream *s,
+void DumpRegisterValue(const RegisterValue &reg_val, Stream *s,
const RegisterInfo *reg_info, bool prefix_with_name,
bool prefix_with_alt_name, lldb::Format format,
uint32_t reg_name_right_align_at = 0,
diff --git a/lldb/source/Core/DumpRegisterValue.cpp b/lldb/source/Core/DumpRegisterValue.cpp
index 0417ea9..14659e0 100644
--- a/lldb/source/Core/DumpRegisterValue.cpp
+++ b/lldb/source/Core/DumpRegisterValue.cpp
@@ -15,66 +15,65 @@
using namespace lldb;
-bool lldb_private::DumpRegisterValue(const RegisterValue &reg_val, Stream *s,
+void lldb_private::DumpRegisterValue(const RegisterValue &reg_val, Stream *s,
const RegisterInfo *reg_info,
bool prefix_with_name,
bool prefix_with_alt_name, Format format,
uint32_t reg_name_right_align_at,
ExecutionContextScope *exe_scope) {
DataExtractor data;
- if (reg_val.GetData(data)) {
- bool name_printed = false;
- // For simplicity, alignment of the register name printing applies only in
- // the most common case where:
- //
- // prefix_with_name^prefix_with_alt_name is true
- //
- StreamString format_string;
- if (reg_name_right_align_at && (prefix_with_name ^ prefix_with_alt_name))
- format_string.Printf("%%%us", reg_name_right_align_at);
- else
- format_string.Printf("%%s");
- std::string fmt = std::string(format_string.GetString());
- if (prefix_with_name) {
- if (reg_info->name) {
- s->Printf(fmt.c_str(), reg_info->name);
- name_printed = true;
- } else if (reg_info->alt_name) {
- s->Printf(fmt.c_str(), reg_info->alt_name);
- prefix_with_alt_name = false;
- name_printed = true;
- }
- }
- if (prefix_with_alt_name) {
- if (name_printed)
- s->PutChar('/');
- if (reg_info->alt_name) {
- s->Printf(fmt.c_str(), reg_info->alt_name);
- name_printed = true;
- } else if (!name_printed) {
- // No alternate name but we were asked to display a name, so show the
- // main name
- s->Printf(fmt.c_str(), reg_info->name);
- name_printed = true;
- }
+ if (!reg_val.GetData(data))
+ return;
+
+ bool name_printed = false;
+ // For simplicity, alignment of the register name printing applies only in
+ // the most common case where:
+ //
+ // prefix_with_name^prefix_with_alt_name is true
+ //
+ StreamString format_string;
+ if (reg_name_right_align_at && (prefix_with_name ^ prefix_with_alt_name))
+ format_string.Printf("%%%us", reg_name_right_align_at);
+ else
+ format_string.Printf("%%s");
+ std::string fmt = std::string(format_string.GetString());
+ if (prefix_with_name) {
+ if (reg_info->name) {
+ s->Printf(fmt.c_str(), reg_info->name);
+ name_printed = true;
+ } else if (reg_info->alt_name) {
+ s->Printf(fmt.c_str(), reg_info->alt_name);
+ prefix_with_alt_name = false;
+ name_printed = true;
}
+ }
+ if (prefix_with_alt_name) {
if (name_printed)
- s->PutCString(" = ");
+ s->PutChar('/');
+ if (reg_info->alt_name) {
+ s->Printf(fmt.c_str(), reg_info->alt_name);
+ name_printed = true;
+ } else if (!name_printed) {
+ // No alternate name but we were asked to display a name, so show the
+ // main name
+ s->Printf(fmt.c_str(), reg_info->name);
+ name_printed = true;
+ }
+ }
+ if (name_printed)
+ s->PutCString(" = ");
- if (format == eFormatDefault)
- format = reg_info->format;
+ if (format == eFormatDefault)
+ format = reg_info->format;
- DumpDataExtractor(data, s,
- 0, // Offset in "data"
- format, // Format to use when dumping
- reg_info->byte_size, // item_byte_size
- 1, // item_count
- UINT32_MAX, // num_per_line
- LLDB_INVALID_ADDRESS, // base_addr
- 0, // item_bit_size
- 0, // item_bit_offset
- exe_scope);
- return true;
- }
- return false;
+ DumpDataExtractor(data, s,
+ 0, // Offset in "data"
+ format, // Format to use when dumping
+ reg_info->byte_size, // item_byte_size
+ 1, // item_count
+ UINT32_MAX, // num_per_line
+ LLDB_INVALID_ADDRESS, // base_addr
+ 0, // item_bit_size
+ 0, // item_bit_offset
+ exe_scope);
}