[Lldb-commits] [lldb] 2dbe88d - [lldb] Fix up SysV ABI implementations after 057efa9916cdc354ef4653bcd128a578cc43125e

[Adrian Prantl via lldb-commits]

Thanks!

-- adrian

> On Feb 12, 2021, at 4:34 PM, Benjamin Kramer via lldb-commits <lldb-commits at lists.llvm.org> wrote:
> 
> 
> Author: Benjamin Kramer
> Date: 2021-02-13T01:34:00+01:00
> New Revision: 2dbe88db5804f32c6dfc1aa474881c3cb7a61d03
> 
> URL: https://github.com/llvm/llvm-project/commit/2dbe88db5804f32c6dfc1aa474881c3cb7a61d03
> DIFF: https://github.com/llvm/llvm-project/commit/2dbe88db5804f32c6dfc1aa474881c3cb7a61d03.diff
> 
> LOG: [lldb] Fix up SysV ABI implementations after 057efa9916cdc354ef4653bcd128a578cc43125e
> 
> Added: 
> 
> 
> Modified: 
>    lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp
>    lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp
>    lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp
>    lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp
>    lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp
> 
> Removed: 
> 
> 
> 
> ################################################################################
> diff  --git a/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp
> index be8586722d8f..60cdbc534113 100644
> --- a/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp
> +++ b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp
> @@ -466,7 +466,7 @@ ABISysV_arc::GetReturnValueObjectSimple(Thread &thread,
>     if (!SetSizedInteger(value.GetScalar(), raw_value, byte_size, is_signed))
>       return ValueObjectSP();
> 
> -    value.SetValueType(Value::eValueTypeScalar);
> +    value.SetValueType(Value::ValueType::Scalar);
>   }
>   // Pointer return type.
>   else if (type_flags & eTypeIsPointer) {
> @@ -474,7 +474,7 @@ ABISysV_arc::GetReturnValueObjectSimple(Thread &thread,
>                                                 LLDB_REGNUM_GENERIC_ARG1);
>     value.GetScalar() = reg_ctx->ReadRegisterAsUnsigned(reg_info_r0, 0);
> 
> -    value.SetValueType(Value::eValueTypeScalar);
> +    value.SetValueType(Value::ValueType::Scalar);
>   }
>   // Floating point return type.
>   else if (type_flags & eTypeIsFloat) {
> @@ -537,7 +537,7 @@ ValueObjectSP ABISysV_arc::GetReturnValueObjectImpl(Thread &thread,
>     auto reg_info_r0 = reg_ctx->GetRegisterInfo(eRegisterKindGeneric,
>                                                 LLDB_REGNUM_GENERIC_ARG1);
>     value.GetScalar() = reg_ctx->ReadRegisterAsUnsigned(reg_info_r0, 0);
> -    value.SetValueType(Value::eValueTypeScalar);
> +    value.SetValueType(Value::ValueType::Scalar);
>   }
>   // Floating point return type.
>   else if (retType.isFloatingPointTy()) {
> 
> diff  --git a/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp
> index 751555722dac..5e72af076f66 100644
> --- a/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp
> +++ b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp
> @@ -764,7 +764,7 @@ ValueObjectSP ABISysV_mips64::GetReturnValueObjectImpl(
>   const RegisterInfo *r3_info = reg_ctx->GetRegisterInfoByName("r3", 0);
> 
>   if (type_flags & eTypeIsScalar || type_flags & eTypeIsPointer) {
> -    value.SetValueType(Value::eValueTypeScalar);
> +    value.SetValueType(Value::ValueType::Scalar);
> 
>     bool success = false;
>     if (type_flags & eTypeIsInteger || type_flags & eTypeIsPointer) {
> 
> diff  --git a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp
> index 91d2e59ed632..d5605642d623 100644
> --- a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp
> +++ b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp
> @@ -520,7 +520,7 @@ ValueObjectSP ABISysV_ppc::GetReturnValueObjectSimple(
> 
>   const uint32_t type_flags = return_compiler_type.GetTypeInfo();
>   if (type_flags & eTypeIsScalar) {
> -    value.SetValueType(Value::eValueTypeScalar);
> +    value.SetValueType(Value::ValueType::Scalar);
> 
>     bool success = false;
>     if (type_flags & eTypeIsInteger) {
> @@ -603,7 +603,7 @@ ValueObjectSP ABISysV_ppc::GetReturnValueObjectSimple(
>         reg_ctx->GetRegisterInfoByName("r3", 0)->kinds[eRegisterKindLLDB];
>     value.GetScalar() =
>         (uint64_t)thread.GetRegisterContext()->ReadRegisterAsUnsigned(r3_id, 0);
> -    value.SetValueType(Value::eValueTypeScalar);
> +    value.SetValueType(Value::ValueType::Scalar);
>     return_valobj_sp = ValueObjectConstResult::Create(
>         thread.GetStackFrameAtIndex(0).get(), value, ConstString(""));
>   } else if (type_flags & eTypeIsVector) {
> 
> diff  --git a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp
> index c7cb7736df9f..603143190dc5 100644
> --- a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp
> +++ b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp
> @@ -577,7 +577,7 @@ class ReturnValueExtractor {
>   ValueSP NewScalarValue(CompilerType &type) {
>     ValueSP value_sp(new Value);
>     value_sp->SetCompilerType(type);
> -    value_sp->SetValueType(Value::eValueTypeScalar);
> +    value_sp->SetValueType(Value::ValueType::Scalar);
>     return value_sp;
>   }
> 
> 
> diff  --git a/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp b/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp
> index 22a64170017b..88e85111d871 100644
> --- a/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp
> +++ b/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp
> @@ -487,7 +487,7 @@ ValueObjectSP ABISysV_s390x::GetReturnValueObjectSimple(
> 
>   const uint32_t type_flags = return_compiler_type.GetTypeInfo();
>   if (type_flags & eTypeIsScalar) {
> -    value.SetValueType(Value::eValueTypeScalar);
> +    value.SetValueType(Value::ValueType::Scalar);
> 
>     bool success = false;
>     if (type_flags & eTypeIsInteger) {
> @@ -571,7 +571,7 @@ ValueObjectSP ABISysV_s390x::GetReturnValueObjectSimple(
>         reg_ctx->GetRegisterInfoByName("r2", 0)->kinds[eRegisterKindLLDB];
>     value.GetScalar() =
>         (uint64_t)thread.GetRegisterContext()->ReadRegisterAsUnsigned(r2_id, 0);
> -    value.SetValueType(Value::eValueTypeScalar);
> +    value.SetValueType(Value::ValueType::Scalar);
>     return_valobj_sp = ValueObjectConstResult::Create(
>         thread.GetStackFrameAtIndex(0).get(), value, ConstString(""));
>   }
> 
> 
> 
> _______________________________________________
> lldb-commits mailing list
> lldb-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits