6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-18 12:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Adjust the interface to ConstantArray::get. The previous

Browse Source 
implementation always added a null byte to the end of the string. It turns
out that this is not always wanted. By adding a length parameter we preserve
this behavior when length==0 (default value) but also allow other lengths
(not null terminated) to be created.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28552 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2006-05-30 08:23:18 +00:00
parent 5a622f2e06
commit 8949477ae4
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/Constants.h
View File

@ -345,7 +345,7 @@ protected:
public:
/// get() - Static factory methods - Return objects of the specified value
static Constant *get(const ArrayType *T, const std::vector<Constant*> &);
static Constant *get(const std::string &Initializer);
static Constant *get(const std::string &Initializer, unsigned len = 0);
/// getType - Specialize the getType() method to always return an ArrayType,
/// which reduces the amount of casting needed in parts of the compiler.

23
lib/VMCore/Constants.cpp
View File

@ -924,20 +924,27 @@ void ConstantArray::destroyConstant() {
destroyConstantImpl();
}
// ConstantArray::get(const string&) - Return an array that is initialized to
// contain the specified string. A null terminator is added to the specified
// string so that it may be used in a natural way...
//
Constant *ConstantArray::get(const std::string &Str) {
/// ConstantArray::get(const string&) - Return an array that is initialized to
/// contain the specified string. If length is zero then a null terminator is
/// added to the specified string so that it may be used in a natural way.
/// Otherwise, the length parameter specifies how much of the string to use
/// and it won't be null terminated.
///
Constant *ConstantArray::get(const std::string &Str, unsigned length) {
assert(length <= Str.length() && "Invalid length for string");
std::vector<Constant*> ElementVals;
for (unsigned i = 0; i < Str.length(); ++i)
unsigned copy_len = (length == 0 ? Str.length() : length);
for (unsigned i = 0; i < copy_len; ++i)
ElementVals.push_back(ConstantSInt::get(Type::SByteTy, Str[i]));
// Add a null terminator to the string...
ElementVals.push_back(ConstantSInt::get(Type::SByteTy, 0));
if (length == 0) {
ElementVals.push_back(ConstantSInt::get(Type::SByteTy, 0));
copy_len++;
}
ArrayType *ATy = ArrayType::get(Type::SByteTy, Str.length()+1);
ArrayType *ATy = ArrayType::get(Type::SByteTy, copy_len);
return ConstantArray::get(ATy, ElementVals);
}