Skip to content

Commit 2dbe88d

Browse files
committed
[lldb] Fix up SysV ABI implementations after 057efa9
1 parent b3ac5b8 commit 2dbe88d

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,15 +466,15 @@ ABISysV_arc::GetReturnValueObjectSimple(Thread &thread,
466466
if (!SetSizedInteger(value.GetScalar(), raw_value, byte_size, is_signed))
467467
return ValueObjectSP();
468468

469-
value.SetValueType(Value::eValueTypeScalar);
469+
value.SetValueType(Value::ValueType::Scalar);
470470
}
471471
// Pointer return type.
472472
else if (type_flags & eTypeIsPointer) {
473473
auto reg_info_r0 = reg_ctx->GetRegisterInfo(eRegisterKindGeneric,
474474
LLDB_REGNUM_GENERIC_ARG1);
475475
value.GetScalar() = reg_ctx->ReadRegisterAsUnsigned(reg_info_r0, 0);
476476

477-
value.SetValueType(Value::eValueTypeScalar);
477+
value.SetValueType(Value::ValueType::Scalar);
478478
}
479479
// Floating point return type.
480480
else if (type_flags & eTypeIsFloat) {
@@ -537,7 +537,7 @@ ValueObjectSP ABISysV_arc::GetReturnValueObjectImpl(Thread &thread,
537537
auto reg_info_r0 = reg_ctx->GetRegisterInfo(eRegisterKindGeneric,
538538
LLDB_REGNUM_GENERIC_ARG1);
539539
value.GetScalar() = reg_ctx->ReadRegisterAsUnsigned(reg_info_r0, 0);
540-
value.SetValueType(Value::eValueTypeScalar);
540+
value.SetValueType(Value::ValueType::Scalar);
541541
}
542542
// Floating point return type.
543543
else if (retType.isFloatingPointTy()) {

lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ ValueObjectSP ABISysV_mips64::GetReturnValueObjectImpl(
764764
const RegisterInfo *r3_info = reg_ctx->GetRegisterInfoByName("r3", 0);
765765

766766
if (type_flags & eTypeIsScalar || type_flags & eTypeIsPointer) {
767-
value.SetValueType(Value::eValueTypeScalar);
767+
value.SetValueType(Value::ValueType::Scalar);
768768

769769
bool success = false;
770770
if (type_flags & eTypeIsInteger || type_flags & eTypeIsPointer) {

lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ ValueObjectSP ABISysV_ppc::GetReturnValueObjectSimple(
520520

521521
const uint32_t type_flags = return_compiler_type.GetTypeInfo();
522522
if (type_flags & eTypeIsScalar) {
523-
value.SetValueType(Value::eValueTypeScalar);
523+
value.SetValueType(Value::ValueType::Scalar);
524524

525525
bool success = false;
526526
if (type_flags & eTypeIsInteger) {
@@ -603,7 +603,7 @@ ValueObjectSP ABISysV_ppc::GetReturnValueObjectSimple(
603603
reg_ctx->GetRegisterInfoByName("r3", 0)->kinds[eRegisterKindLLDB];
604604
value.GetScalar() =
605605
(uint64_t)thread.GetRegisterContext()->ReadRegisterAsUnsigned(r3_id, 0);
606-
value.SetValueType(Value::eValueTypeScalar);
606+
value.SetValueType(Value::ValueType::Scalar);
607607
return_valobj_sp = ValueObjectConstResult::Create(
608608
thread.GetStackFrameAtIndex(0).get(), value, ConstString(""));
609609
} else if (type_flags & eTypeIsVector) {

lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ class ReturnValueExtractor {
577577
ValueSP NewScalarValue(CompilerType &type) {
578578
ValueSP value_sp(new Value);
579579
value_sp->SetCompilerType(type);
580-
value_sp->SetValueType(Value::eValueTypeScalar);
580+
value_sp->SetValueType(Value::ValueType::Scalar);
581581
return value_sp;
582582
}
583583

lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ ValueObjectSP ABISysV_s390x::GetReturnValueObjectSimple(
487487

488488
const uint32_t type_flags = return_compiler_type.GetTypeInfo();
489489
if (type_flags & eTypeIsScalar) {
490-
value.SetValueType(Value::eValueTypeScalar);
490+
value.SetValueType(Value::ValueType::Scalar);
491491

492492
bool success = false;
493493
if (type_flags & eTypeIsInteger) {
@@ -571,7 +571,7 @@ ValueObjectSP ABISysV_s390x::GetReturnValueObjectSimple(
571571
reg_ctx->GetRegisterInfoByName("r2", 0)->kinds[eRegisterKindLLDB];
572572
value.GetScalar() =
573573
(uint64_t)thread.GetRegisterContext()->ReadRegisterAsUnsigned(r2_id, 0);
574-
value.SetValueType(Value::eValueTypeScalar);
574+
value.SetValueType(Value::ValueType::Scalar);
575575
return_valobj_sp = ValueObjectConstResult::Create(
576576
thread.GetStackFrameAtIndex(0).get(), value, ConstString(""));
577577
}

0 commit comments

Comments
 (0)