mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-07-24 08:29:39 +00:00
Twines: Support numeric conversion directly (uitostr, etc).
- Provides static constructors for doing number to string conversions without using temporaries. - There are several ways to do this, I think given the Twine constraints this is the simplest one. - One FIXME for fast number -> hex conversion. - Added another comment on one last major bit of perf work Twines need, which is to make raw_svector_ostream more efficient. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@77445 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
78a3dd8fe1
commit
763457e70b
@ -86,6 +86,9 @@ namespace llvm {
|
|||||||
/// The empty string.
|
/// The empty string.
|
||||||
EmptyKind,
|
EmptyKind,
|
||||||
|
|
||||||
|
/// A pointer to a Twine instance.
|
||||||
|
TwineKind,
|
||||||
|
|
||||||
/// A pointer to a C string instance.
|
/// A pointer to a C string instance.
|
||||||
CStringKind,
|
CStringKind,
|
||||||
|
|
||||||
@ -95,8 +98,16 @@ namespace llvm {
|
|||||||
/// A pointer to a StringRef instance.
|
/// A pointer to a StringRef instance.
|
||||||
StringRefKind,
|
StringRefKind,
|
||||||
|
|
||||||
/// A pointer to a Twine instance.
|
/// A pointer to a uint64_t value, to render as an unsigned decimal
|
||||||
TwineKind
|
/// integer.
|
||||||
|
UDecKind,
|
||||||
|
|
||||||
|
/// A pointer to a uint64_t value, to render as an unsigned hexadecimal
|
||||||
|
/// integer.
|
||||||
|
UHexKind,
|
||||||
|
|
||||||
|
/// A pointer to a uint64_t value, to render as a signed decimal integer.
|
||||||
|
SDecKind
|
||||||
};
|
};
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@ -232,12 +243,6 @@ namespace llvm {
|
|||||||
assert(isValid() && "Invalid twine!");
|
assert(isValid() && "Invalid twine!");
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Create a 'null' string, which is an empty string that always
|
|
||||||
/// concatenates to form another empty string.
|
|
||||||
static Twine createNull() {
|
|
||||||
return Twine(NullKind);
|
|
||||||
}
|
|
||||||
|
|
||||||
// FIXME: Unfortunately, to make sure this is as efficient as possible we
|
// FIXME: Unfortunately, to make sure this is as efficient as possible we
|
||||||
// need extra binary constructors from particular types. We can't rely on
|
// need extra binary constructors from particular types. We can't rely on
|
||||||
// the compiler to be smart enough to fold operator+()/concat() down to the
|
// the compiler to be smart enough to fold operator+()/concat() down to the
|
||||||
@ -255,6 +260,38 @@ namespace llvm {
|
|||||||
assert(isValid() && "Invalid twine!");
|
assert(isValid() && "Invalid twine!");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Create a 'null' string, which is an empty string that always
|
||||||
|
/// concatenates to form another empty string.
|
||||||
|
static Twine createNull() {
|
||||||
|
return Twine(NullKind);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// @}
|
||||||
|
/// @name Numeric Conversions
|
||||||
|
/// @{
|
||||||
|
|
||||||
|
/// Construct a twine to print \arg Val as an unsigned decimal integer.
|
||||||
|
static Twine utostr(const uint64_t &Val) {
|
||||||
|
return Twine(&Val, UDecKind, 0, EmptyKind);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Construct a twine to print \arg Val as a signed decimal integer.
|
||||||
|
static Twine itostr(const int64_t &Val) {
|
||||||
|
return Twine(&Val, SDecKind, 0, EmptyKind);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Construct a twine to print \arg Val as an unsigned hexadecimal integer.
|
||||||
|
static Twine utohexstr(const uint64_t &Val) {
|
||||||
|
return Twine(&Val, UHexKind, 0, EmptyKind);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Construct a twine to print \arg Val as an unsigned hexadecimal
|
||||||
|
// integer. This routine is provided as a convenience to sign extend values
|
||||||
|
// before printing.
|
||||||
|
static Twine itohexstr(const int64_t &Val) {
|
||||||
|
return Twine(&Val, UHexKind, 0, EmptyKind);
|
||||||
|
}
|
||||||
|
|
||||||
/// @}
|
/// @}
|
||||||
/// @name String Operations
|
/// @name String Operations
|
||||||
/// @{
|
/// @{
|
||||||
|
@ -19,6 +19,13 @@ std::string Twine::str() const {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Twine::toVector(SmallVectorImpl<char> &Out) const {
|
void Twine::toVector(SmallVectorImpl<char> &Out) const {
|
||||||
|
// FIXME: This is very inefficient, since we are creating a large raw_ostream
|
||||||
|
// buffer -- hitting malloc, which we were supposed to avoid -- all when we
|
||||||
|
// have this pretty little small vector available.
|
||||||
|
//
|
||||||
|
// The best way to fix this is to make raw_svector_ostream do the right thing
|
||||||
|
// and be efficient, by augmenting the base raw_ostream with the ability to
|
||||||
|
// have the buffer managed by a concrete implementation.
|
||||||
raw_svector_ostream OS(Out);
|
raw_svector_ostream OS(Out);
|
||||||
print(OS);
|
print(OS);
|
||||||
}
|
}
|
||||||
@ -28,6 +35,9 @@ void Twine::printOneChild(raw_ostream &OS, const void *Ptr,
|
|||||||
switch (Kind) {
|
switch (Kind) {
|
||||||
case Twine::NullKind: break;
|
case Twine::NullKind: break;
|
||||||
case Twine::EmptyKind: break;
|
case Twine::EmptyKind: break;
|
||||||
|
case Twine::TwineKind:
|
||||||
|
static_cast<const Twine*>(Ptr)->print(OS);
|
||||||
|
break;
|
||||||
case Twine::CStringKind:
|
case Twine::CStringKind:
|
||||||
OS << static_cast<const char*>(Ptr);
|
OS << static_cast<const char*>(Ptr);
|
||||||
break;
|
break;
|
||||||
@ -37,8 +47,15 @@ void Twine::printOneChild(raw_ostream &OS, const void *Ptr,
|
|||||||
case Twine::StringRefKind:
|
case Twine::StringRefKind:
|
||||||
OS << *static_cast<const StringRef*>(Ptr);
|
OS << *static_cast<const StringRef*>(Ptr);
|
||||||
break;
|
break;
|
||||||
case Twine::TwineKind:
|
case Twine::UDecKind:
|
||||||
static_cast<const Twine*>(Ptr)->print(OS);
|
OS << *static_cast<const uint64_t*>(Ptr);
|
||||||
|
break;
|
||||||
|
case Twine::SDecKind:
|
||||||
|
OS << *static_cast<const int64_t*>(Ptr);
|
||||||
|
break;
|
||||||
|
case Twine::UHexKind:
|
||||||
|
// FIXME: Add raw_ostream functionality for this.
|
||||||
|
OS << ::utohexstr(*static_cast<const uint64_t*>(Ptr));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -50,22 +67,31 @@ void Twine::printOneChildRepr(raw_ostream &OS, const void *Ptr,
|
|||||||
OS << "null"; break;
|
OS << "null"; break;
|
||||||
case Twine::EmptyKind:
|
case Twine::EmptyKind:
|
||||||
OS << "empty"; break;
|
OS << "empty"; break;
|
||||||
case Twine::CStringKind:
|
|
||||||
OS << "cstring:\""
|
|
||||||
<< static_cast<const char*>(Ptr) << "\"";
|
|
||||||
break;
|
|
||||||
case Twine::StdStringKind:
|
|
||||||
OS << "std::string:\""
|
|
||||||
<< *static_cast<const std::string*>(Ptr) << "\"";
|
|
||||||
break;
|
|
||||||
case Twine::StringRefKind:
|
|
||||||
OS << "stringref:\""
|
|
||||||
<< *static_cast<const StringRef*>(Ptr) << "\"";
|
|
||||||
break;
|
|
||||||
case Twine::TwineKind:
|
case Twine::TwineKind:
|
||||||
OS << "rope:";
|
OS << "rope:";
|
||||||
static_cast<const Twine*>(Ptr)->printRepr(OS);
|
static_cast<const Twine*>(Ptr)->printRepr(OS);
|
||||||
break;
|
break;
|
||||||
|
case Twine::CStringKind:
|
||||||
|
OS << "cstring:\""
|
||||||
|
<< static_cast<const char*>(Ptr) << "\"";
|
||||||
|
break;
|
||||||
|
case Twine::StdStringKind:
|
||||||
|
OS << "std::string:\""
|
||||||
|
<< static_cast<const std::string*>(Ptr) << "\"";
|
||||||
|
break;
|
||||||
|
case Twine::StringRefKind:
|
||||||
|
OS << "stringref:\""
|
||||||
|
<< static_cast<const StringRef*>(Ptr) << "\"";
|
||||||
|
break;
|
||||||
|
case Twine::UDecKind:
|
||||||
|
OS << "udec:" << static_cast<const uint64_t*>(Ptr) << "\"";
|
||||||
|
break;
|
||||||
|
case Twine::SDecKind:
|
||||||
|
OS << "sdec:" << static_cast<const int64_t*>(Ptr) << "\"";
|
||||||
|
break;
|
||||||
|
case Twine::UHexKind:
|
||||||
|
OS << "uhex:" << static_cast<const uint64_t*>(Ptr) << "\"";
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -30,6 +30,18 @@ TEST(TwineTest, Construction) {
|
|||||||
EXPECT_EQ("hi", Twine(StringRef("hithere", 2)).str());
|
EXPECT_EQ("hi", Twine(StringRef("hithere", 2)).str());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST(TwineTest, Numbers) {
|
||||||
|
EXPECT_EQ("123", Twine::utostr(123).str());
|
||||||
|
EXPECT_EQ("-123", Twine::itostr(-123).str());
|
||||||
|
EXPECT_EQ("123", Twine::utostr(123).str());
|
||||||
|
EXPECT_EQ("-123", Twine::itostr(-123).str());
|
||||||
|
EXPECT_EQ("123", Twine::utostr((char) 123).str());
|
||||||
|
EXPECT_EQ("-123", Twine::itostr((char) -123).str());
|
||||||
|
|
||||||
|
EXPECT_EQ("7B", Twine::utohexstr(123).str());
|
||||||
|
EXPECT_EQ("FFFFFFFFFFFFFF85", Twine::itohexstr(-123).str());
|
||||||
|
}
|
||||||
|
|
||||||
TEST(TwineTest, Concat) {
|
TEST(TwineTest, Concat) {
|
||||||
// Check verse repr, since we care about the actual representation not just
|
// Check verse repr, since we care about the actual representation not just
|
||||||
// the result.
|
// the result.
|
||||||
|
Loading…
Reference in New Issue
Block a user