@@ -119,17 +119,15 @@ NativeRegisterContextFreeBSD_arm64::ReadRegister(const RegisterInfo *reg_info,
119
119
RegisterValue ®_value) {
120
120
Status error;
121
121
122
- if (!reg_info) {
123
- error = Status::FromErrorString (" reg_info NULL" );
124
- return error;
125
- }
122
+ if (!reg_info)
123
+ return Status::FromErrorString (" reg_info NULL" );
126
124
127
125
const uint32_t reg = reg_info->kinds [lldb::eRegisterKindLLDB];
128
126
129
127
if (reg == LLDB_INVALID_REGNUM)
130
- return Status ( " no lldb regnum for %s " , reg_info && reg_info-> name
131
- ? reg_info-> name
132
- : " <unknown register>" );
128
+ return Status::FromErrorStringWithFormat (
129
+ " no lldb regnum for %s " ,
130
+ reg_info && reg_info-> name ? reg_info-> name : " <unknown register>" );
133
131
134
132
uint32_t set = GetRegisterInfo ().GetRegisterSetFromRegisterIndex (reg);
135
133
error = ReadRegisterSet (set);
@@ -147,14 +145,14 @@ Status NativeRegisterContextFreeBSD_arm64::WriteRegister(
147
145
Status error;
148
146
149
147
if (!reg_info)
150
- return Status (" reg_info NULL" );
148
+ return Status::FromErrorString (" reg_info NULL" );
151
149
152
150
const uint32_t reg = reg_info->kinds [lldb::eRegisterKindLLDB];
153
151
154
152
if (reg == LLDB_INVALID_REGNUM)
155
- return Status ( " no lldb regnum for %s " , reg_info && reg_info-> name
156
- ? reg_info-> name
157
- : " <unknown register>" );
153
+ return Status::FromErrorStringWithFormat (
154
+ " no lldb regnum for %s " ,
155
+ reg_info && reg_info-> name ? reg_info-> name : " <unknown register>" );
158
156
159
157
uint32_t set = GetRegisterInfo ().GetRegisterSetFromRegisterIndex (reg);
160
158
error = ReadRegisterSet (set);
0 commit comments