#include <list>
#include <utility>
#include <algorithm>
-using std::list;
-using std::vector;
-using std::pair;
-using std::map;
-using std::pair;
-using std::make_pair;
-using std::string;
int yyerror(const char *ErrorMsg); // Forward declarations to prevent "implicit
int yylex(); // declaration" of xxx warnings.
int yyparse();
static Module *ParserResult;
-string CurFilename;
+std::string CurFilename;
// DEBUG_UPREFS - Define this symbol if you want to enable debugging output
// relating to upreferences in the input stream.
#define YYERROR_VERBOSE 1
-// HACK ALERT: This variable is used to implement the automatic conversion of
-// load/store instructions with indexes into a load/store + getelementptr pair
-// of instructions. When this compatiblity "Feature" is removed, this should be
-// too.
-//
-static BasicBlock *CurBB;
-
-
// This contains info used when building the body of a function. It is
// destroyed when the function is completed.
//
-typedef vector<Value *> ValueList; // Numbered defs
-static void ResolveDefinitions(vector<ValueList> &LateResolvers,
- vector<ValueList> *FutureLateResolvers = 0);
+typedef std::vector<Value *> ValueList; // Numbered defs
+static void ResolveDefinitions(std::vector<ValueList> &LateResolvers,
+ std::vector<ValueList> *FutureLateResolvers = 0);
static struct PerModuleInfo {
Module *CurrentModule;
- vector<ValueList> Values; // Module level numbered definitions
- vector<ValueList> LateResolveValues;
- vector<PATypeHolder> Types;
- map<ValID, PATypeHolder> LateResolveTypes;
+ std::vector<ValueList> Values; // Module level numbered definitions
+ std::vector<ValueList> LateResolveValues;
+
std::vector<PATypeHolder> Types;
+ std::map<ValID, PATypeHolder> LateResolveTypes;
// GlobalRefs - This maintains a mapping between <Type, ValID>'s and forward
// references to global values. Global values may be referenced before they
// are defined, and if so, the temporary object that they represent is held
// here. This is used for forward references of ConstantPointerRefs.
//
- typedef map<pair<const PointerType *, ValID>, GlobalVariable*> GlobalRefsType;
+ typedef std::map<std::pair<const PointerType *,
+ ValID>, GlobalVariable*> GlobalRefsType;
GlobalRefsType GlobalRefs;
void ModuleDone() {
// resolved!
//
if (!GlobalRefs.empty()) {
- string UndefinedReferences = "Unresolved global references exist:\n";
+ std::string UndefinedReferences = "Unresolved global references exist:\n";
for (GlobalRefsType::iterator I = GlobalRefs.begin(), E =GlobalRefs.end();
I != E; ++I) {
void DeclareNewGlobalValue(GlobalValue *GV, ValID D) {
// Check to see if there is a forward reference to this global variable...
// if there is, eliminate it and patch the reference to use the new def'n.
- GlobalRefsType::iterator I = GlobalRefs.find(make_pair(GV->getType(), D));
+ GlobalRefsType::iterator I =
+ GlobalRefs.find(std::make_pair(GV->getType(), D));
if (I != GlobalRefs.end()) {
GlobalVariable *OldGV = I->second; // Get the placeholder...
- I->first.second.destroy(); // Free string memory if neccesary
+ I->first.second.destroy(); // Free string memory if necessary
// Loop over all of the uses of the GlobalValue. The only thing they are
// allowed to be is ConstantPointerRef's.
static struct PerFunctionInfo {
Function *CurrentFunction; // Pointer to current function being created
- vector<ValueList> Values; // Keep track of numbered definitions
- vector<ValueList> LateResolveValues;
- vector<PATypeHolder> Types;
- map<ValID, PATypeHolder> LateResolveTypes;
+ std::vector<ValueList> Values; // Keep track of numbered definitions
+ std::vector<ValueList> LateResolveValues;
+
std::vector<PATypeHolder> Types;
+ std::map<ValID, PATypeHolder> LateResolveTypes;
bool isDeclare; // Is this function a forward declararation?
inline PerFunctionInfo() {
// resolve the branches now...
ResolveDefinitions(LateResolveValues, &CurModule.LateResolveValues);
+ // Make sure to resolve any constant expr references that might exist within
+ // the function we just declared itself.
+ ValID FID;
+ if (CurrentFunction->hasName()) {
+ FID = ValID::create((char*)CurrentFunction->getName().c_str());
+ } else {
+ unsigned Slot = CurrentFunction->getType()->getUniqueID();
+ assert(CurModule.Values.size() > Slot && "Function not inserted?");
+ // Figure out which slot number if is...
+ for (unsigned i = 0; ; ++i) {
+ assert(i < CurModule.Values[Slot].size() && "Function not found!");
+ if (CurModule.Values[Slot][i] == CurrentFunction) {
+ FID = ValID::create((int)i);
+ break;
+ }
+ }
+ }
+ CurModule.DeclareNewGlobalValue(CurrentFunction, FID);
+
Values.clear(); // Clear out function local definitions
Types.clear();
CurrentFunction = 0;
// Code to handle definitions of all the types
//===----------------------------------------------------------------------===//
-static int InsertValue(Value *D, vector<ValueList> &ValueTab = CurMeth.Values) {
+static int InsertValue(Value *D,
+ std::vector<ValueList> &ValueTab = CurMeth.Values) {
if (D->hasName()) return -1; // Is this a numbered definition?
// Yes, insert the value into the value table...
}
// TODO: FIXME when Type are not const
-static void InsertType(const Type *Ty, vector<PATypeHolder> &Types) {
+static void InsertType(const Type *Ty,
std::vector<PATypeHolder> &Types) {
Types.push_back(Ty);
}
break;
}
case ValID::NameVal: { // Is it a named definition?
- string Name(D.Name);
+ std::string Name(D.Name);
SymbolTable *SymTab = 0;
Value *N = 0;
if (inFunctionScope()) {
}
D.destroy(); // Free old strdup'd memory...
- return cast<const Type>(N);
+ return cast<Type>(N);
}
default:
ThrowException("Internal parser error: Invalid symbol type reference!");
//
if (DoNotImprovise) return 0; // Do we just want a null to be returned?
- map<ValID, PATypeHolder> &LateResolver = inFunctionScope() ?
+ std::map<ValID, PATypeHolder> &LateResolver = inFunctionScope() ?
CurMeth.LateResolveTypes : CurModule.LateResolveTypes;
- map<ValID, PATypeHolder>::iterator I = LateResolver.find(D);
+ std::map<ValID, PATypeHolder>::iterator I = LateResolver.find(D);
if (I != LateResolver.end()) {
return I->second;
}
Type *Typ = OpaqueType::get();
- LateResolver.insert(make_pair(D, Typ));
+ LateResolver.insert(std::make_pair(D, Typ));
return Typ;
}
-static Value *lookupInSymbolTable(const Type *Ty, const string &Name) {
+static Value *lookupInSymbolTable(const Type *Ty, const std::string &Name) {
SymbolTable &SymTab =
inFunctionScope() ? CurMeth.CurrentFunction->getSymbolTable() :
CurModule.CurrentModule->getSymbolTable();
}
case ValID::NameVal: { // Is it a named definition?
- Value *N = lookupInSymbolTable(Ty, string(D.Name));
+ Value *N = lookupInSymbolTable(Ty, std::string(D.Name));
if (N == 0) return 0;
D.destroy(); // Free old strdup'd memory...
// time (forward branches, phi functions for loops, etc...) resolve the
// defs now...
//
-static void ResolveDefinitions(vector<ValueList> &LateResolvers,
- vector<ValueList> *FutureLateResolvers) {
+static void ResolveDefinitions(std::vector<ValueList> &LateResolvers,
+ std::vector<ValueList> *FutureLateResolvers) {
// Loop over LateResolveDefs fixing up stuff that couldn't be resolved
for (unsigned ty = 0; ty < LateResolvers.size(); ty++) {
while (!LateResolvers[ty].empty()) {
// refering to the number can be resolved. Do this now.
//
static void ResolveTypeTo(char *Name, const Type *ToTy) {
- vector<PATypeHolder> &Types = inFunctionScope() ?
+
std::vector<PATypeHolder> &Types = inFunctionScope() ?
CurMeth.Types : CurModule.Types;
ValID D;
if (Name) D = ValID::create(Name);
else D = ValID::create((int)Types.size());
- map<ValID, PATypeHolder> &LateResolver = inFunctionScope() ?
+ std::map<ValID, PATypeHolder> &LateResolver = inFunctionScope() ?
CurMeth.LateResolveTypes : CurModule.LateResolveTypes;
- map<ValID, PATypeHolder>::iterator I = LateResolver.find(D);
+ std::map<ValID, PATypeHolder>::iterator I = LateResolver.find(D);
if (I != LateResolver.end()) {
((DerivedType*)I->second.get())->refineAbstractTypeTo(ToTy);
LateResolver.erase(I);
// ResolveTypes - At this point, all types should be resolved. Any that aren't
// are errors.
//
-static void ResolveTypes(map<ValID, PATypeHolder> &LateResolveTypes) {
+static void ResolveTypes(std::map<ValID, PATypeHolder> &LateResolveTypes) {
if (!LateResolveTypes.empty()) {
const ValID &DID = LateResolveTypes.begin()->first;
static bool setValueName(Value *V, char *NameStr) {
if (NameStr == 0) return false;
- string Name(NameStr); // Copy string
+ std::string Name(NameStr); // Copy string
free(NameStr); // Free old string
if (V->getType() == Type::VoidTy)
if (Existing) { // Inserting a name that is already defined???
// There is only one case where this is allowed: when we are refining an
// opaque type. In this case, Existing will be an opaque type.
- if (const Type *Ty = dyn_cast<const Type>(Existing)) {
+ if (const Type *Ty = dyn_cast<Type>(Existing)) {
if (const OpaqueType *OpTy = dyn_cast<OpaqueType>(Ty)) {
// We ARE replacing an opaque type!
((OpaqueType*)OpTy)->refineAbstractTypeTo(cast<Type>(V));
// Otherwise, we are a simple redefinition of a value, check to see if it
// is defined the same as the old one...
- if (const Type *Ty = dyn_cast<const Type>(Existing)) {
- if (Ty == cast<const Type>(V)) return true; // Yes, it's equal.
+ if (const Type *Ty = dyn_cast<Type>(Existing)) {
+ if (Ty == cast<Type>(V)) return true; // Yes, it's equal.
// std::cerr << "Type: " << Ty->getDescription() << " != "
- // << cast<const Type>(V)->getDescription() << "!\n";
+ // << cast<Type>(V)->getDescription() << "!\n";
+ } else if (const Constant *C = dyn_cast<Constant>(Existing)) {
+ if (C == V) return true; // Constants are equal to themselves
} else if (GlobalVariable *EGV = dyn_cast<GlobalVariable>(Existing)) {
// We are allowed to redefine a global variable in two circumstances:
// 1. If at least one of the globals is uninitialized or
// 2. If both initializers have the same value.
//
- // This can only be done if the const'ness of the vars is the same.
- //
if (GlobalVariable *GV = dyn_cast<GlobalVariable>(V)) {
- if (EGV->isConstant() == GV->isConstant() &&
- (!EGV->hasInitializer() || !GV->hasInitializer() ||
- EGV->getInitializer() == GV->getInitializer())) {
+ if (!EGV->hasInitializer() || !GV->hasInitializer() ||
+ EGV->getInitializer() == GV->getInitializer()) {
- // Make sure the existing global version gets the initializer!
+ // Make sure the existing global version gets the initializer! Make
+ // sure that it also gets marked const if the new version is.
if (GV->hasInitializer() && !EGV->hasInitializer())
EGV->setInitializer(GV->getInitializer());
+ if (GV->isConstant())
+ EGV->setConstant(true);
+ EGV->setLinkage(GV->getLinkage());
delete GV; // Destroy the duplicate!
return true; // They are equivalent!
}
-static vector<pair<unsigned, OpaqueType *> > UpRefs;
+static std::vector<std::pair<unsigned, OpaqueType *> > UpRefs;
static PATypeHolder HandleUpRefs(const Type *ty) {
PATypeHolder Ty(ty);
if (Level == 0) { // Upreference should be resolved!
UR_OUT(" * Resolving upreference for "
<< UpRefs[i].second->getDescription() << endl;
- string OldName = UpRefs[i].second->getDescription());
+ std::string OldName = UpRefs[i].second->getDescription());
UpRefs[i].second->refineAbstractTypeTo(Ty);
UpRefs.erase(UpRefs.begin()+i); // Remove from upreference list...
UR_OUT(" * Type '" << OldName << "' refined upreference to: "
// RunVMAsmParser - Define an interface to this parser
//===----------------------------------------------------------------------===//
//
-Module *RunVMAsmParser(const string &Filename, FILE *F) {
+Module *RunVMAsmParser(const std::string &Filename, FILE *F) {
llvmAsmin = F;
CurFilename = Filename;
llvmAsmlineno = 1; // Reset the current line number...
- CurModule.CurrentModule = new Module(); // Allocate a new module to read
+ // Allocate a new module to read
+ CurModule.CurrentModule = new Module(Filename);
yyparse(); // Parse the file.
Module *Result = ParserResult;
llvmAsmin = stdin; // F is about to go away, don't use it anymore...
std::vector<std::pair<Constant*, BasicBlock*> > *JumpTable;
std::vector<Constant*> *ConstVector;
+ GlobalValue::LinkageTypes Linkage;
int64_t SInt64Val;
uint64_t UInt64Val;
int SIntVal;
Instruction::TermOps TermOpVal;
Instruction::MemoryOps MemOpVal;
Instruction::OtherOps OtherOpVal;
+ Module::Endianness Endianness;
}
%type <ModuleVal> Module FunctionList
%type <ValueList> IndexList // For GEP derived indices
%type <TypeList> TypeListI ArgTypeListI
%type <JumpTable> JumpTable
-%type <BoolVal> GlobalType OptInternal // GLOBAL or CONSTANT? Intern?
+%type <BoolVal> GlobalType // GLOBAL or CONSTANT?
+%type <BoolVal> OptVolatile // 'volatile' or not
+%type <Linkage> OptLinkage
+%type <Endianness> BigOrLittle
// ValueRef - Unresolved reference to a definition or BB
%type <ValIDVal> ValueRef ConstValueRef SymbolicValueRef
%token <PrimType> VOID BOOL SBYTE UBYTE SHORT USHORT INT UINT LONG ULONG
%token <PrimType> FLOAT DOUBLE TYPE LABEL
-%token <StrVal> VAR_ID LABELSTR STRINGCONSTANT
-%type <StrVal> OptVAR_ID OptAssign FuncName
+%token <StrVal> VAR_ID LABELSTR STRINGCONSTANT
+%type <StrVal> Name OptName OptAssign
-%token IMPLEMENTATION TRUE FALSE BEGINTOK ENDTOK DECLARE GLOBAL CONSTANT
-%token TO EXCEPT DOTDOTDOT NULL_TOK CONST INTERNAL OPAQUE NOT EXTERNAL
+%token IMPLEMENTATION ZEROINITIALIZER TRUE FALSE BEGINTOK ENDTOK
+%token DECLARE GLOBAL CONSTANT VOLATILE
+%token TO EXCEPT DOTDOTDOT NULL_TOK CONST INTERNAL LINKONCE APPENDING
+%token OPAQUE NOT EXTERNAL TARGET ENDIAN POINTERSIZE LITTLE BIG
// Basic Block Terminating Operators
-%token <TermOpVal> RET BR SWITCH
+%token <TermOpVal> RET BR SWITCH INVOKE UNWIND
// Binary Operators
%type <BinaryOpVal> BinaryOps // all the binary operators
// Other Operators
%type <OtherOpVal> ShiftOps
-%token <OtherOpVal> PHI CALL INVOKE CAST SHL SHR
+%token <OtherOpVal> PHI CALL CAST SHL SHR VA_ARG
%start Module
%%
// Handle constant integer size restriction and conversion...
//
-
INTVAL : SINTVAL;
INTVAL : UINTVAL {
if ($1 > (uint32_t)INT32_MAX) // Outside of my range!
FPType : FLOAT | DOUBLE;
// OptAssign - Value producing statements have an optional assignment component
-OptAssign : VAR_ID '=' {
+OptAssign : Name '=' {
$$ = $1;
}
| /*empty*/ {
$$ = 0;
};
-OptInternal : INTERNAL { $$ = true; } | /*empty*/ { $$ = false; };
+OptLinkage : INTERNAL { $$ = GlobalValue::InternalLinkage; } |
+ LINKONCE { $$ = GlobalValue::LinkOnceLinkage; } |
+ APPENDING { $$ = GlobalValue::AppendingLinkage; } |
+ /*empty*/ { $$ = GlobalValue::ExternalLinkage; };
//===----------------------------------------------------------------------===//
// Types includes all predefined types... except void, because it can only be
UpRTypes : '\\' EUINT64VAL { // Type UpReference
if ($2 > (uint64_t)INT64_MAX) ThrowException("Value out of range!");
OpaqueType *OT = OpaqueType::get(); // Use temporary placeholder
- UpRefs.push_back(make_pair((unsigned)$2, OT)); // Add to vector...
+ UpRefs.push_back(std::make_pair((unsigned)$2, OT)); // Add to vector...
$$ = new PATypeHolder(OT);
UR_OUT("New Upreference!\n");
}
| UpRTypesV '(' ArgTypeListI ')' { // Function derived type?
- vector<const Type*> Params;
+ std::vector<const Type*> Params;
mapto($3->begin(), $3->end(), std::back_inserter(Params),
- std::mem_fun_ref(&PATypeHandle<Type>::get));
+ std::mem_fun_ref(&PATypeHolder::get));
bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
if (isVarArg) Params.pop_back();
delete $4;
}
| '{' TypeListI '}' { // Structure type?
- vector<const Type*> Elements;
+ std::vector<const Type*> Elements;
mapto($2->begin(), $2->end(), std::back_inserter(Elements),
- std::mem_fun_ref(&PATypeHandle<Type>::get));
+ std::mem_fun_ref(&PATypeHolder::get));
$$ = new PATypeHolder(HandleUpRefs(StructType::get(Elements)));
delete $2;
}
| '{' '}' { // Empty structure type?
- $$ = new PATypeHolder(StructType::get(vector<const Type*>()));
+ $$ = new PATypeHolder(StructType::get(std::vector<const Type*>()));
}
| UpRTypes '*' { // Pointer type?
$$ = new PATypeHolder(HandleUpRefs(PointerType::get(*$1)));
// declaration type lists
//
TypeListI : UpRTypes {
- $$ = new list<PATypeHolder>();
+ $$ = new
std::list<PATypeHolder>();
$$->push_back(*$1); delete $1;
}
| TypeListI ',' UpRTypes {
($$=$1)->push_back(Type::VoidTy);
}
| DOTDOTDOT {
- ($$ = new list<PATypeHolder>())->push_back(Type::VoidTy);
+ ($$ = new
std::list<PATypeHolder>())->push_back(Type::VoidTy);
}
| /*empty*/ {
- $$ = new list<PATypeHolder>();
+ $$ = new
std::list<PATypeHolder>();
};
// ConstVal - The various declarations that go into the constant pool. This
// ResolvedVal, ValueRef and ConstValueRef productions.
//
ConstVal: Types '[' ConstVector ']' { // Nonempty unsized arr
- const ArrayType *ATy = dyn_cast<const ArrayType>($1->get());
+ const ArrayType *ATy = dyn_cast<ArrayType>($1->get());
if (ATy == 0)
ThrowException("Cannot make array constant with type: '" +
(*$1)->getDescription() + "'!");
delete $1; delete $3;
}
| Types '[' ']' {
- const ArrayType *ATy = dyn_cast<const ArrayType>($1->get());
+ const ArrayType *ATy = dyn_cast<ArrayType>($1->get());
if (ATy == 0)
ThrowException("Cannot make array constant with type: '" +
(*$1)->getDescription() + "'!");
if (NumElements != -1 && NumElements != 0)
ThrowException("Type mismatch: constant sized array initialized with 0"
" arguments, but has size of " + itostr(NumElements) +"!");
- $$ = ConstantArray::get(ATy, vector<Constant*>());
+ $$ = ConstantArray::get(ATy, std::vector<Constant*>());
delete $1;
}
| Types 'c' STRINGCONSTANT {
- const ArrayType *ATy = dyn_cast<const ArrayType>($1->get());
+ const ArrayType *ATy = dyn_cast<ArrayType>($1->get());
if (ATy == 0)
ThrowException("Cannot make array constant with type: '" +
(*$1)->getDescription() + "'!");
ThrowException("Can't build string constant of size " +
itostr((int)(EndStr-$3)) +
" when array has size " + itostr(NumElements) + "!");
- vector<Constant*> Vals;
+ std::vector<Constant*> Vals;
if (ETy == Type::SByteTy) {
for (char *C = $3; C != EndStr; ++C)
Vals.push_back(ConstantSInt::get(ETy, *C));
} else if (ETy == Type::UByteTy) {
for (char *C = $3; C != EndStr; ++C)
- Vals.push_back(ConstantUInt::get(ETy, *C));
+ Vals.push_back(ConstantUInt::get(ETy, (unsigned char)*C));
} else {
free($3);
ThrowException("Cannot build string arrays of non byte sized elements!");
delete $1;
}
| Types '{' ConstVector '}' {
- const StructType *STy = dyn_cast<const StructType>($1->get());
+ const StructType *STy = dyn_cast<StructType>($1->get());
if (STy == 0)
ThrowException("Cannot make struct constant with type: '" +
(*$1)->getDescription() + "'!");
- // FIXME: TODO: Check to see that the constants are compatible with the type
- // initializer!
+
+ if ($3->size() != STy->getNumContainedTypes())
+ ThrowException("Illegal number of initializers for structure type!");
+
+ // Check to ensure that constants are compatible with the type initializer!
+ for (unsigned i = 0, e = $3->size(); i != e; ++i)
+ if ((*$3)[i]->getType() != STy->getElementTypes()[i])
+ ThrowException("Expected type '" +
+ STy->getElementTypes()[i]->getDescription() +
+ "' for element #" + utostr(i) +
+ " of structure initializer!");
+
$$ = ConstantStruct::get(STy, *$3);
delete $1; delete $3;
}
+ | Types '{' '}' {
+ const StructType *STy = dyn_cast<StructType>($1->get());
+ if (STy == 0)
+ ThrowException("Cannot make struct constant with type: '" +
+ (*$1)->getDescription() + "'!");
+
+ if (STy->getNumContainedTypes() != 0)
+ ThrowException("Illegal number of initializers for structure type!");
+
+ $$ = ConstantStruct::get(STy, std::vector<Constant*>());
+ delete $1;
+ }
| Types NULL_TOK {
- const PointerType *PTy = dyn_cast<const PointerType>($1->get());
+ const PointerType *PTy = dyn_cast<PointerType>($1->get());
if (PTy == 0)
ThrowException("Cannot make null pointer constant with type: '" +
(*$1)->getDescription() + "'!");
delete $1;
}
| Types SymbolicValueRef {
- const PointerType *Ty = dyn_cast<const PointerType>($1->get());
+ const PointerType *Ty = dyn_cast<PointerType>($1->get());
if (Ty == 0)
ThrowException("Global const reference must be a pointer type!");
CurMeth.CurrentFunction = SavedCurFn;
-
// If this is an initializer for a constant pointer, which is referencing a
// (currently) undefined variable, create a stub now that shall be replaced
// in the future with the right type of variable.
// First check to see if the forward references value is already created!
PerModuleInfo::GlobalRefsType::iterator I =
- CurModule.GlobalRefs.find(make_pair(PT, $2));
+ CurModule.GlobalRefs.find(std::make_pair(PT, $2));
if (I != CurModule.GlobalRefs.end()) {
V = I->second; // Placeholder already exists, use it...
// Create a placeholder for the global variable reference...
GlobalVariable *GV = new GlobalVariable(PT->getElementType(),
- false, true);
+ false,
+ GlobalValue::ExternalLinkage);
// Keep track of the fact that we have a forward ref to recycle it
- CurModule.GlobalRefs.insert(make_pair(make_pair(PT, $2), GV));
+ CurModule.GlobalRefs.insert(std::make_pair(std::make_pair(PT, $2), GV));
// Must temporarily push this value into the module table...
CurModule.CurrentModule->getGlobalList().push_back(GV);
ThrowException("Mismatched types for constant expression!");
$$ = $2;
delete $1;
+ }
+ | Types ZEROINITIALIZER {
+ $$ = Constant::getNullValue($1->get());
+ delete $1;
};
ConstVal : SIntType EINT64VAL { // integral constants
if (!IdxTy)
ThrowException("Index list invalid for constant getelementptr!");
- vector<Constant*> IdxVec;
+ std::vector<Constant*> IdxVec;
for (unsigned i = 0, e = $4->size(); i != e; ++i)
if (Constant *C = dyn_cast<Constant>((*$4)[i]))
IdxVec.push_back(C);
| ShiftOps '(' ConstVal ',' ConstVal ')' {
if ($5->getType() != Type::UByteTy)
ThrowException("Shift count for shift constant must be unsigned byte!");
- $$ = ConstantExpr::get($1, $3, $5);
+ if (!$3->getType()->isIntegral())
+ ThrowException("Shift constant expression requires integral operand!");
+ $$ = ConstantExpr::getShift($1, $3, $5);
};
-// ConstVector - A list of comma seperated constants.
+// ConstVector - A list of comma separated constants.
ConstVector : ConstVector ',' ConstVal {
($$ = $1)->push_back($3);
}
| ConstVal {
- $$ = new vector<Constant*>();
+ $$ = new std::vector<Constant*>();
$$->push_back($1);
};
// ConstPool - Constants with optional names assigned to them.
ConstPool : ConstPool OptAssign CONST ConstVal {
- if (setValueName($4, $2)) { assert(0 && "No redefinitions allowed!"); }
- InsertValue($4);
+ if (!setValueName($4, $2))
+ InsertValue($4);
}
| ConstPool OptAssign TYPE TypesV { // Types can be defined in the const pool
// Eagerly resolve types. This is not an optimization, this is a
}
| ConstPool FunctionProto { // Function prototypes can be in const pool
}
- | ConstPool OptAssign OptInternal GlobalType ConstVal {
+ | ConstPool OptAssign OptLinkage GlobalType ConstVal {
const Type *Ty = $5->getType();
// Global declarations appear in Constant Pool
Constant *Initializer = $5;
}
}
}
- | ConstPool OptAssign OptInternal EXTERNAL GlobalType Types {
- const Type *Ty = *$6;
+ | ConstPool OptAssign EXTERNAL GlobalType Types {
+ const Type *Ty = *$5;
// Global declarations appear in Constant Pool
- GlobalVariable *GV = new GlobalVariable(Ty, $5, $3);
+ GlobalVariable *GV = new GlobalVariable(Ty,$4,GlobalValue::ExternalLinkage);
if (!setValueName(GV, $2)) { // If not redefining...
CurModule.CurrentModule->getGlobalList().push_back(GV);
int Slot = InsertValue(GV, CurModule.Values);
(char*)GV->getName().c_str()));
}
}
- delete $6;
+ delete $5;
+ }
+ | ConstPool TARGET TargetDefinition {
}
| /* empty: end of list */ {
};
+
+BigOrLittle : BIG { $$ = Module::BigEndian; };
+BigOrLittle : LITTLE { $$ = Module::LittleEndian; };
+
+TargetDefinition : ENDIAN '=' BigOrLittle {
+ CurModule.CurrentModule->setEndianness($3);
+ }
+ | POINTERSIZE '=' EUINT64VAL {
+ if ($3 == 32)
+ CurModule.CurrentModule->setPointerSize(Module::Pointer32);
+ else if ($3 == 64)
+ CurModule.CurrentModule->setPointerSize(Module::Pointer64);
+ else
+ ThrowException("Invalid pointer size: '" + utostr($3) + "'!");
+ };
+
+
//===----------------------------------------------------------------------===//
// Rules to match Function Headers
//===----------------------------------------------------------------------===//
-OptVAR_ID : VAR_ID | /*empty*/ { $$ = 0; };
+Name : VAR_ID | STRINGCONSTANT;
+OptName : Name | /*empty*/ { $$ = 0; };
-ArgVal : Types OptVAR_ID {
+ArgVal : Types OptName {
if (*$1 == Type::VoidTy)
ThrowException("void typed arguments are invalid!");
- $$ = new pair<PATypeHolder*, char*>($1, $2);
+ $$ = new
std::pair<PATypeHolder*, char*>($1, $2);
};
ArgListH : ArgListH ',' ArgVal {
delete $3;
}
| ArgVal {
- $$ = new
vector<pair<PATypeHolder*,char*> >();
+ $$ = new
std::vector<std::pair<PATypeHolder*,char*> >();
$$->push_back(*$1);
delete $1;
};
}
| ArgListH ',' DOTDOTDOT {
$$ = $1;
- $$->push_back(pair<PATypeHolder*, char*>(new PATypeHolder(Type::VoidTy),0));
+ $$->push_back(std::pair<PATypeHolder*,
+ char*>(new PATypeHolder(Type::VoidTy), 0));
}
| DOTDOTDOT {
- $$ = new
vector<pair<PATypeHolder*,char*> >();
- $$->push_back(pair<PATypeHolder*, char*>(new PATypeHolder(Type::VoidTy),0));
+ $$ = new
std::vector<std::pair<PATypeHolder*,char*> >();
+ $$->push_back(std::make_pair(new PATypeHolder(Type::VoidTy), (char*)0));
}
| /* empty */ {
$$ = 0;
};
-FuncName : VAR_ID | STRINGCONSTANT;
-
-FunctionHeaderH : OptInternal TypesV FuncName '(' ArgList ')' {
- UnEscapeLexed($3);
- string FunctionName($3);
+FunctionHeaderH : TypesV Name '(' ArgList ')' {
+ UnEscapeLexed($2);
+ std::string FunctionName($2);
- vector<const Type*> ParamTypeList;
- if ($5) { // If there are arguments...
- for (vector<pair<PATypeHolder*,char*> >::iterator I = $5->begin();
- I != $5->end(); ++I)
+ std::vector<const Type*> ParamTypeList;
+ if ($4) { // If there are arguments...
+ for (std::vector<std::pair<PATypeHolder*,char*> >::iterator I = $4->begin();
+ I != $4->end(); ++I)
ParamTypeList.push_back(I->first->get());
}
bool isVarArg = ParamTypeList.size() && ParamTypeList.back() == Type::VoidTy;
if (isVarArg) ParamTypeList.pop_back();
- const FunctionType *FT = FunctionType::get(*$2, ParamTypeList, isVarArg);
+ const FunctionType *FT = FunctionType::get(*$1, ParamTypeList, isVarArg);
const PointerType *PFT = PointerType::get(FT);
- delete $2;
+ delete $1;
Function *Fn = 0;
// Is the function already in symtab?
if (!CurMeth.isDeclare && !Fn->isExternal())
ThrowException("Redefinition of function '" + FunctionName + "'!");
- // Make sure that we keep track of the internal marker, even if there was
- // a previous "declare".
- if ($1)
- Fn->setInternalLinkage(true);
-
// If we found a preexisting function prototype, remove it from the
// module, so that we don't get spurious conflicts with global & local
// variables.
AI->setName("");
} else { // Not already defined?
- Fn = new Function(FT, $1, FunctionName);
+ Fn = new Function(FT, GlobalValue::ExternalLinkage, FunctionName);
InsertValue(Fn, CurModule.Values);
- CurModule.DeclareNewGlobalValue(Fn, ValID::create($3));
+ CurModule.DeclareNewGlobalValue(Fn, ValID::create($2));
}
- free($3); // Free strdup'd memory!
+ free($2); // Free strdup'd memory!
CurMeth.FunctionStart(Fn);
// Add all of the arguments we parsed to the function...
- if ($5) { // Is null if empty...
+ if ($4) { // Is null if empty...
if (isVarArg) { // Nuke the last entry
- assert($5->back().first->get() == Type::VoidTy && $5->back().second == 0&&
+ assert($4->back().first->get() == Type::VoidTy && $4->back().second == 0&&
"Not a varargs marker!");
- delete $5->back().first;
- $5->pop_back(); // Delete the last entry
+ delete $4->back().first;
+ $4->pop_back(); // Delete the last entry
}
Function::aiterator ArgIt = Fn->abegin();
- for (vector<pair<PATypeHolder*, char*> >::iterator I = $5->begin();
- I != $5->end(); ++I, ++ArgIt) {
+ for (std::vector<std::pair<PATypeHolder*, char*> >::iterator I =$4->begin();
+ I != $4->end(); ++I, ++ArgIt) {
delete I->first; // Delete the typeholder...
if (setValueName(ArgIt, I->second)) // Insert arg into symtab...
InsertValue(ArgIt);
}
- delete $5; // We're now done with the argument list
+ delete $4; // We're now done with the argument list
}
};
BEGIN : BEGINTOK | '{'; // Allow BEGIN or '{' to start a function
-FunctionHeader : FunctionHeaderH BEGIN {
+FunctionHeader : OptLinkage FunctionHeaderH BEGIN {
$$ = CurMeth.CurrentFunction;
+ // Make sure that we keep track of the linkage type even if there was a
+ // previous "declare".
+ $$->setLinkage($1);
+
// Resolve circular types before we parse the body of the function.
ResolveTypes(CurMeth.LateResolveTypes);
};
SymbolicValueRef : INTVAL { // Is it an integer reference...?
$$ = ValID::create($1);
}
- | VAR_ID { // Is it a named reference...?
+ | Name { // Is it a named reference...?
$$ = ValID::create($1);
};
$$ = $1;
}
| /* empty */ {
- $$ = CurBB = new BasicBlock();
+ $$ = new BasicBlock();
};
BBTerminatorInst : RET ResolvedVal { // Return with a result...
cast<BasicBlock>(getVal(Type::LabelTy, $6)));
$$ = S;
- vector<pair<Constant*,BasicBlock*> >::iterator I = $8->begin(),
+ std::vector<std::pair<Constant*,BasicBlock*> >::iterator I = $8->begin(),
E = $8->end();
for (; I != E; ++I)
- S->dest_push_back(I->first, I->second);
+ S->addCase(I->first, I->second);
+ }
+ | SWITCH IntType ValueRef ',' LABEL ValueRef '[' ']' {
+ SwitchInst *S = new SwitchInst(getVal($2, $3),
+ cast<BasicBlock>(getVal(Type::LabelTy, $6)));
+ $$ = S;
}
| INVOKE TypesV ValueRef '(' ValueRefListE ')' TO ResolvedVal
EXCEPT ResolvedVal {
if (!(PFTy = dyn_cast<PointerType>($2->get())) ||
!(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
// Pull out the types of all of the arguments...
- vector<const Type*> ParamTypes;
+ std::vector<const Type*> ParamTypes;
if ($5) {
- for (vector<Value*>::iterator I = $5->begin(), E = $5->end(); I!=E; ++I)
+ for (std::vector<Value*>::iterator I = $5->begin(), E = $5->end();
+ I != E; ++I)
ParamTypes.push_back((*I)->getType());
}
// Create the call node...
if (!$5) { // Has no arguments?
- $$ = new InvokeInst(V, Normal, Except, vector<Value*>());
+ $$ = new InvokeInst(V, Normal, Except, std::vector<Value*>());
} else { // Has arguments?
// Loop through FunctionType's arguments and ensure they are specified
// correctly!
//
FunctionType::ParamTypes::const_iterator I = Ty->getParamTypes().begin();
FunctionType::ParamTypes::const_iterator E = Ty->getParamTypes().end();
- vector<Value*>::iterator ArgI = $5->begin(), ArgE = $5->end();
+ std::vector<Value*>::iterator ArgI = $5->begin(), ArgE = $5->end();
for (; ArgI != ArgE && I != E; ++ArgI, ++I)
if ((*ArgI)->getType() != *I)
$$ = new InvokeInst(V, Normal, Except, *$5);
}
delete $5;
+ }
+ | UNWIND {
+ $$ = new UnwindInst();
};
if (V == 0)
ThrowException("May only switch on a constant pool value!");
- $$->push_back(make_pair(V, cast<BasicBlock>(getVal($5, $6))));
+ $$->push_back(std::make_pair(V, cast<BasicBlock>(getVal($5, $6))));
}
| IntType ConstValueRef ',' LABEL ValueRef {
- $$ = new vector<pair<Constant*, BasicBlock*> >();
+ $$ = new std::vector<std::pair<Constant*, BasicBlock*> >();
Constant *V = cast<Constant>(getValNonImprovising($1, $2));
if (V == 0)
ThrowException("May only switch on a constant pool value!");
- $$->push_back(make_pair(V, cast<BasicBlock>(getVal($4, $5))));
+ $$->push_back(std::make_pair(V, cast<BasicBlock>(getVal($4, $5))));
};
Inst : OptAssign InstVal {
};
PHIList : Types '[' ValueRef ',' ValueRef ']' { // Used for PHI nodes
- $$ = new list<pair<Value*, BasicBlock*> >();
- $$->push_back(make_pair(getVal(*$1, $3),
- cast<BasicBlock>(getVal(Type::LabelTy, $5))));
+ $$ = new std::list<std::pair<Value*, BasicBlock*> >();
+ $$->push_back(std::make_pair(getVal(*$1, $3),
+ cast<BasicBlock>(getVal(Type::LabelTy, $5))));
delete $1;
}
| PHIList ',' '[' ValueRef ',' ValueRef ']' {
$$ = $1;
- $1->push_back(make_pair(getVal($1->front().first->getType(), $4),
- cast<BasicBlock>(getVal(Type::LabelTy, $6))));
+ $1->push_back(std::make_pair(getVal($1->front().first->getType(), $4),
+ cast<BasicBlock>(getVal(Type::LabelTy, $6))));
};
ValueRefList : ResolvedVal { // Used for call statements, and memory insts...
- $$ = new vector<Value*>();
+ $$ = new std::vector<Value*>();
$$->push_back($1);
}
| ValueRefList ',' ResolvedVal {
$$ = new CastInst($2, *$4);
delete $4;
}
+ | VA_ARG ResolvedVal ',' Types {
+ $$ = new VarArgInst($2, *$4);
+ delete $4;
+ }
| PHI PHIList {
const Type *Ty = $2->front().first->getType();
$$ = new PHINode(Ty);
if (!(PFTy = dyn_cast<PointerType>($2->get())) ||
!(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
// Pull out the types of all of the arguments...
- vector<const Type*> ParamTypes;
+ std::vector<const Type*> ParamTypes;
if ($5) {
- for (vector<Value*>::iterator I = $5->begin(), E = $5->end(); I!=E; ++I)
+ for (std::vector<Value*>::iterator I = $5->begin(), E = $5->end();
+ I != E; ++I)
ParamTypes.push_back((*I)->getType());
}
ThrowException("No arguments passed to a function that "
"expects arguments!");
- $$ = new CallInst(V, vector<Value*>());
+ $$ = new CallInst(V, std::vector<Value*>());
} else { // Has arguments?
// Loop through FunctionType's arguments and ensure they are specified
// correctly!
//
FunctionType::ParamTypes::const_iterator I = Ty->getParamTypes().begin();
FunctionType::ParamTypes::const_iterator E = Ty->getParamTypes().end();
- vector<Value*>::iterator ArgI = $5->begin(), ArgE = $5->end();
+ std::vector<Value*>::iterator ArgI = $5->begin(), ArgE = $5->end();
for (; ArgI != ArgE && I != E; ++ArgI, ++I)
if ((*ArgI)->getType() != *I)
// IndexList - List of indices for GEP based instructions...
IndexList : ',' ValueRefList {
- $$ = $2;
-} | /* empty */ {
- $$ = new vector<Value*>();
-};
+ $$ = $2;
+ } | /* empty */ {
+ $$ = new std::vector<Value*>();
+ };
+
+OptVolatile : VOLATILE {
+ $$ = true;
+ }
+ | /* empty */ {
+ $$ = false;
+ };
+
MemoryInst : MALLOC Types {
$$ = new MallocInst(*$2);
$$ = new FreeInst($2);
}
- | LOAD Types ValueRef IndexList {
- if (!isa<PointerType>($2->get()))
+ | OptVolatile LOAD Types ValueRef {
+ if (!isa<PointerType>($3->get()))
ThrowException("Can't load from nonpointer type: " +
- (*$2)->getDescription());
- if (GetElementPtrInst::getIndexedType(*$2, *$4) == 0)
- ThrowException("Invalid indices for load instruction!");
-
- Value *Src = getVal(*$2, $3);
- if (!$4->empty()) {
- std::cerr << "WARNING: Use of index load instruction:"
- << " replacing with getelementptr/load pair.\n";
- // Create a getelementptr hack instruction to do the right thing for
- // compatibility.
- //
- Instruction *I = new GetElementPtrInst(Src, *$4);
- CurBB->getInstList().push_back(I);
- Src = I;
- }
-
- $$ = new LoadInst(Src);
- delete $4; // Free the vector...
- delete $2;
+ (*$3)->getDescription());
+ $$ = new LoadInst(getVal(*$3, $4), "", $1);
+ delete $3;
}
- | STORE ResolvedVal ',' Types ValueRef IndexList {
- if (!isa<PointerType>($4->get()))
+ | OptVolatile STORE ResolvedVal ',' Types ValueRef {
+ const PointerType *PT = dyn_cast<PointerType>($5->get());
+ if (!PT)
ThrowException("Can't store to a nonpointer type: " +
- (*$4)->getDescription());
- const Type *ElTy = GetElementPtrInst::getIndexedType(*$4, *$6);
- if (ElTy == 0)
- ThrowException("Can't store into that field list!");
- if (ElTy != $2->getType())
- ThrowException("Can't store '" + $2->getType()->getDescription() +
+ (*$5)->getDescription());
+ const Type *ElTy = PT->getElementType();
+ if (ElTy != $3->getType())
+ ThrowException("Can't store '" + $3->getType()->getDescription() +
"' into space of type '" + ElTy->getDescription() + "'!");
- Value *Ptr = getVal(*$4, $5);
- if (!$6->empty()) {
- std::cerr << "WARNING: Use of index store instruction:"
- << " replacing with getelementptr/store pair.\n";
- // Create a getelementptr hack instruction to do the right thing for
- // compatibility.
- //
- Instruction *I = new GetElementPtrInst(Ptr, *$6);
- CurBB->getInstList().push_back(I);
- Ptr = I;
- }
-
- $$ = new StoreInst($2, Ptr);
- delete $4; delete $6;
+ $$ = new StoreInst($3, getVal(*$5, $6), $1);
+ delete $5;
}
| GETELEMENTPTR Types ValueRef IndexList {
- for (unsigned i = 0, e = $4->size(); i != e; ++i) {
- if ((*$4)[i]->getType() == Type::UIntTy) {
- std::cerr << "WARNING: Use of uint type indexes to getelementptr "
- << "instruction: replacing with casts to long type.\n";
- Instruction *I = new CastInst((*$4)[i], Type::LongTy);
- CurBB->getInstList().push_back(I);
- (*$4)[i] = I;
- }
- }
-
if (!isa<PointerType>($2->get()))
ThrowException("getelementptr insn requires pointer operand!");
if (!GetElementPtrInst::getIndexedType(*$2, *$4, true))
%%
int yyerror(const char *ErrorMsg) {
- string where = string((CurFilename == "-")? string("<stdin>") : CurFilename)
+ std::string where
+ = std::string((CurFilename == "-") ? std::string("<stdin>") : CurFilename)
+ ":" + utostr((unsigned) llvmAsmlineno) + ": ";
- string errMsg = string(ErrorMsg) + string("\n") + where + " while reading ";
+ std::string errMsg = std::string(ErrorMsg) + "\n" + where + " while reading ";
if (yychar == YYEMPTY)
errMsg += "end-of-file.";
else
- errMsg += "token: '" + string(llvmAsmtext, llvmAsmleng) + "'";
+ errMsg += "token: '" + std::string(llvmAsmtext, llvmAsmleng) + "'";
ThrowException(errMsg);
return 0;
}
projects / oota-llvm.git / blobdiff