return CurModule.Types[D.Num];
break;
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...
return N;
}
if (!inFunctionScope())
return 0;
ValueSymbolTable &SymTab = CurFun.CurrentFunction->getValueSymbolTable();
- Value *N = SymTab.lookup(D.Name);
+ Value *N = SymTab.lookup(D.getName());
if (N == 0)
return 0;
if (N->getType() != Ty)
}
case ValID::GlobalName: { // Is it a named definition?
ValueSymbolTable &SymTab = CurModule.CurrentModule->getValueSymbolTable();
- Value *N = SymTab.lookup(D.Name);
+ Value *N = SymTab.lookup(D.getName());
if (N == 0)
return 0;
if (N->getType() != Ty)
// We haven't seen this BB before and its first mention is a definition.
// 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);
if (ID.Type == ValID::LocalID) {
assert(ID.Num == CurFun.NextValNum && "Invalid new block number");
if (BBI != CurFun.BBForwardRefs.end()) {
BB = BBI->second;
} if (ID.Type == ValID::LocalName) {
- std::string Name = ID.Name;
+ std::string Name = ID.getName();
Value *N = CurFun.CurrentFunction->getValueSymbolTable().lookup(Name);
if (N)
if (N->getType()->getTypeID() == Type::LabelTyID)
// Otherwise, this block has not been seen before, create it.
std::string Name;
if (ID.Type == ValID::LocalName)
- Name = ID.Name;
+ Name = ID.getName();
BB = new BasicBlock(Name, CurFun.CurrentFunction);
// Insert it in the forward refs map.
// name is not null) things referencing Name can be resolved. Otherwise, things
// 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;
- if (Name) D = ValID::createLocalName(Name);
- else D = ValID::createLocalID(CurModule.Types.size());
+ if (Name)
+ D = ValID::createLocalName(*Name);
+ else
+ D = ValID::createLocalID(CurModule.Types.size());
std::map<ValID, PATypeHolder>::iterator I =
CurModule.LateResolveTypes.find(D);
// 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.
//
-static void setValueName(Value *V, char *NameStr) {
+static void setValueName(Value *V, std::string *NameStr) {
if (!NameStr) return;
- std::string Name(NameStr); // Copy string
- free(NameStr); // Free old string
+ std::string Name(*NameStr); // Copy string
+ delete NameStr; // Free old string
if (V->getType() == Type::VoidTy) {
GenerateError("Can't assign name '" + Name+"' to value with void type");
/// ParseGlobalVariable - Handle parsing of a global. If Initializer is null,
/// this is a declaration, otherwise it is a definition.
static GlobalVariable *
-ParseGlobalVariable(char *NameStr,
+ParseGlobalVariable(std::string *NameStr,
GlobalValue::LinkageTypes Linkage,
GlobalValue::VisibilityTypes Visibility,
bool isConstantGlobal, const Type *Ty,
std::string Name;
if (NameStr) {
- Name = NameStr; // Copy string
- free(NameStr); // Free old string
+ Name = *NameStr; // Copy string
+ delete NameStr; // Free old string
}
// See if this global value was forward referenced. If so, recycle the
// object.
ValID ID;
if (!Name.empty()) {
- ID = ValID::createGlobalName((char*)Name.c_str());
+ ID = ValID::createGlobalName(Name);
} else {
ID = ValID::createGlobalID(CurModule.Values.size());
}
// 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
// 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!");
if (NameStr == 0) return false;
- std::string Name(NameStr); // Copy string
- free(NameStr); // Free old string
+ std::string Name(*NameStr); // Copy string
+ delete NameStr; // Free old string
// We don't allow assigning names to void type
if (T == Type::VoidTy) {
double FPVal;
bool BoolVal;
- char *StrVal; // This memory is strdup'd!
- llvm::ValID ValIDVal; // strdup'd memory maybe!
+ std::string *StrVal; // This memory must be deleted
+ llvm::ValID ValIDVal;
llvm::Instruction::BinaryOps BinaryOpVal;
llvm::Instruction::TermOps TermOpVal;
%token <PrimType> FLOAT DOUBLE LABEL
%token TYPE
-%token<StrVal> LOCALVAR GLOBALVAR LABELSTR STRINGCONSTANT ATSTRINGCONSTANT
+
+%token<StrVal> LOCALVAR GLOBALVAR LABELSTR
+%token<StrVal> STRINGCONSTANT ATSTRINGCONSTANT PCTSTRINGCONSTANT
%type <StrVal> LocalName OptLocalName OptLocalAssign
%type <StrVal> GlobalName OptGlobalAssign GlobalAssign
-%type <UIntVal> OptAlign OptCAlign
%type <StrVal> OptSection SectionString
+%type <UIntVal> OptAlign OptCAlign
+
%token ZEROINITIALIZER TRUETOK FALSETOK BEGINTOK ENDTOK
%token DECLARE DEFINE GLOBAL CONSTANT SECTION ALIAS VOLATILE THREAD_LOCAL
%token TO DOTDOTDOT NULL_TOK UNDEF INTERNAL LINKONCE WEAK APPENDING
%token <OtherOpVal> EXTRACTELEMENT INSERTELEMENT SHUFFLEVECTOR
// Function Attributes
-%token NORETURN INREG SRET NOUNWIND
+%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS BYVAL NEST
// Visibility Styles
%token DEFAULT HIDDEN PROTECTED
IntType : INTTYPE;
FPType : FLOAT | DOUBLE;
-LocalName : LOCALVAR | STRINGCONSTANT;
+LocalName : LOCALVAR | STRINGCONSTANT | PCTSTRINGCONSTANT ;
OptLocalName : LocalName | /*empty*/ { $$ = 0; };
/// OptLocalAssign - Value producing statements have an optional assignment
CHECK_FOR_ERROR
};
-GlobalName : GLOBALVAR | ATSTRINGCONSTANT;
+GlobalName : GLOBALVAR | ATSTRINGCONSTANT ;
OptGlobalAssign : GlobalAssign
| /*empty*/ {
CHECK_FOR_ERROR
};
-ParamAttr : ZEXT { $$ = ParamAttr::ZExt; }
- | SEXT { $$ = ParamAttr::SExt; }
- | INREG { $$ = ParamAttr::InReg; }
- | SRET { $$ = ParamAttr::StructRet; }
+ParamAttr : ZEROEXT { $$ = ParamAttr::ZExt; }
+ | ZEXT { $$ = ParamAttr::ZExt; }
+ | SIGNEXT { $$ = ParamAttr::SExt; }
+ | SEXT { $$ = ParamAttr::SExt; }
+ | INREG { $$ = ParamAttr::InReg; }
+ | SRET { $$ = ParamAttr::StructRet; }
+ | NOALIAS { $$ = ParamAttr::NoAlias; }
+ | BYVAL { $$ = ParamAttr::ByVal; }
+ | NEST { $$ = ParamAttr::Nest; }
;
OptParamAttrs : /* empty */ { $$ = ParamAttr::None; }
FuncAttr : NORETURN { $$ = ParamAttr::NoReturn; }
| NOUNWIND { $$ = ParamAttr::NoUnwind; }
- | ParamAttr
+ | ZEROEXT { $$ = ParamAttr::ZExt; }
+ | SIGNEXT { $$ = ParamAttr::SExt; }
;
OptFuncAttrs : /* empty */ { $$ = ParamAttr::None; }
SectionString : SECTION STRINGCONSTANT {
- for (unsigned i = 0, e = strlen($2); i != e; ++i)
- if ($2[i] == '"' || $2[i] == '\\')
+ for (unsigned i = 0, e = $2->length(); i != e; ++i)
+ if ((*$2)[i] == '"' || (*$2)[i] == '\\')
GEN_ERROR("Invalid character in section name");
$$ = $2;
CHECK_FOR_ERROR
GlobalVarAttributes : /* empty */ {} |
',' GlobalVarAttribute GlobalVarAttributes {};
GlobalVarAttribute : SectionString {
- CurGV->setSection($1);
- free($1);
+ CurGV->setSection(*$1);
+ delete $1;
CHECK_FOR_ERROR
}
| ALIGN EUINT64VAL {
int NumElements = ATy->getNumElements();
const Type *ETy = ATy->getElementType();
- char *EndStr = UnEscapeLexed($3, true);
- if (NumElements != -1 && NumElements != (EndStr-$3))
+ if (NumElements != -1 && NumElements != int($3->length()))
GEN_ERROR("Can't build string constant of size " +
- itostr((int)(EndStr-$3)) +
+ itostr((int)($3->length())) +
" when array has size " + itostr(NumElements) + "");
std::vector<Constant*> Vals;
if (ETy == Type::Int8Ty) {
- for (unsigned char *C = (unsigned char *)$3;
- C != (unsigned char*)EndStr; ++C)
- Vals.push_back(ConstantInt::get(ETy, *C));
+ for (unsigned i = 0; i < $3->length(); ++i)
+ Vals.push_back(ConstantInt::get(ETy, (*$3)[i]));
} else {
- free($3);
+ delete $3;
GEN_ERROR("Cannot build string arrays of non byte sized elements");
}
- free($3);
+ delete $3;
$$ = ConstantArray::get(ATy, Vals);
delete $1;
CHECK_FOR_ERROR
} else {
std::string Name;
if ($2.Type == ValID::GlobalName)
- Name = $2.Name;
+ Name = $2.getName();
else if ($2.Type != ValID::GlobalID)
GEN_ERROR("Invalid reference to global");
CHECK_FOR_ERROR
}
| OptGlobalAssign GVVisibilityStyle ALIAS AliasLinkage AliaseeRef {
- std::string Name($1);
+ std::string Name;
+ if ($1) {
+ Name = *$1;
+ delete $1;
+ }
if (Name.empty())
GEN_ERROR("Alias name cannot be empty");
Constant* Aliasee = $5;
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,
CurModule.CurrentModule);
AsmBlock : STRINGCONSTANT {
const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
- char *EndStr = UnEscapeLexed($1, true);
- std::string NewAsm($1, EndStr);
- free($1);
-
if (AsmSoFar.empty())
- CurModule.CurrentModule->setModuleInlineAsm(NewAsm);
+ CurModule.CurrentModule->setModuleInlineAsm(*$1);
else
- CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+NewAsm);
+ CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+*$1);
+ delete $1;
CHECK_FOR_ERROR
};
TargetDefinition : TRIPLE '=' STRINGCONSTANT {
- CurModule.CurrentModule->setTargetTriple($3);
- free($3);
+ CurModule.CurrentModule->setTargetTriple(*$3);
+ delete $3;
}
| DATALAYOUT '=' STRINGCONSTANT {
- CurModule.CurrentModule->setDataLayout($3);
- free($3);
+ CurModule.CurrentModule->setDataLayout(*$3);
+ delete $3;
};
LibrariesDefinition : '[' LibList ']';
LibList : LibList ',' STRINGCONSTANT {
- CurModule.CurrentModule->addLibrary($3);
- free($3);
+ CurModule.CurrentModule->addLibrary(*$3);
+ delete $3;
CHECK_FOR_ERROR
}
| STRINGCONSTANT {
- CurModule.CurrentModule->addLibrary($1);
- free($1);
+ CurModule.CurrentModule->addLibrary(*$1);
+ delete $1;
CHECK_FOR_ERROR
}
| /* empty: end of list */ {
FunctionHeaderH : OptCallingConv ResultTypes GlobalName '(' ArgList ')'
OptFuncAttrs OptSection OptAlign {
- UnEscapeLexed($3);
- std::string FunctionName($3);
- free($3); // Free strdup'd memory!
+ std::string FunctionName(*$3);
+ delete $3; // Free strdup'd memory!
// Check the function result for abstractness if this is a define. We should
// have no abstract types at this point
Fn->setCallingConv($1);
Fn->setAlignment($9);
if ($8) {
- Fn->setSection($8);
- free($8);
+ Fn->setSection(*$8);
+ delete $8;
}
// Add all of the arguments we parsed to the function...
for (ArgListType::iterator I = $5->begin();
I != $5->end() && ArgIt != ArgEnd; ++I, ++ArgIt) {
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
InsertValue(ArgIt);
Idx++;
CHECK_FOR_ERROR
}
| ASM_TOK OptSideEffect STRINGCONSTANT ',' STRINGCONSTANT {
- char *End = UnEscapeLexed($3, true);
- std::string AsmStr = std::string($3, End);
- End = UnEscapeLexed($5, true);
- std::string Constraints = std::string($5, End);
- $$ = ValID::createInlineAsm(AsmStr, Constraints, $2);
- free($3);
- free($5);
+ $$ = ValID::createInlineAsm(*$3, *$5, $2);
+ delete $3;
+ delete $5;
CHECK_FOR_ERROR
};
CHECK_FOR_ERROR
}
| LocalName { // Is it a named reference...?
- $$ = ValID::createLocalName($1);
+ $$ = ValID::createLocalName(*$1);
+ delete $1;
CHECK_FOR_ERROR
}
| GlobalName { // Is it a named reference...?
- $$ = ValID::createGlobalName($1);
+ $$ = ValID::createGlobalName(*$1);
+ delete $1;
CHECK_FOR_ERROR
};
CHECK_FOR_ERROR
}
| LABELSTR { // Labelled (named) basic block
- $$ = defineBBVal(ValID::createLocalName($1));
+ $$ = defineBBVal(ValID::createLocalName(*$1));
+ delete $1;
CHECK_FOR_ERROR
+
};
BBTerminatorInst : RET ResolvedVal { // Return with a result...
std::vector<const Type*> ParamTypes;
ParamAttrsVector Attrs;
if ($8 != ParamAttr::None) {
- ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = 8;
+ ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = $8;
Attrs.push_back(PAWI);
}
ValueRefList::iterator I = $6->begin(), E = $6->end();
projects / oota-llvm.git / blobdiff