6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 04:30:23 +00:00
Code Issues Projects Releases Wiki Activity

Commit missed files from nocapture change.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@61240 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Nick Lewycky 2008-12-19 09:38:31 +00:00
parent f23d0d392a
commit 73ddd4f00d
5 changed files with 49 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/AsmParser/LLLexer.cpp
View File

@ -491,6 +491,7 @@ int LLLexer::LexIdentifier() {
KEYWORD("nounwind", NOUNWIND);
KEYWORD("noreturn", NORETURN);
KEYWORD("noalias", NOALIAS);
KEYWORD("nocapture", NOCAPTURE);
KEYWORD("byval", BYVAL);
KEYWORD("nest", NEST);
KEYWORD("readnone", READNONE);

29
lib/AsmParser/llvmAsmParser.y
View File

@ -1136,8 +1136,8 @@ Module *llvm::RunVMAsmParser(llvm::MemoryBuffer *MB) {
%token <OtherOpVal> EXTRACTVALUE INSERTVALUE
// Function Attributes
%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS BYVAL NEST
%token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ
%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS NOCAPTURE BYVAL
%token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ NEST
// Visibility Styles
%token DEFAULT HIDDEN PROTECTED
@ -1265,15 +1265,16 @@ OptCallingConv : /*empty*/ { $$ = CallingConv::C; } |
CHECK_FOR_ERROR
};
Attribute : ZEROEXT { $$ = Attribute::ZExt; }
| ZEXT { $$ = Attribute::ZExt; }
| SIGNEXT { $$ = Attribute::SExt; }
| SEXT { $$ = Attribute::SExt; }
| INREG { $$ = Attribute::InReg; }
| SRET { $$ = Attribute::StructRet; }
| NOALIAS { $$ = Attribute::NoAlias; }
| BYVAL { $$ = Attribute::ByVal; }
| NEST { $$ = Attribute::Nest; }
Attribute : ZEROEXT { $$ = Attribute::ZExt; }
| ZEXT { $$ = Attribute::ZExt; }
| SIGNEXT { $$ = Attribute::SExt; }
| SEXT { $$ = Attribute::SExt; }
| INREG { $$ = Attribute::InReg; }
| SRET { $$ = Attribute::StructRet; }
| NOALIAS { $$ = Attribute::NoAlias; }
| NOCAPTURE { $$ = Attribute::NoCapture; }
| BYVAL { $$ = Attribute::ByVal; }
| NEST { $$ = Attribute::Nest; }
| ALIGN EUINT64VAL { $$ =
Attribute::constructAlignmentFromInt($2); }
;
@ -1331,6 +1332,8 @@ OptAlign : /*empty*/ { $$ = 0; } |
$$ = $2;
if ($$ != 0 && !isPowerOf2_32($$))
GEN_ERROR("Alignment must be a power of two");
if ($$ > 0x40000000)
GEN_ERROR("Alignment too large");
CHECK_FOR_ERROR
};
OptCAlign : /*empty*/ { $$ = 0; } |
@ -1338,6 +1341,8 @@ OptCAlign : /*empty*/ { $$ = 0; } |
$$ = $3;
if ($$ != 0 && !isPowerOf2_32($$))
GEN_ERROR("Alignment must be a power of two");
if ($$ > 0x40000000)
GEN_ERROR("Alignment too large");
CHECK_FOR_ERROR
};
@ -1367,6 +1372,8 @@ GlobalVarAttribute : SectionString {
| ALIGN EUINT64VAL {
if ($2 != 0 && !isPowerOf2_32($2))
GEN_ERROR("Alignment must be a power of two");
if ($2 > 0x40000000)
GEN_ERROR("Alignment too large");
CurGV->setAlignment($2);
CHECK_FOR_ERROR
};

14
lib/Bitcode/Reader/BitcodeReader.cpp
View File

@ -362,6 +362,20 @@ bool BitcodeReader::ParseAttributeBlock() {
Attributes RetAttribute = Attribute::None;
Attributes FnAttribute = Attribute::None;
for (unsigned i = 0, e = Record.size(); i != e; i += 2) {
// FIXME: remove in LLVM 3.0
// The alignment is stored as a 16-bit raw value from bits 31--16.
// We shift the bits above 31 down by 11 bits.
unsigned Alignment = (Record[i+1] & (0xffffull << 16)) >> 16;
if (Alignment && !isPowerOf2_32(Alignment))
return Error("Alignment is not a power of two.");
Attributes ReconstitutedAttr = Record[i+1] & 0xffff;
if (Alignment)
ReconstitutedAttr |= Attribute::constructAlignmentFromInt(Alignment);
ReconstitutedAttr |= (Record[i+1] & (0xffffull << 32)) >> 11;
Record[i+1] = ReconstitutedAttr;
if (Record[i] == 0)
RetAttribute = Record[i+1];
else if (Record[i] == ~0U)

12
lib/Bitcode/Writer/BitcodeWriter.cpp
View File

@ -122,7 +122,17 @@ static void WriteAttributeTable(const ValueEnumerator &VE,
for (unsigned i = 0, e = A.getNumSlots(); i != e; ++i) {
const AttributeWithIndex &PAWI = A.getSlot(i);
Record.push_back(PAWI.Index);
Record.push_back(PAWI.Attrs);
// FIXME: remove in LLVM 3.0
// Store the alignment in the bitcode as a 16-bit raw value instead of a
// 5-bit log2 encoded value. Shift the bits above the alignment up by
// 11 bits.
uint64_t FauxAttr = PAWI.Attrs & 0xffff;
if (PAWI.Attrs & Attribute::Alignment)
FauxAttr |= (1ull<<16)<<(((PAWI.Attrs & Attribute::Alignment)-1) >> 16);
FauxAttr |= (PAWI.Attrs & (0x3FFull << 21)) << 11;
Record.push_back(FauxAttr);
}
Stream.EmitRecord(bitc::PARAMATTR_CODE_ENTRY, Record);

7
lib/VMCore/Attributes.cpp
View File

@ -37,6 +37,8 @@ std::string Attribute::getAsString(Attributes Attrs) {
Result += "inreg ";
if (Attrs & Attribute::NoAlias)
Result += "noalias ";
if (Attrs & Attribute::NoCapture)
Result += "nocapture ";
if (Attrs & Attribute::StructRet)
Result += "sret ";
if (Attrs & Attribute::ByVal)
@ -59,10 +61,11 @@ std::string Attribute::getAsString(Attributes Attrs) {
Result += "sspreq ";
if (Attrs & Attribute::Alignment) {
Result += "align ";
Result += utostr((Attrs & Attribute::Alignment) >> 16);
Result += utostr(1ull << (((Attrs & Attribute::Alignment)>>16) - 1));
Result += " ";
}
// Trim the trailing space.
assert(!Result.empty() && "Unknown attribute!");
Result.erase(Result.end()-1);
return Result;
}
@ -76,7 +79,7 @@ Attributes Attribute::typeIncompatible(const Type *Ty) {
if (!isa<PointerType>(Ty))
// Attributes that only apply to pointers.
Incompatible |= ByVal | Nest | NoAlias | StructRet;
Incompatible |= ByVal | Nest | NoAlias | StructRet | NoCapture;
return Incompatible;
}