@@ -119,17 +119,16 @@ NativeRegisterContextFreeBSD_arm64::ReadRegister(const RegisterInfo *reg_info,
119119 RegisterValue ®_value) {
120120 Status error;
121121
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" );
126124
127125 const uint32_t reg = reg_info->kinds [lldb::eRegisterKindLLDB];
128126
129127 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 (" no lldb regnum for %s" ,
129+ reg_info && reg_info->name ?
130+ reg_info->name :
131+ " <unknown register>" );
133132
134133 uint32_t set = GetRegisterInfo ().GetRegisterSetFromRegisterIndex (reg);
135134 error = ReadRegisterSet (set);
@@ -147,14 +146,15 @@ Status NativeRegisterContextFreeBSD_arm64::WriteRegister(
147146 Status error;
148147
149148 if (!reg_info)
150- return Status (" reg_info NULL" );
149+ return Status::FromErrorString (" reg_info NULL" );
151150
152151 const uint32_t reg = reg_info->kinds [lldb::eRegisterKindLLDB];
153152
154153 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>" );
154+ return Status::FromErrorStringWithFormat (" no lldb regnum for %s" ,
155+ reg_info && reg_info->name ?
156+ reg_info->name :
157+ " <unknown register>" );
158158
159159 uint32_t set = GetRegisterInfo ().GetRegisterSetFromRegisterIndex (reg);
160160 error = ReadRegisterSet (set);
0 commit comments