https://github.com/cmtice updated
https://github.com/llvm/llvm-project/pull/86862
>From 03ef6db02f49ab4cc4f63b32553015b4f3801b5b Mon Sep 17 00:00:00 2001
From: Caroline Tice <cmt...@google.com>
Date: Wed, 27 Mar 2024 10:09:45 -0700
Subject: [PATCH 1/4] [LLDB] Add APFloat helper functions to Scalar class.
This adds the ability to create a Scalar from an APFloat, and to
create an APFloat from an APSInt or another APFloat.
---
lldb/include/lldb/Utility/Scalar.h | 6 +++++
lldb/source/Utility/Scalar.cpp | 42 ++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+)
diff --git a/lldb/include/lldb/Utility/Scalar.h
b/lldb/include/lldb/Utility/Scalar.h
index 8e087a5ddeb855..d5e70fdf203001 100644
--- a/lldb/include/lldb/Utility/Scalar.h
+++ b/lldb/include/lldb/Utility/Scalar.h
@@ -71,6 +71,8 @@ class Scalar {
: m_type(e_int), m_integer(std::move(v), false), m_float(0.0f) {}
Scalar(llvm::APSInt v)
: m_type(e_int), m_integer(std::move(v)), m_float(0.0f) {}
+ Scalar(llvm::APFloat v)
+ : m_integer(0), m_float(v) {}
bool SignExtend(uint32_t bit_pos);
@@ -186,6 +188,10 @@ class Scalar {
Status SetValueFromData(const DataExtractor &data, lldb::Encoding encoding,
size_t byte_size);
+ llvm::APFloat CreateAPFloatFromAPSInt(lldb::BasicType basic_type);
+
+ llvm::APFloat CreateAPFloatFromAPFloat(lldb::BasicType basic_type);
+
protected:
Scalar::Type m_type = e_void;
llvm::APSInt m_integer;
diff --git a/lldb/source/Utility/Scalar.cpp b/lldb/source/Utility/Scalar.cpp
index 5ad68065bce1b7..afcb204d8f95a5 100644
--- a/lldb/source/Utility/Scalar.cpp
+++ b/lldb/source/Utility/Scalar.cpp
@@ -813,6 +813,48 @@ bool Scalar::ExtractBitfield(uint32_t bit_size, uint32_t
bit_offset) {
return false;
}
+llvm::APFloat Scalar::CreateAPFloatFromAPSInt(lldb::BasicType basic_type) {
+ switch (basic_type) {
+ case lldb::eBasicTypeFloat:
+ return llvm::APFloat(m_integer.isSigned()
+ ? llvm::APIntOps::RoundSignedAPIntToFloat(m_integer)
+ : llvm::APIntOps::RoundAPIntToFloat(m_integer));
+ case lldb::eBasicTypeDouble:
+ // No way to get more precision at the moment.
+ case lldb::eBasicTypeLongDouble:
+ return llvm::APFloat(m_integer.isSigned()
+ ? llvm::APIntOps::RoundSignedAPIntToDouble(
+ m_integer)
+ :
llvm::APIntOps::RoundAPIntToDouble(m_integer));
+ default:
+ const llvm::fltSemantics &sem = APFloat::IEEEsingle();
+ return llvm::APFloat::getNaN(sem);
+ }
+}
+
+llvm::APFloat Scalar::CreateAPFloatFromAPFloat(lldb::BasicType basic_type) {
+ switch (basic_type) {
+ case lldb::eBasicTypeFloat: {
+ bool loses_info;
+ m_float.convert(llvm::APFloat::IEEEsingle(),
+ llvm::APFloat::rmNearestTiesToEven, &loses_info);
+ return m_float;
+ }
+ case lldb::eBasicTypeDouble:
+ // No way to get more precision at the moment.
+ case lldb::eBasicTypeLongDouble: {
+ bool loses_info;
+ m_float.convert(llvm::APFloat::IEEEdouble(),
+ llvm::APFloat::rmNearestTiesToEven, &loses_info);
+ return m_float;
+ }
+ default:
+ const llvm::fltSemantics &sem = APFloat::IEEEsingle();
+ return llvm::APFloat::getNaN(sem);
+ }
+}
+
+
bool lldb_private::operator==(Scalar lhs, Scalar rhs) {
// If either entry is void then we can just compare the types
if (lhs.m_type == Scalar::e_void || rhs.m_type == Scalar::e_void)
>From 8de923d01dca34061f6a5ea7dad995ad754426ca Mon Sep 17 00:00:00 2001
From: Caroline Tice <cmt...@google.com>
Date: Wed, 27 Mar 2024 13:17:23 -0700
Subject: [PATCH 2/4] [LLDB] Add APFloat helper functions to Scalar class.
Fix clang-format issues.
---
lldb/include/lldb/Utility/Scalar.h | 3 +-
lldb/source/Utility/Scalar.cpp | 62 +++++++++++++++---------------
2 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/lldb/include/lldb/Utility/Scalar.h
b/lldb/include/lldb/Utility/Scalar.h
index d5e70fdf203001..c89566f5e9d01a 100644
--- a/lldb/include/lldb/Utility/Scalar.h
+++ b/lldb/include/lldb/Utility/Scalar.h
@@ -71,8 +71,7 @@ class Scalar {
: m_type(e_int), m_integer(std::move(v), false), m_float(0.0f) {}
Scalar(llvm::APSInt v)
: m_type(e_int), m_integer(std::move(v)), m_float(0.0f) {}
- Scalar(llvm::APFloat v)
- : m_integer(0), m_float(v) {}
+ Scalar(llvm::APFloat v) : m_integer(0), m_float(v) {}
bool SignExtend(uint32_t bit_pos);
diff --git a/lldb/source/Utility/Scalar.cpp b/lldb/source/Utility/Scalar.cpp
index afcb204d8f95a5..e94fd459623665 100644
--- a/lldb/source/Utility/Scalar.cpp
+++ b/lldb/source/Utility/Scalar.cpp
@@ -815,46 +815,46 @@ bool Scalar::ExtractBitfield(uint32_t bit_size, uint32_t
bit_offset) {
llvm::APFloat Scalar::CreateAPFloatFromAPSInt(lldb::BasicType basic_type) {
switch (basic_type) {
- case lldb::eBasicTypeFloat:
- return llvm::APFloat(m_integer.isSigned()
- ? llvm::APIntOps::RoundSignedAPIntToFloat(m_integer)
- : llvm::APIntOps::RoundAPIntToFloat(m_integer));
- case lldb::eBasicTypeDouble:
- // No way to get more precision at the moment.
- case lldb::eBasicTypeLongDouble:
- return llvm::APFloat(m_integer.isSigned()
- ? llvm::APIntOps::RoundSignedAPIntToDouble(
- m_integer)
- :
llvm::APIntOps::RoundAPIntToDouble(m_integer));
- default:
- const llvm::fltSemantics &sem = APFloat::IEEEsingle();
- return llvm::APFloat::getNaN(sem);
+ case lldb::eBasicTypeFloat:
+ return llvm::APFloat(
+ m_integer.isSigned()
+ ? llvm::APIntOps::RoundSignedAPIntToFloat(m_integer)
+ : llvm::APIntOps::RoundAPIntToFloat(m_integer));
+ case lldb::eBasicTypeDouble:
+ // No way to get more precision at the moment.
+ case lldb::eBasicTypeLongDouble:
+ return llvm::APFloat(
+ m_integer.isSigned()
+ ? llvm::APIntOps::RoundSignedAPIntToDouble(m_integer)
+ : llvm::APIntOps::RoundAPIntToDouble(m_integer));
+ default:
+ const llvm::fltSemantics &sem = APFloat::IEEEsingle();
+ return llvm::APFloat::getNaN(sem);
}
}
llvm::APFloat Scalar::CreateAPFloatFromAPFloat(lldb::BasicType basic_type) {
switch (basic_type) {
- case lldb::eBasicTypeFloat: {
- bool loses_info;
- m_float.convert(llvm::APFloat::IEEEsingle(),
- llvm::APFloat::rmNearestTiesToEven, &loses_info);
- return m_float;
- }
- case lldb::eBasicTypeDouble:
- // No way to get more precision at the moment.
- case lldb::eBasicTypeLongDouble: {
- bool loses_info;
- m_float.convert(llvm::APFloat::IEEEdouble(),
+ case lldb::eBasicTypeFloat: {
+ bool loses_info;
+ m_float.convert(llvm::APFloat::IEEEsingle(),
llvm::APFloat::rmNearestTiesToEven, &loses_info);
- return m_float;
- }
- default:
- const llvm::fltSemantics &sem = APFloat::IEEEsingle();
- return llvm::APFloat::getNaN(sem);
+ return m_float;
+ }
+ case lldb::eBasicTypeDouble:
+ // No way to get more precision at the moment.
+ case lldb::eBasicTypeLongDouble: {
+ bool loses_info;
+ m_float.convert(llvm::APFloat::IEEEdouble(),
+ llvm::APFloat::rmNearestTiesToEven, &loses_info);
+ return m_float;
+ }
+ default:
+ const llvm::fltSemantics &sem = APFloat::IEEEsingle();
+ return llvm::APFloat::getNaN(sem);
}
}
-
bool lldb_private::operator==(Scalar lhs, Scalar rhs) {
// If either entry is void then we can just compare the types
if (lhs.m_type == Scalar::e_void || rhs.m_type == Scalar::e_void)
>From 93a87d62e0df26841e0539b0efea97a8de220369 Mon Sep 17 00:00:00 2001
From: Caroline Tice <cmt...@google.com>
Date: Thu, 28 Mar 2024 15:14:48 -0700
Subject: [PATCH 3/4] [LLDB] Add APFloat helper functions to Scalar class.
Add test cases for new functions.
---
lldb/include/lldb/Utility/Scalar.h | 2 +-
lldb/unittests/Utility/ScalarTest.cpp | 62 +++++++++++++++++++++++++++
2 files changed, 63 insertions(+), 1 deletion(-)
diff --git a/lldb/include/lldb/Utility/Scalar.h
b/lldb/include/lldb/Utility/Scalar.h
index c89566f5e9d01a..d7155884c6d1b8 100644
--- a/lldb/include/lldb/Utility/Scalar.h
+++ b/lldb/include/lldb/Utility/Scalar.h
@@ -71,7 +71,7 @@ class Scalar {
: m_type(e_int), m_integer(std::move(v), false), m_float(0.0f) {}
Scalar(llvm::APSInt v)
: m_type(e_int), m_integer(std::move(v)), m_float(0.0f) {}
- Scalar(llvm::APFloat v) : m_integer(0), m_float(v) {}
+ Scalar(llvm::APFloat v) : m_type(e_float), m_integer(0), m_float(v) {}
bool SignExtend(uint32_t bit_pos);
diff --git a/lldb/unittests/Utility/ScalarTest.cpp
b/lldb/unittests/Utility/ScalarTest.cpp
index 29a4bcd356f113..3e11725c6b9f2d 100644
--- a/lldb/unittests/Utility/ScalarTest.cpp
+++ b/lldb/unittests/Utility/ScalarTest.cpp
@@ -402,3 +402,65 @@ TEST(ScalarTest, TruncOrExtendTo) {
S.TruncOrExtendTo(16, false);
EXPECT_EQ(S.UInt128(APInt()), APInt(16, 0xffffu));
}
+
+TEST(ScalarTest, APFloatConstructor) {
+ llvm::APFloat my_single(llvm::APFloatBase::IEEEsingle(), "3.14159");
+ llvm::APFloat my_double(llvm::APFloatBase::IEEEdouble(), "3.14159");
+ Scalar S(my_single);
+ Scalar D(my_double);
+
+ EXPECT_EQ(S.GetType(), Scalar::e_float);
+ EXPECT_EQ(D.GetType(), Scalar::e_float);
+ ASSERT_TRUE(S != D);
+}
+
+TEST(ScalarTest, CreateAPFloats) {
+ llvm::APFloat ap_float(llvm::APFloatBase::IEEEsingle(), "3.14159");
+ llvm::APFloat ap_nan =
+ llvm::APFloat::getNaN(llvm::APFloat::IEEEsingle());
+ llvm::APSInt int1("12");
+ llvm::APSInt int2("-4");
+ Scalar I1(int1);
+ Scalar I2(int2);
+ Scalar F(ap_float);
+
+ llvm::APFloat out1_float =
+ I1.CreateAPFloatFromAPSInt(lldb::eBasicTypeFloat);
+ llvm::APFloat out1_double =
+ I1.CreateAPFloatFromAPSInt(lldb::eBasicTypeDouble);
+ llvm::APFloat out1_longdouble =
+ I1.CreateAPFloatFromAPSInt(lldb::eBasicTypeLongDouble);
+ llvm::APFloat out1_nan =
+ I1.CreateAPFloatFromAPSInt(lldb::eBasicTypeFloatComplex);
+ EXPECT_TRUE(!out1_float.isNegative());
+ EXPECT_TRUE(!out1_double.isNegative());
+ EXPECT_TRUE(out1_double.bitwiseIsEqual(out1_longdouble));
+ EXPECT_FALSE(out1_double.bitwiseIsEqual(out1_float));
+ EXPECT_TRUE(out1_nan.bitwiseIsEqual(ap_nan));
+
+ llvm::APFloat out2_float =
+ I2.CreateAPFloatFromAPSInt(lldb::eBasicTypeFloat);
+ llvm::APFloat out2_double =
+ I2.CreateAPFloatFromAPSInt(lldb::eBasicTypeDouble);
+ llvm::APFloat out2_longdouble =
+ I2.CreateAPFloatFromAPSInt(lldb::eBasicTypeLongDouble);
+ llvm::APFloat out2_nan =
+ I2.CreateAPFloatFromAPSInt(lldb::eBasicTypeFloatComplex);
+ EXPECT_TRUE(out2_float.isNegative());
+ EXPECT_TRUE(out2_double.isNegative());
+ EXPECT_TRUE(out2_double.bitwiseIsEqual(out2_longdouble));
+ EXPECT_FALSE(out2_double.bitwiseIsEqual(out2_float));
+ EXPECT_TRUE(out2_nan.bitwiseIsEqual(ap_nan));
+
+ llvm::APFloat out3_float =
+ F.CreateAPFloatFromAPFloat(lldb::eBasicTypeFloat);
+ llvm::APFloat out3_double =
+ F.CreateAPFloatFromAPFloat(lldb::eBasicTypeDouble);
+ llvm::APFloat out3_longdouble =
+ F.CreateAPFloatFromAPFloat(lldb::eBasicTypeLongDouble);
+ llvm::APFloat out3_nan =
+ F.CreateAPFloatFromAPFloat(lldb::eBasicTypeFloatComplex);
+ EXPECT_TRUE(out3_double.bitwiseIsEqual(out3_longdouble));
+ EXPECT_FALSE(out3_double.bitwiseIsEqual(out3_float));
+ EXPECT_TRUE(out3_nan.bitwiseIsEqual(ap_nan));
+}
>From 0e0625ebf403068b37e4def249cf160f139402b1 Mon Sep 17 00:00:00 2001
From: Caroline Tice <cmt...@google.com>
Date: Thu, 28 Mar 2024 15:19:14 -0700
Subject: [PATCH 4/4] [LLDB] Add APFloat helper functions to Scalar class.
Fix clang-format issues.
---
lldb/unittests/Utility/ScalarTest.cpp | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/lldb/unittests/Utility/ScalarTest.cpp
b/lldb/unittests/Utility/ScalarTest.cpp
index 3e11725c6b9f2d..8d957d16593ee7 100644
--- a/lldb/unittests/Utility/ScalarTest.cpp
+++ b/lldb/unittests/Utility/ScalarTest.cpp
@@ -416,16 +416,14 @@ TEST(ScalarTest, APFloatConstructor) {
TEST(ScalarTest, CreateAPFloats) {
llvm::APFloat ap_float(llvm::APFloatBase::IEEEsingle(), "3.14159");
- llvm::APFloat ap_nan =
- llvm::APFloat::getNaN(llvm::APFloat::IEEEsingle());
+ llvm::APFloat ap_nan = llvm::APFloat::getNaN(llvm::APFloat::IEEEsingle());
llvm::APSInt int1("12");
llvm::APSInt int2("-4");
Scalar I1(int1);
Scalar I2(int2);
Scalar F(ap_float);
- llvm::APFloat out1_float =
- I1.CreateAPFloatFromAPSInt(lldb::eBasicTypeFloat);
+ llvm::APFloat out1_float = I1.CreateAPFloatFromAPSInt(lldb::eBasicTypeFloat);
llvm::APFloat out1_double =
I1.CreateAPFloatFromAPSInt(lldb::eBasicTypeDouble);
llvm::APFloat out1_longdouble =
@@ -438,8 +436,7 @@ TEST(ScalarTest, CreateAPFloats) {
EXPECT_FALSE(out1_double.bitwiseIsEqual(out1_float));
EXPECT_TRUE(out1_nan.bitwiseIsEqual(ap_nan));
- llvm::APFloat out2_float =
- I2.CreateAPFloatFromAPSInt(lldb::eBasicTypeFloat);
+ llvm::APFloat out2_float = I2.CreateAPFloatFromAPSInt(lldb::eBasicTypeFloat);
llvm::APFloat out2_double =
I2.CreateAPFloatFromAPSInt(lldb::eBasicTypeDouble);
llvm::APFloat out2_longdouble =
@@ -452,8 +449,7 @@ TEST(ScalarTest, CreateAPFloats) {
EXPECT_FALSE(out2_double.bitwiseIsEqual(out2_float));
EXPECT_TRUE(out2_nan.bitwiseIsEqual(ap_nan));
- llvm::APFloat out3_float =
- F.CreateAPFloatFromAPFloat(lldb::eBasicTypeFloat);
+ llvm::APFloat out3_float = F.CreateAPFloatFromAPFloat(lldb::eBasicTypeFloat);
llvm::APFloat out3_double =
F.CreateAPFloatFromAPFloat(lldb::eBasicTypeDouble);
llvm::APFloat out3_longdouble =
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
