6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-04-30 22:37:28 +00:00
Code Issues Projects Releases Wiki Activity

Add an API for strings with possible NULLs in the middle. Refactor the other

Browse Source 
two AddString methods to use it.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@64005 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Nick Lewycky 2009-02-07 04:57:08 +00:00
parent f344d83d39
commit f996831427
2 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/llvm/ADT/FoldingSet.h
View File

@ -225,6 +225,7 @@ public:
void AddInteger(unsigned long I); void AddInteger(unsigned long I);
void AddInteger(long long I); void AddInteger(long long I);
void AddInteger(unsigned long long I); void AddInteger(unsigned long long I);
void AddString(const char* String, const char* End);
void AddString(const std::string &String); void AddString(const std::string &String);
void AddString(const char* String); void AddString(const char* String);

45
lib/Support/FoldingSet.cpp
View File

@ -62,8 +62,8 @@ void FoldingSetNodeID::AddInteger(unsigned long long I) {
Bits.push_back(unsigned(I >> 32)); Bits.push_back(unsigned(I >> 32));
} }
void FoldingSetNodeID::AddString(const char *String) { void FoldingSetNodeID::AddString(const char *String, const char *End) {
unsigned Size = static_cast<unsigned>(strlen(String)); unsigned Size = static_cast<unsigned>(End - String);
Bits.push_back(Size); Bits.push_back(Size);
if (!Size) return; if (!Size) return;
@ -77,7 +77,7 @@ void FoldingSetNodeID::AddString(const char *String) {
Pos = (Units + 1) * 4; Pos = (Units + 1) * 4;
} else { } else {
// Otherwise do it the hard way. // Otherwise do it the hard way.
for ( Pos += 4; Pos <= Size; Pos += 4) { for (Pos += 4; Pos <= Size; Pos += 4) {
unsigned V = ((unsigned char)String[Pos - 4] << 24) | unsigned V = ((unsigned char)String[Pos - 4] << 24) |
((unsigned char)String[Pos - 3] << 16) | ((unsigned char)String[Pos - 3] << 16) |
((unsigned char)String[Pos - 2] << 8) | ((unsigned char)String[Pos - 2] << 8) |
@ -99,41 +99,12 @@ void FoldingSetNodeID::AddString(const char *String) {
Bits.push_back(V); Bits.push_back(V);
} }
void FoldingSetNodeID::AddString(const char *String) {
AddString(String, String + strlen(String));
}
void FoldingSetNodeID::AddString(const std::string &String) { void FoldingSetNodeID::AddString(const std::string &String) {
unsigned Size = static_cast<unsigned>(String.size()); AddString(&*String.begin(), &*String.end());
Bits.push_back(Size);
if (!Size) return;
unsigned Units = Size / 4;
unsigned Pos = 0;
const unsigned *Base = (const unsigned *)String.data();
// If the string is aligned do a bulk transfer.
if (!((intptr_t)Base & 3)) {
Bits.append(Base, Base + Units);
Pos = (Units + 1) * 4;
} else {
// Otherwise do it the hard way.
for ( Pos += 4; Pos <= Size; Pos += 4) {
unsigned V = ((unsigned char)String[Pos - 4] << 24) |
((unsigned char)String[Pos - 3] << 16) |
((unsigned char)String[Pos - 2] << 8) |
(unsigned char)String[Pos - 1];
Bits.push_back(V);
}
}
// With the leftover bits.
unsigned V = 0;
// Pos will have overshot size by 4 - #bytes left over.
switch (Pos - Size) {
case 1: V = (V << 8) | (unsigned char)String[Size - 3]; // Fall thru.
case 2: V = (V << 8) | (unsigned char)String[Size - 2]; // Fall thru.
case 3: V = (V << 8) | (unsigned char)String[Size - 1]; break;
default: return; // Nothing left.
}
Bits.push_back(V);
} }
/// ComputeHash - Compute a strong hash value for this FoldingSetNodeID, used to /// ComputeHash - Compute a strong hash value for this FoldingSetNodeID, used to