maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Regenerate. 

llvm-svn: 37292
This commit is contained in:
Reid Spencer 2007-05-22 18:52:55 +00:00
parent 3b208cca84
commit acfe667eab
5 changed files with 646 additions and 660 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

391
llvm/lib/AsmParser/Lexer.cpp.cvs
View File

File diff suppressed because it is too large Load Diff

77
llvm/lib/AsmParser/Lexer.l.cvs
View File

@ -101,29 +101,20 @@ static double HexToFP(const char *Buffer) {
// UnEscapeLexed - Run through the specified buffer and change \xx codes to the // UnEscapeLexed - Run through the specified buffer and change \xx codes to the
// appropriate character. If AllowNull is set to false, a \00 value will cause // appropriate character.
// an exception to be thrown. char *UnEscapeLexed(char *Buffer) {
//
// If AllowNull is set to true, the return value of the function points to the
// last character of the string in memory.
//
char *UnEscapeLexed(char *Buffer, bool AllowNull) {
char *BOut = Buffer; char *BOut = Buffer;
for (char *BIn = Buffer; *BIn; ) { for (char *BIn = Buffer; *BIn; ) {
if (BIn[0] == '\\' && isxdigit(BIn[1]) && isxdigit(BIn[2])) { if (BIn[0] == '\\' && isxdigit(BIn[1]) && isxdigit(BIn[2])) {
char Tmp = BIn[3]; BIn[3] = 0; // Terminate string char Tmp = BIn[3]; BIn[3] = 0; // Terminate string
*BOut = (char)strtol(BIn+1, 0, 16); // Convert to number *BOut = (char)strtol(BIn+1, 0, 16); // Convert to number
if (!AllowNull && !*BOut) BIn[3] = Tmp; // Restore character
GenerateError("String literal cannot accept \\00 escape!"); BIn += 3; // Skip over handled chars
BIn[3] = Tmp; // Restore character
BIn += 3; // Skip over handled chars
++BOut; ++BOut;
} else { } else {
*BOut++ = *BIn++; *BOut++ = *BIn++;
} }
} }
return BOut; return BOut;
} }
@ -321,51 +312,49 @@ shufflevector { RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
{LocalVarName} { {LocalVarName} {
UnEscapeLexed(yytext+1); llvmAsmlval.StrVal = new std::string(yytext+1); // Skip %
llvmAsmlval.StrVal = strdup(yytext+1); // Skip %
return LOCALVAR; return LOCALVAR;
} }
{GlobalVarName} { {GlobalVarName} {
UnEscapeLexed(yytext+1); llvmAsmlval.StrVal = new std::string(yytext+1); // Skip @
llvmAsmlval.StrVal = strdup(yytext+1); // Skip @
return GLOBALVAR; return GLOBALVAR;
} }
{Label} { {Label} {
yytext[strlen(yytext)-1] = 0; // nuke colon yytext[yyleng-1] = 0; // nuke colon
UnEscapeLexed(yytext); llvmAsmlval.StrVal = new std::string(yytext);
llvmAsmlval.StrVal = strdup(yytext);
return LABELSTR; return LABELSTR;
} }
{QuoteLabel} { {QuoteLabel} {
yytext[strlen(yytext)-2] = 0; // nuke colon, end quote yytext[yyleng-2] = 0; // nuke colon, end quote
UnEscapeLexed(yytext+1); const char* EndChar = UnEscapeLexed(yytext+1);
llvmAsmlval.StrVal = strdup(yytext+1); llvmAsmlval.StrVal =
new std::string(yytext+1, EndChar - yytext - 1);
return LABELSTR; return LABELSTR;
} }
{StringConstant} { // Note that we cannot unescape a string constant here! The {StringConstant} { yytext[yyleng-1] = 0; // nuke end quote
// string constant might contain a \00 which would not be const char* EndChar = UnEscapeLexed(yytext+1);
// understood by the string stuff. It is valid to make a llvmAsmlval.StrVal =
// [sbyte] c"Hello World\00" constant, for example. new std::string(yytext+1, EndChar - yytext - 1);
//
yytext[strlen(yytext)-1] = 0; // nuke end quote
llvmAsmlval.StrVal = strdup(yytext+1); // Nuke start quote
return STRINGCONSTANT; return STRINGCONSTANT;
} }
{AtStringConstant} { {AtStringConstant} {
yytext[strlen(yytext)-1] = 0; // nuke end quote yytext[yyleng-1] = 0; // nuke end quote
llvmAsmlval.StrVal = strdup(yytext+2); // Nuke @, quote const char* EndChar = UnEscapeLexed(yytext+2);
llvmAsmlval.StrVal =
new std::string(yytext+2, EndChar - yytext - 2);
return ATSTRINGCONSTANT; return ATSTRINGCONSTANT;
} }
{PctStringConstant} { {PctStringConstant} {
yytext[strlen(yytext)-1] = 0; // nuke end quote yytext[yyleng-1] = 0; // nuke end quote
llvmAsmlval.StrVal = strdup(yytext+2); // Nuke %, quote const char* EndChar = UnEscapeLexed(yytext+2);
llvmAsmlval.StrVal =
new std::string(yytext+2, EndChar - yytext - 2);
return PCTSTRINGCONSTANT; return PCTSTRINGCONSTANT;
} }
{PInteger} { int len = strlen(yytext); {PInteger} {
uint32_t numBits = ((len * 64) / 19) + 1; uint32_t numBits = ((yyleng * 64) / 19) + 1;
APInt Tmp(numBits, yytext, len, 10); APInt Tmp(numBits, yytext, yyleng, 10);
uint32_t activeBits = Tmp.getActiveBits(); uint32_t activeBits = Tmp.getActiveBits();
if (activeBits > 0 && activeBits < numBits) if (activeBits > 0 && activeBits < numBits)
Tmp.trunc(activeBits); Tmp.trunc(activeBits);
@ -377,9 +366,9 @@ shufflevector { RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
return EUINT64VAL; return EUINT64VAL;
} }
} }
{NInteger} { int len = strlen(yytext); {NInteger} {
uint32_t numBits = (((len-1) * 64) / 19) + 2; uint32_t numBits = (((yyleng-1) * 64) / 19) + 2;
APInt Tmp(numBits, yytext, len, 10); APInt Tmp(numBits, yytext, yyleng, 10);
uint32_t minBits = Tmp.getMinSignedBits(); uint32_t minBits = Tmp.getMinSignedBits();
if (minBits > 0 && minBits < numBits) if (minBits > 0 && minBits < numBits)
Tmp.trunc(minBits); Tmp.trunc(minBits);
@ -392,7 +381,7 @@ shufflevector { RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
} }
} }
{HexIntConstant} { int len = strlen(yytext+3) - 3; {HexIntConstant} { int len = yyleng - 3;
uint32_t bits = len * 4; uint32_t bits = len * 4;
APInt Tmp(bits, yytext+3, len, 16); APInt Tmp(bits, yytext+3, len, 16);
uint32_t activeBits = Tmp.getActiveBits(); uint32_t activeBits = Tmp.getActiveBits();

692
llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
View File

File diff suppressed because it is too large Load Diff

6
llvm/lib/AsmParser/llvmAsmParser.h.cvs
View File

@ -307,7 +307,7 @@
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
#line 955 "/proj/llvm/llvm-2/lib/AsmParser/llvmAsmParser.y" #line 957 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
typedef union YYSTYPE { typedef union YYSTYPE {
llvm::Module *ModuleVal; llvm::Module *ModuleVal;
llvm::Function *FunctionVal; llvm::Function *FunctionVal;
@ -343,8 +343,8 @@ typedef union YYSTYPE {
double FPVal; double FPVal;
bool BoolVal; bool BoolVal;
char *StrVal; // This memory is strdup'd! std::string *StrVal; // This memory must be deleted
llvm::ValID ValIDVal; // strdup'd memory maybe! llvm::ValID ValIDVal;
llvm::Instruction::BinaryOps BinaryOpVal; llvm::Instruction::BinaryOps BinaryOpVal;
llvm::Instruction::TermOps TermOpVal; llvm::Instruction::TermOps TermOpVal;

140
llvm/lib/AsmParser/llvmAsmParser.y.cvs
View File

@ -282,7 +282,7 @@ static const Type *getTypeVal(const ValID &D, bool DoNotImprovise = false) {
return CurModule.Types[D.Num]; return CurModule.Types[D.Num];
break; break;
case ValID::LocalName: // Is it a named definition? case ValID::LocalName: // Is it a named definition?
if (const Type *N = CurModule.CurrentModule->getTypeByName(D.Name)) { if (const Type *N = CurModule.CurrentModule->getTypeByName(D.getName())) {
D.destroy(); // Free old strdup'd memory... D.destroy(); // Free old strdup'd memory...
return N; return N;
} }
@ -360,7 +360,7 @@ static Value *getExistingVal(const Type *Ty, const ValID &D) {
if (!inFunctionScope()) if (!inFunctionScope())
return 0; return 0;
ValueSymbolTable &SymTab = CurFun.CurrentFunction->getValueSymbolTable(); ValueSymbolTable &SymTab = CurFun.CurrentFunction->getValueSymbolTable();
Value *N = SymTab.lookup(D.Name); Value *N = SymTab.lookup(D.getName());
if (N == 0) if (N == 0)
return 0; return 0;
if (N->getType() != Ty) if (N->getType() != Ty)
@ -371,7 +371,7 @@ static Value *getExistingVal(const Type *Ty, const ValID &D) {
} }
case ValID::GlobalName: { // Is it a named definition? case ValID::GlobalName: { // Is it a named definition?
ValueSymbolTable &SymTab = CurModule.CurrentModule->getValueSymbolTable(); ValueSymbolTable &SymTab = CurModule.CurrentModule->getValueSymbolTable();
Value *N = SymTab.lookup(D.Name); Value *N = SymTab.lookup(D.getName());
if (N == 0) if (N == 0)
return 0; return 0;
if (N->getType() != Ty) if (N->getType() != Ty)
@ -550,7 +550,7 @@ static BasicBlock *defineBBVal(const ValID &ID) {
// We haven't seen this BB before and its first mention is a definition. // We haven't seen this BB before and its first mention is a definition.
// Just create it and return it. // Just create it and return it.
std::string Name (ID.Type == ValID::LocalName ? ID.Name : ""); std::string Name (ID.Type == ValID::LocalName ? ID.getName() : "");
BB = new BasicBlock(Name, CurFun.CurrentFunction); BB = new BasicBlock(Name, CurFun.CurrentFunction);
if (ID.Type == ValID::LocalID) { if (ID.Type == ValID::LocalID) {
assert(ID.Num == CurFun.NextValNum && "Invalid new block number"); assert(ID.Num == CurFun.NextValNum && "Invalid new block number");
@ -572,7 +572,7 @@ static BasicBlock *getBBVal(const ValID &ID) {
if (BBI != CurFun.BBForwardRefs.end()) { if (BBI != CurFun.BBForwardRefs.end()) {
BB = BBI->second; BB = BBI->second;
} if (ID.Type == ValID::LocalName) { } if (ID.Type == ValID::LocalName) {
std::string Name = ID.Name; std::string Name = ID.getName();
Value *N = CurFun.CurrentFunction->getValueSymbolTable().lookup(Name); Value *N = CurFun.CurrentFunction->getValueSymbolTable().lookup(Name);
if (N) if (N)
if (N->getType()->getTypeID() == Type::LabelTyID) if (N->getType()->getTypeID() == Type::LabelTyID)
@ -603,7 +603,7 @@ static BasicBlock *getBBVal(const ValID &ID) {
// Otherwise, this block has not been seen before, create it. // Otherwise, this block has not been seen before, create it.
std::string Name; std::string Name;
if (ID.Type == ValID::LocalName) if (ID.Type == ValID::LocalName)
Name = ID.Name; Name = ID.getName();
BB = new BasicBlock(Name, CurFun.CurrentFunction); BB = new BasicBlock(Name, CurFun.CurrentFunction);
// Insert it in the forward refs map. // Insert it in the forward refs map.
@ -675,10 +675,12 @@ ResolveDefinitions(ValueList &LateResolvers, ValueList *FutureLateResolvers) {
// name is not null) things referencing Name can be resolved. Otherwise, things // name is not null) things referencing Name can be resolved. Otherwise, things
// refering to the number can be resolved. Do this now. // refering to the number can be resolved. Do this now.
// //
static void ResolveTypeTo(char *Name, const Type *ToTy) { static void ResolveTypeTo(std::string *Name, const Type *ToTy) {
ValID D; ValID D;
if (Name) D = ValID::createLocalName(Name); if (Name)
else D = ValID::createLocalID(CurModule.Types.size()); D = ValID::createLocalName(*Name);
else
D = ValID::createLocalID(CurModule.Types.size());
std::map<ValID, PATypeHolder>::iterator I = std::map<ValID, PATypeHolder>::iterator I =
CurModule.LateResolveTypes.find(D); CurModule.LateResolveTypes.find(D);
@ -692,10 +694,10 @@ static void ResolveTypeTo(char *Name, const Type *ToTy) {
// null potentially, in which case this is a noop. The string passed in is // null potentially, in which case this is a noop. The string passed in is
// assumed to be a malloc'd string buffer, and is free'd by this function. // assumed to be a malloc'd string buffer, and is free'd by this function.
// //
static void setValueName(Value *V, char *NameStr) { static void setValueName(Value *V, std::string *NameStr) {
if (!NameStr) return; if (!NameStr) return;
std::string Name(NameStr); // Copy string std::string Name(*NameStr); // Copy string
free(NameStr); // Free old string delete NameStr; // Free old string
if (V->getType() == Type::VoidTy) { if (V->getType() == Type::VoidTy) {
GenerateError("Can't assign name '" + Name+"' to value with void type"); GenerateError("Can't assign name '" + Name+"' to value with void type");
@ -717,7 +719,7 @@ static void setValueName(Value *V, char *NameStr) {
/// ParseGlobalVariable - Handle parsing of a global. If Initializer is null, /// ParseGlobalVariable - Handle parsing of a global. If Initializer is null,
/// this is a declaration, otherwise it is a definition. /// this is a declaration, otherwise it is a definition.
static GlobalVariable * static GlobalVariable *
ParseGlobalVariable(char *NameStr, ParseGlobalVariable(std::string *NameStr,
GlobalValue::LinkageTypes Linkage, GlobalValue::LinkageTypes Linkage,
GlobalValue::VisibilityTypes Visibility, GlobalValue::VisibilityTypes Visibility,
bool isConstantGlobal, const Type *Ty, bool isConstantGlobal, const Type *Ty,
@ -731,15 +733,15 @@ ParseGlobalVariable(char *NameStr,
std::string Name; std::string Name;
if (NameStr) { if (NameStr) {
Name = NameStr; // Copy string Name = *NameStr; // Copy string
free(NameStr); // Free old string delete NameStr; // Free old string
} }
// See if this global value was forward referenced. If so, recycle the // See if this global value was forward referenced. If so, recycle the
// object. // object.
ValID ID; ValID ID;
if (!Name.empty()) { if (!Name.empty()) {
ID = ValID::createGlobalName((char*)Name.c_str()); ID = ValID::createGlobalName(Name);
} else { } else {
ID = ValID::createGlobalID(CurModule.Values.size()); ID = ValID::createGlobalID(CurModule.Values.size());
} }
@ -792,12 +794,12 @@ ParseGlobalVariable(char *NameStr,
// This function returns true if the type has already been defined, but is // This function returns true if the type has already been defined, but is
// allowed to be redefined in the specified context. If the name is a new name // allowed to be redefined in the specified context. If the name is a new name
// for the type plane, it is inserted and false is returned. // for the type plane, it is inserted and false is returned.
static bool setTypeName(const Type *T, char *NameStr) { static bool setTypeName(const Type *T, std::string *NameStr) {
assert(!inFunctionScope() && "Can't give types function-local names!"); assert(!inFunctionScope() && "Can't give types function-local names!");
if (NameStr == 0) return false; if (NameStr == 0) return false;
std::string Name(NameStr); // Copy string std::string Name(*NameStr); // Copy string
free(NameStr); // Free old string delete NameStr; // Free old string
// We don't allow assigning names to void type // We don't allow assigning names to void type
if (T == Type::VoidTy) { if (T == Type::VoidTy) {
@ -987,8 +989,8 @@ Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) {
double FPVal; double FPVal;
bool BoolVal; bool BoolVal;
char *StrVal; // This memory is strdup'd! std::string *StrVal; // This memory must be deleted
llvm::ValID ValIDVal; // strdup'd memory maybe! llvm::ValID ValIDVal;
llvm::Instruction::BinaryOps BinaryOpVal; llvm::Instruction::BinaryOps BinaryOpVal;
llvm::Instruction::TermOps TermOpVal; llvm::Instruction::TermOps TermOpVal;
@ -1051,13 +1053,15 @@ Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) {
%token <PrimType> FLOAT DOUBLE LABEL %token <PrimType> FLOAT DOUBLE LABEL
%token TYPE %token TYPE
%token<StrVal> LOCALVAR GLOBALVAR LABELSTR %token<StrVal> LOCALVAR GLOBALVAR LABELSTR
%token<StrVal> STRINGCONSTANT ATSTRINGCONSTANT PCTSTRINGCONSTANT %token<StrVal> STRINGCONSTANT ATSTRINGCONSTANT PCTSTRINGCONSTANT
%type <StrVal> LocalName OptLocalName OptLocalAssign %type <StrVal> LocalName OptLocalName OptLocalAssign
%type <StrVal> GlobalName OptGlobalAssign GlobalAssign %type <StrVal> GlobalName OptGlobalAssign GlobalAssign
%type <UIntVal> OptAlign OptCAlign
%type <StrVal> OptSection SectionString %type <StrVal> OptSection SectionString
%type <UIntVal> OptAlign OptCAlign
%token ZEROINITIALIZER TRUETOK FALSETOK BEGINTOK ENDTOK %token ZEROINITIALIZER TRUETOK FALSETOK BEGINTOK ENDTOK
%token DECLARE DEFINE GLOBAL CONSTANT SECTION ALIAS VOLATILE THREAD_LOCAL %token DECLARE DEFINE GLOBAL CONSTANT SECTION ALIAS VOLATILE THREAD_LOCAL
%token TO DOTDOTDOT NULL_TOK UNDEF INTERNAL LINKONCE WEAK APPENDING %token TO DOTDOTDOT NULL_TOK UNDEF INTERNAL LINKONCE WEAK APPENDING
@ -1139,7 +1143,7 @@ FPredicates
IntType : INTTYPE; IntType : INTTYPE;
FPType : FLOAT | DOUBLE; FPType : FLOAT | DOUBLE;
LocalName : LOCALVAR | STRINGCONSTANT | PCTSTRINGCONSTANT LocalName : LOCALVAR | STRINGCONSTANT | PCTSTRINGCONSTANT ;
OptLocalName : LocalName | /*empty*/ { $$ = 0; }; OptLocalName : LocalName | /*empty*/ { $$ = 0; };
/// OptLocalAssign - Value producing statements have an optional assignment /// OptLocalAssign - Value producing statements have an optional assignment
@ -1153,7 +1157,7 @@ OptLocalAssign : LocalName '=' {
CHECK_FOR_ERROR CHECK_FOR_ERROR
}; };
GlobalName : GLOBALVAR | ATSTRINGCONSTANT; GlobalName : GLOBALVAR | ATSTRINGCONSTANT ;
OptGlobalAssign : GlobalAssign OptGlobalAssign : GlobalAssign
| /*empty*/ { | /*empty*/ {
@ -1262,8 +1266,8 @@ OptCAlign : /*empty*/ { $$ = 0; } |
SectionString : SECTION STRINGCONSTANT { SectionString : SECTION STRINGCONSTANT {
for (unsigned i = 0, e = strlen($2); i != e; ++i) for (unsigned i = 0, e = $2->length(); i != e; ++i)
if ($2[i] == '"' || $2[i] == '\\') if ((*$2)[i] == '"' || (*$2)[i] == '\\')
GEN_ERROR("Invalid character in section name"); GEN_ERROR("Invalid character in section name");
$$ = $2; $$ = $2;
CHECK_FOR_ERROR CHECK_FOR_ERROR
@ -1278,8 +1282,8 @@ OptSection : /*empty*/ { $$ = 0; } |
GlobalVarAttributes : /* empty */ {} | GlobalVarAttributes : /* empty */ {} |
',' GlobalVarAttribute GlobalVarAttributes {}; ',' GlobalVarAttribute GlobalVarAttributes {};
GlobalVarAttribute : SectionString { GlobalVarAttribute : SectionString {
CurGV->setSection($1); CurGV->setSection(*$1);
free($1); delete $1;
CHECK_FOR_ERROR CHECK_FOR_ERROR
} }
| ALIGN EUINT64VAL { | ALIGN EUINT64VAL {
@ -1561,21 +1565,19 @@ ConstVal: Types '[' ConstVector ']' { // Nonempty unsized arr
int NumElements = ATy->getNumElements(); int NumElements = ATy->getNumElements();
const Type *ETy = ATy->getElementType(); const Type *ETy = ATy->getElementType();
char *EndStr = UnEscapeLexed($3, true); if (NumElements != -1 && NumElements != int($3->length()))
if (NumElements != -1 && NumElements != (EndStr-$3))
GEN_ERROR("Can't build string constant of size " + GEN_ERROR("Can't build string constant of size " +
itostr((int)(EndStr-$3)) + itostr((int)($3->length())) +
" when array has size " + itostr(NumElements) + ""); " when array has size " + itostr(NumElements) + "");
std::vector<Constant*> Vals; std::vector<Constant*> Vals;
if (ETy == Type::Int8Ty) { if (ETy == Type::Int8Ty) {
for (unsigned char *C = (unsigned char *)$3; for (unsigned i = 0; i < $3->length(); ++i)
C != (unsigned char*)EndStr; ++C) Vals.push_back(ConstantInt::get(ETy, (*$3)[i]));
Vals.push_back(ConstantInt::get(ETy, *C));
} else { } else {
free($3); delete $3;
GEN_ERROR("Cannot build string arrays of non byte sized elements"); GEN_ERROR("Cannot build string arrays of non byte sized elements");
} }
free($3); delete $3;
$$ = ConstantArray::get(ATy, Vals); $$ = ConstantArray::get(ATy, Vals);
delete $1; delete $1;
CHECK_FOR_ERROR CHECK_FOR_ERROR
@ -1759,7 +1761,7 @@ ConstVal: Types '[' ConstVector ']' { // Nonempty unsized arr
} else { } else {
std::string Name; std::string Name;
if ($2.Type == ValID::GlobalName) if ($2.Type == ValID::GlobalName)
Name = $2.Name; Name = $2.getName();
else if ($2.Type != ValID::GlobalID) else if ($2.Type != ValID::GlobalID)
GEN_ERROR("Invalid reference to global"); GEN_ERROR("Invalid reference to global");
@ -2089,13 +2091,17 @@ Definition
CHECK_FOR_ERROR CHECK_FOR_ERROR
} }
| OptGlobalAssign GVVisibilityStyle ALIAS AliasLinkage AliaseeRef { | OptGlobalAssign GVVisibilityStyle ALIAS AliasLinkage AliaseeRef {
std::string Name($1); std::string Name;
if ($1) {
Name = *$1;
delete $1;
}
if (Name.empty()) if (Name.empty())
GEN_ERROR("Alias name cannot be empty"); GEN_ERROR("Alias name cannot be empty");
Constant* Aliasee = $5; Constant* Aliasee = $5;
if (Aliasee == 0) if (Aliasee == 0)
GEN_ERROR(std::string("Invalid aliasee for alias: ") + $1); GEN_ERROR(std::string("Invalid aliasee for alias: ") + Name);
GlobalAlias* GA = new GlobalAlias(Aliasee->getType(), $4, Name, Aliasee, GlobalAlias* GA = new GlobalAlias(Aliasee->getType(), $4, Name, Aliasee,
CurModule.CurrentModule); CurModule.CurrentModule);
@ -2114,36 +2120,33 @@ Definition
AsmBlock : STRINGCONSTANT { AsmBlock : STRINGCONSTANT {
const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm(); const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
char *EndStr = UnEscapeLexed($1, true);
std::string NewAsm($1, EndStr);
free($1);
if (AsmSoFar.empty()) if (AsmSoFar.empty())
CurModule.CurrentModule->setModuleInlineAsm(NewAsm); CurModule.CurrentModule->setModuleInlineAsm(*$1);
else else
CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+NewAsm); CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+*$1);
delete $1;
CHECK_FOR_ERROR CHECK_FOR_ERROR
}; };
TargetDefinition : TRIPLE '=' STRINGCONSTANT { TargetDefinition : TRIPLE '=' STRINGCONSTANT {
CurModule.CurrentModule->setTargetTriple($3); CurModule.CurrentModule->setTargetTriple(*$3);
free($3); delete $3;
} }
| DATALAYOUT '=' STRINGCONSTANT { | DATALAYOUT '=' STRINGCONSTANT {
CurModule.CurrentModule->setDataLayout($3); CurModule.CurrentModule->setDataLayout(*$3);
free($3); delete $3;
}; };
LibrariesDefinition : '[' LibList ']'; LibrariesDefinition : '[' LibList ']';
LibList : LibList ',' STRINGCONSTANT { LibList : LibList ',' STRINGCONSTANT {
CurModule.CurrentModule->addLibrary($3); CurModule.CurrentModule->addLibrary(*$3);
free($3); delete $3;
CHECK_FOR_ERROR CHECK_FOR_ERROR
} }
| STRINGCONSTANT { | STRINGCONSTANT {
CurModule.CurrentModule->addLibrary($1); CurModule.CurrentModule->addLibrary(*$1);
free($1); delete $1;
CHECK_FOR_ERROR CHECK_FOR_ERROR
} }
| /* empty: end of list */ { | /* empty: end of list */ {
@ -2205,9 +2208,8 @@ ArgList : ArgListH {
FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')' FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')'
OptFuncAttrs OptSection OptAlign { OptFuncAttrs OptSection OptAlign {
UnEscapeLexed($3); std::string FunctionName(*$3);
std::string FunctionName($3); delete $3; // Free strdup'd memory!
free($3); // Free strdup'd memory!
// Check the function result for abstractness if this is a define. We should // Check the function result for abstractness if this is a define. We should
// have no abstract types at this point // have no abstract types at this point
@ -2296,8 +2298,8 @@ FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')'
Fn->setCallingConv($1); Fn->setCallingConv($1);
Fn->setAlignment($9); Fn->setAlignment($9);
if ($8) { if ($8) {
Fn->setSection($8); Fn->setSection(*$8);
free($8); delete $8;
} }
// Add all of the arguments we parsed to the function... // Add all of the arguments we parsed to the function...
@ -2314,7 +2316,7 @@ FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')'
for (ArgListType::iterator I = $5->begin(); for (ArgListType::iterator I = $5->begin();
I != $5->end() && ArgIt != ArgEnd; ++I, ++ArgIt) { I != $5->end() && ArgIt != ArgEnd; ++I, ++ArgIt) {
delete I->Ty; // Delete the typeholder... delete I->Ty; // Delete the typeholder...
setValueName(ArgIt, I->Name); // Insert arg into symtab... setValueName(ArgIt, I->Name); // Insert arg into symtab...
CHECK_FOR_ERROR CHECK_FOR_ERROR
InsertValue(ArgIt); InsertValue(ArgIt);
Idx++; Idx++;
@ -2426,13 +2428,9 @@ ConstValueRef : ESINT64VAL { // A reference to a direct constant
CHECK_FOR_ERROR CHECK_FOR_ERROR
} }
| ASM_TOK OptSideEffect STRINGCONSTANT ',' STRINGCONSTANT { | ASM_TOK OptSideEffect STRINGCONSTANT ',' STRINGCONSTANT {
char *End = UnEscapeLexed($3, true); $$ = ValID::createInlineAsm(*$3, *$5, $2);
std::string AsmStr = std::string($3, End); delete $3;
End = UnEscapeLexed($5, true); delete $5;
std::string Constraints = std::string($5, End);
$$ = ValID::createInlineAsm(AsmStr, Constraints, $2);
free($3);
free($5);
CHECK_FOR_ERROR CHECK_FOR_ERROR
}; };
@ -2448,11 +2446,13 @@ SymbolicValueRef : LOCALVAL_ID { // Is it an integer reference...?
CHECK_FOR_ERROR CHECK_FOR_ERROR
} }
| LocalName { // Is it a named reference...? | LocalName { // Is it a named reference...?
$$ = ValID::createLocalName($1); $$ = ValID::createLocalName(*$1);
delete $1;
CHECK_FOR_ERROR CHECK_FOR_ERROR
} }
| GlobalName { // Is it a named reference...? | GlobalName { // Is it a named reference...?
$$ = ValID::createGlobalName($1); $$ = ValID::createGlobalName(*$1);
delete $1;
CHECK_FOR_ERROR CHECK_FOR_ERROR
}; };
@ -2508,8 +2508,10 @@ InstructionList : InstructionList Inst {
CHECK_FOR_ERROR CHECK_FOR_ERROR
} }
| LABELSTR { // Labelled (named) basic block | LABELSTR { // Labelled (named) basic block
$$ = defineBBVal(ValID::createLocalName($1)); $$ = defineBBVal(ValID::createLocalName(*$1));
delete $1;
CHECK_FOR_ERROR CHECK_FOR_ERROR
}; };
BBTerminatorInst : RET ResolvedVal { // Return with a result... BBTerminatorInst : RET ResolvedVal { // Return with a result...