// immediately invokes YYERROR. This would be so much cleaner if it was a
// recursive descent parser.
static bool TriggerError = false;
-#define CHECK_FOR_ERROR { if (TriggerError) { TriggerError = false; YYERROR; } }
+#define CHECK_FOR_ERROR { if (TriggerError) { TriggerError = false; YYABORT; } }
#define GEN_ERROR(msg) { GenerateError(msg); YYERROR; }
int yyerror(const char *ErrorMsg); // Forward declarations to prevent "implicit
Module *CurrentModule;
std::map<const Type *, ValueList> Values; // Module level numbered definitions
std::map<const Type *,ValueList> LateResolveValues;
- std::vector<PATypeHolder> Types;
- std::map<ValID, PATypeHolder> LateResolveTypes;
+ std::vector<TypeInfo> Types;
+ std::map<ValID, TypeInfo> LateResolveTypes;
/// PlaceHolderInfo - When temporary placeholder objects are created, remember
/// how they were referenced and on which line of the input they came from so
case ValID::NumberVal: // Is it a numbered definition?
// Module constants occupy the lowest numbered slots...
if ((unsigned)D.Num < CurModule.Types.size())
- return CurModule.Types[(unsigned)D.Num];
+ return CurModule.Types[(unsigned)D.Num].type->get();
break;
case ValID::NameVal: // Is it a named definition?
if (const Type *N = CurModule.CurrentModule->getTypeByName(D.Name)) {
}
}
- std::map<ValID, PATypeHolder>::iterator I =CurModule.LateResolveTypes.find(D);
+ std::map<ValID, TypeInfo>::iterator I =CurModule.LateResolveTypes.find(D);
if (I != CurModule.LateResolveTypes.end())
- return I->second;
+ return I->second.type->get();
- Type *Typ = OpaqueType::get();
- CurModule.LateResolveTypes.insert(std::make_pair(D, Typ));
- return Typ;
+ TypeInfo TI;
+ TI.type = new PATypeHolder(OpaqueType::get());
+ TI.signedness = isSignless;
+ CurModule.LateResolveTypes.insert(std::make_pair(D, TI));
+ return TI.type->get();
}
static Value *lookupInSymbolTable(const Type *Ty, const std::string &Name) {
// Check to make sure that "Ty" is an integral type, and that our
// value will fit into the specified type...
case ValID::ConstSIntVal: // Is it a constant pool reference??
- if (!ConstantSInt::isValueValidForType(Ty, D.ConstPool64)) {
+ if (!ConstantInt::isValueValidForType(Ty, D.ConstPool64)) {
GenerateError("Signed integral constant '" +
itostr(D.ConstPool64) + "' is invalid for type '" +
Ty->getDescription() + "'!");
return 0;
}
- return ConstantSInt::get(Ty, D.ConstPool64);
+ return ConstantInt::get(Ty, D.ConstPool64);
case ValID::ConstUIntVal: // Is it an unsigned const pool reference?
- if (!ConstantUInt::isValueValidForType(Ty, D.UConstPool64)) {
- if (!ConstantSInt::isValueValidForType(Ty, D.ConstPool64)) {
+ if (!ConstantInt::isValueValidForType(Ty, D.UConstPool64)) {
+ if (!ConstantInt::isValueValidForType(Ty, D.ConstPool64)) {
GenerateError("Integral constant '" + utostr(D.UConstPool64) +
"' is invalid or out of range!");
return 0;
} else { // This is really a signed reference. Transmogrify.
- return ConstantSInt::get(Ty, D.ConstPool64);
+ return ConstantInt::get(Ty, D.ConstPool64);
}
} else {
- return ConstantUInt::get(Ty, D.UConstPool64);
+ return ConstantInt::get(Ty, D.UConstPool64);
}
case ValID::ConstFPVal: // Is it a floating point const pool reference?
if (Name) D = ValID::create(Name);
else D = ValID::create((int)CurModule.Types.size());
- std::map<ValID, PATypeHolder>::iterator I =
+ std::map<ValID, TypeInfo>::iterator I =
CurModule.LateResolveTypes.find(D);
if (I != CurModule.LateResolveTypes.end()) {
- ((DerivedType*)I->second.get())->refineAbstractTypeTo(ToTy);
+ ((DerivedType*)I->second.type->get())->refineAbstractTypeTo(ToTy);
CurModule.LateResolveTypes.erase(I);
}
}
return Ty;
}
+/// This function is used to obtain the correct opcode for an instruction when
+/// an obsolete opcode is encountered. The OI parameter (OpcodeInfo) has both
+/// an opcode and an "obsolete" flag. These are generated by the lexer and
+/// the "obsolete" member will be true when the lexer encounters the token for
+/// an obsolete opcode. For example, "div" was replaced by [usf]div but we need
+/// to maintain backwards compatibility for asm files that still have the "div"
+/// instruction. This function handles converting div -> [usf]div appropriately.
+/// @brief Convert obsolete BinaryOps opcodes to new values
+static void
+sanitizeOpcode(OpcodeInfo<Instruction::BinaryOps> &OI, const Type *Ty)
+{
+ // If its not obsolete, don't do anything
+ if (!OI.obsolete)
+ return;
+
+ // If its a packed type we want to use the element type
+ if (const PackedType *PTy = dyn_cast<PackedType>(Ty))
+ Ty = PTy->getElementType();
+
+ // Depending on the opcode ..
+ switch (OI.opcode) {
+ default:
+ GenerateError("Invalid obsolete opCode (check Lexer.l)");
+ break;
+ case Instruction::UDiv:
+ // Handle cases where the opcode needs to change
+ if (Ty->isFloatingPoint())
+ OI.opcode = Instruction::FDiv;
+ else if (Ty->isSigned())
+ OI.opcode = Instruction::SDiv;
+ break;
+ case Instruction::URem:
+ if (Ty->isFloatingPoint())
+ OI.opcode = Instruction::FRem;
+ else if (Ty->isSigned())
+ OI.opcode = Instruction::SRem;
+ break;
+ }
+ // Its not obsolete any more, we fixed it.
+ OI.obsolete = false;
+}
+
+/// This function is similar to the previous overload of sanitizeOpcode but
+/// operates on Instruction::OtherOps instead of Instruction::BinaryOps.
+/// @brief Convert obsolete OtherOps opcodes to new values
+static void
+sanitizeOpcode(OpcodeInfo<Instruction::OtherOps> &OI, const Type *Ty)
+{
+ // If its not obsolete, don't do anything
+ if (!OI.obsolete)
+ return;
+
+ switch (OI.opcode) {
+ default:
+ GenerateError("Invalid obsolete opcode (check Lexer.l)");
+ break;
+ case Instruction::LShr:
+ if (Ty->isSigned())
+ OI.opcode = Instruction::AShr;
+ break;
+ }
+ // Its not obsolete any more, we fixed it.
+ OI.obsolete = false;
+}
// common code from the two 'RunVMAsmParser' functions
static Module* RunParser(Module * M) {
llvmAsmlineno = 1; // Reset the current line number...
ObsoleteVarArgs = false;
NewVarArgs = false;
-
CurModule.CurrentModule = M;
- yyparse(); // Parse the file, potentially throwing exception
+
+ // Check to make sure the parser succeeded
+ if (yyparse()) {
+ if (ParserResult)
+ delete ParserResult;
+ return 0;
+ }
+
+ // Check to make sure that parsing produced a result
if (!ParserResult)
return 0;
+ // Reset ParserResult variable while saving its value for the result.
Module *Result = ParserResult;
ParserResult = 0;
%union {
llvm::Module *ModuleVal;
llvm::Function *FunctionVal;
- std::pair<llvm::PATypeHolder*, char*> *ArgVal;
+ std::pair<TypeInfo, char*> *ArgVal;
llvm::BasicBlock *BasicBlockVal;
llvm::TerminatorInst *TermInstVal;
llvm::Instruction *InstVal;
llvm::Constant *ConstVal;
- const llvm::Type *PrimType;
- llvm::PATypeHolder *TypeVal;
+ TypeInfo TypeVal;
llvm::Value *ValueVal;
- std::vector<std::pair<llvm::PATypeHolder*,char*> > *ArgList;
+ std::vector<std::pair<TypeInfo,char*> >*ArgList;
std::vector<llvm::Value*> *ValueList;
- std::list<llvm::PATypeHolder> *TypeList;
+ std::list<TypeInfo> *TypeList;
// Represent the RHS of PHI node
std::list<std::pair<llvm::Value*,
llvm::BasicBlock*> > *PHIList;
bool BoolVal;
char *StrVal; // This memory is strdup'd!
- llvm::ValID ValIDVal; // strdup'd memory maybe!
-
- llvm::Instruction::BinaryOps BinaryOpVal;
- llvm::Instruction::TermOps TermOpVal;
- llvm::Instruction::MemoryOps MemOpVal;
- llvm::Instruction::OtherOps OtherOpVal;
- llvm::Module::Endianness Endianness;
+ llvm::ValID ValIDVal; // strdup'd memory maybe!
+
+ BinaryOpInfo BinaryOpVal;
+ TermOpInfo TermOpVal;
+ MemOpInfo MemOpVal;
+ CastOpInfo CastOpVal;
+ OtherOpInfo OtherOpVal;
+ llvm::Module::Endianness Endianness;
}
%type <ModuleVal> Module FunctionList
// Built in types...
%type <TypeVal> Types TypesV UpRTypes UpRTypesV
-%type <PrimType> SIntType UIntType IntType FPType PrimType // Classifications
-%token <PrimType> VOID BOOL SBYTE UBYTE SHORT USHORT INT UINT LONG ULONG
-%token <PrimType> FLOAT DOUBLE TYPE LABEL
+%type <TypeVal> SIntType UIntType IntType FPType PrimType // Classifications
+%token <TypeVal> VOID BOOL SBYTE UBYTE SHORT USHORT INT UINT LONG ULONG
+%token <TypeVal> FLOAT DOUBLE TYPE LABEL
%token <StrVal> VAR_ID LABELSTR STRINGCONSTANT
%type <StrVal> Name OptName OptAssign
%token DEPLIBS CALL TAIL ASM_TOK MODULE SIDEEFFECT
%token CC_TOK CCC_TOK CSRETCC_TOK FASTCC_TOK COLDCC_TOK
%token X86_STDCALLCC_TOK X86_FASTCALLCC_TOK
+%token DATALAYOUT
%type <UIntVal> OptCallingConv
// Basic Block Terminating Operators
// Binary Operators
%type <BinaryOpVal> ArithmeticOps LogicalOps SetCondOps // Binops Subcatagories
-%token <BinaryOpVal> ADD SUB MUL DIV REM AND OR XOR
-%token <BinaryOpVal> SETLE SETGE SETLT SETGT SETEQ SETNE // Binary Comarators
+%token <BinaryOpVal> ADD SUB MUL UDIV SDIV FDIV UREM SREM FREM AND OR XOR
+%token <BinaryOpVal> SETLE SETGE SETLT SETGT SETEQ SETNE // Binary Comparators
// Memory Instructions
%token <MemOpVal> MALLOC ALLOCA FREE LOAD STORE GETELEMENTPTR
+// Cast Operators
+%type <CastOpVal> CastOps
+%token <CastOpVal> TRUNC ZEXT SEXT FPTRUNC FPEXT BITCAST
+%token <CastOpVal> UITOFP SITOFP FPTOUI FPTOSI INTTOPTR PTRTOINT
+
// Other Operators
%type <OtherOpVal> ShiftOps
-%token <OtherOpVal> PHI_TOK CAST SELECT SHL SHR VAARG
+%token <OtherOpVal> PHI_TOK SELECT SHL LSHR ASHR VAARG
%token <OtherOpVal> EXTRACTELEMENT INSERTELEMENT SHUFFLEVECTOR
%token VAARG_old VANEXT_old //OBSOLETE
// Operations that are notably excluded from this list include:
// RET, BR, & SWITCH because they end basic blocks and are treated specially.
//
-ArithmeticOps: ADD | SUB | MUL | DIV | REM;
+ArithmeticOps: ADD | SUB | MUL | UDIV | SDIV | FDIV | UREM | SREM | FREM;
LogicalOps : AND | OR | XOR;
SetCondOps : SETLE | SETGE | SETLT | SETGT | SETEQ | SETNE;
-
-ShiftOps : SHL | SHR;
+CastOps : TRUNC | ZEXT | SEXT | FPTRUNC | FPEXT | BITCAST |
+ UITOFP | SITOFP | FPTOUI | FPTOSI | INTTOPTR | PTRTOINT;
+ShiftOps : SHL | LSHR | ASHR;
// These are some types that allow classification if we only want a particular
// thing... for example, only a signed, unsigned, or integral type.
//
// TypesV includes all of 'Types', but it also includes the void type.
-TypesV : Types | VOID { $$ = new PATypeHolder($1); };
-UpRTypesV : UpRTypes | VOID { $$ = new PATypeHolder($1); };
+TypesV : Types | VOID {
+ $$.type = new PATypeHolder($1.type->get());
+ $$.signedness = $1.signedness;
+};
+UpRTypesV : UpRTypes | VOID {
+ $$.type = new PATypeHolder($1.type->get());
+ $$.signedness = $1.signedness;
+};
Types : UpRTypes {
if (!UpRefs.empty())
- GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
+ GEN_ERROR("Invalid upreference in type: " +
+ ($1.type->get())->getDescription());
$$ = $1;
CHECK_FOR_ERROR
- };
+};
// Derived types are added later...
PrimType : BOOL | SBYTE | UBYTE | SHORT | USHORT | INT | UINT ;
PrimType : LONG | ULONG | FLOAT | DOUBLE | TYPE | LABEL;
UpRTypes : OPAQUE {
- $$ = new PATypeHolder(OpaqueType::get());
+ $$.type = new PATypeHolder(OpaqueType::get());
+ $$.signedness = isSignless;
CHECK_FOR_ERROR
}
| PrimType {
- $$ = new PATypeHolder($1);
+ $$ = $1;
CHECK_FOR_ERROR
};
UpRTypes : SymbolicValueRef { // Named types are also simple types...
const Type* tmp = getTypeVal($1);
CHECK_FOR_ERROR
- $$ = new PATypeHolder(tmp);
+ $$.type = new PATypeHolder(tmp);
+ $$.signedness = isSignless;
};
// Include derived types in the Types production.
if ($2 > (uint64_t)~0U) GEN_ERROR("Value out of range!");
OpaqueType *OT = OpaqueType::get(); // Use temporary placeholder
UpRefs.push_back(UpRefRecord((unsigned)$2, OT)); // Add to vector...
- $$ = new PATypeHolder(OT);
+ $$.type = new PATypeHolder(OT);
+ $$.signedness = isSignless;
UR_OUT("New Upreference!\n");
CHECK_FOR_ERROR
}
| UpRTypesV '(' ArgTypeListI ')' { // Function derived type?
std::vector<const Type*> Params;
- for (std::list<llvm::PATypeHolder>::iterator I = $3->begin(),
+ for (std::list<TypeInfo>::iterator I = $3->begin(),
E = $3->end(); I != E; ++I)
- Params.push_back(*I);
+ Params.push_back(I->type->get());
bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
if (isVarArg) Params.pop_back();
- $$ = new PATypeHolder(HandleUpRefs(FunctionType::get(*$1,Params,isVarArg)));
+ $$.type = new PATypeHolder(HandleUpRefs(
+ FunctionType::get($1.type->get(),Params,isVarArg)));
+ $$.signedness = isSignless;
delete $3; // Delete the argument list
- delete $1; // Delete the return type handle
+ delete $1.type;
CHECK_FOR_ERROR
}
| '[' EUINT64VAL 'x' UpRTypes ']' { // Sized array type?
- $$ = new PATypeHolder(HandleUpRefs(ArrayType::get(*$4, (unsigned)$2)));
- delete $4;
+ $$.type = new PATypeHolder(HandleUpRefs(
+ ArrayType::get($4.type->get(), (unsigned)$2)));
+ $$.signedness = isSignless;
+ delete $4.type;
CHECK_FOR_ERROR
}
| '<' EUINT64VAL 'x' UpRTypes '>' { // Packed array type?
- const llvm::Type* ElemTy = $4->get();
- if ((unsigned)$2 != $2)
- GEN_ERROR("Unsigned result not equal to signed result");
- if (!ElemTy->isPrimitiveType())
- GEN_ERROR("Elemental type of a PackedType must be primitive");
- if (!isPowerOf2_32($2))
- GEN_ERROR("Vector length should be a power of 2!");
- $$ = new PATypeHolder(HandleUpRefs(PackedType::get(*$4, (unsigned)$2)));
- delete $4;
- CHECK_FOR_ERROR
+ const llvm::Type* ElemTy = $4.type->get();
+ if ((unsigned)$2 != $2)
+ GEN_ERROR("Unsigned result not equal to signed result");
+ if (!ElemTy->isPrimitiveType())
+ GEN_ERROR("Elemental type of a PackedType must be primitive");
+ if (!isPowerOf2_32($2))
+ GEN_ERROR("Vector length should be a power of 2!");
+ $$.type = new PATypeHolder(HandleUpRefs(
+ PackedType::get($4.type->get(), (unsigned)$2)));
+ $$.signedness = isSignless;
+ delete $4.type;
+ CHECK_FOR_ERROR
}
| '{' TypeListI '}' { // Structure type?
std::vector<const Type*> Elements;
- for (std::list<llvm::PATypeHolder>::iterator I = $2->begin(),
+ for (std::list<TypeInfo>::iterator I = $2->begin(),
E = $2->end(); I != E; ++I)
- Elements.push_back(*I);
+ Elements.push_back(I->type->get());
- $$ = new PATypeHolder(HandleUpRefs(StructType::get(Elements)));
+ $$.type = new PATypeHolder(HandleUpRefs(StructType::get(Elements)));
+ $$.signedness = isSignless;
delete $2;
CHECK_FOR_ERROR
}
| '{' '}' { // Empty structure type?
- $$ = new PATypeHolder(StructType::get(std::vector<const Type*>()));
+ $$.type = new PATypeHolder(StructType::get(std::vector<const Type*>()));
+ $$.signedness = isSignless;
CHECK_FOR_ERROR
}
| UpRTypes '*' { // Pointer type?
- $$ = new PATypeHolder(HandleUpRefs(PointerType::get(*$1)));
- delete $1;
+ if ($1.type->get() == Type::LabelTy)
+ GEN_ERROR("Cannot form a pointer to a basic block");
+ $$.type = new PATypeHolder(HandleUpRefs(PointerType::get($1.type->get())));
+ $$.signedness = $1.signedness;
+ delete $1.type;
CHECK_FOR_ERROR
};
// declaration type lists
//
TypeListI : UpRTypes {
- $$ = new std::list<PATypeHolder>();
- $$->push_back(*$1); delete $1;
+ $$ = new std::list<TypeInfo>();
+ $$->push_back($1);
CHECK_FOR_ERROR
}
| TypeListI ',' UpRTypes {
- ($$=$1)->push_back(*$3); delete $3;
+ ($$=$1)->push_back($3);
CHECK_FOR_ERROR
};
// ArgTypeList - List of types for a function type declaration...
ArgTypeListI : TypeListI
| TypeListI ',' DOTDOTDOT {
- ($$=$1)->push_back(Type::VoidTy);
+ TypeInfo TI;
+ TI.type = new PATypeHolder(Type::VoidTy); TI.signedness = isSignless;
+ ($$=$1)->push_back(TI);
CHECK_FOR_ERROR
}
| DOTDOTDOT {
- ($$ = new std::list<PATypeHolder>())->push_back(Type::VoidTy);
+ TypeInfo TI;
+ TI.type = new PATypeHolder(Type::VoidTy); TI.signedness = isSignless;
+ ($$ = new std::list<TypeInfo>())->push_back(TI);
CHECK_FOR_ERROR
}
| /*empty*/ {
- $$ = new std::list<PATypeHolder>();
+ $$ = new std::list<TypeInfo>();
CHECK_FOR_ERROR
};
// ResolvedVal, ValueRef and ConstValueRef productions.
//
ConstVal: Types '[' ConstVector ']' { // Nonempty unsized arr
- const ArrayType *ATy = dyn_cast<ArrayType>($1->get());
+ const ArrayType *ATy = dyn_cast<ArrayType>($1.type->get());
if (ATy == 0)
GEN_ERROR("Cannot make array constant with type: '" +
- (*$1)->getDescription() + "'!");
+ ($1.type->get())->getDescription() + "'!");
const Type *ETy = ATy->getElementType();
int NumElements = ATy->getNumElements();
}
$$ = ConstantArray::get(ATy, *$3);
- delete $1; delete $3;
+ delete $1.type; delete $3;
CHECK_FOR_ERROR
}
| Types '[' ']' {
- const ArrayType *ATy = dyn_cast<ArrayType>($1->get());
+ const ArrayType *ATy = dyn_cast<ArrayType>($1.type->get());
if (ATy == 0)
GEN_ERROR("Cannot make array constant with type: '" +
- (*$1)->getDescription() + "'!");
+ ($1.type->get())->getDescription() + "'!");
int NumElements = ATy->getNumElements();
if (NumElements != -1 && NumElements != 0)
GEN_ERROR("Type mismatch: constant sized array initialized with 0"
" arguments, but has size of " + itostr(NumElements) +"!");
$$ = ConstantArray::get(ATy, std::vector<Constant*>());
- delete $1;
+ delete $1.type;
CHECK_FOR_ERROR
}
| Types 'c' STRINGCONSTANT {
- const ArrayType *ATy = dyn_cast<ArrayType>($1->get());
+ const ArrayType *ATy = dyn_cast<ArrayType>($1.type->get());
if (ATy == 0)
GEN_ERROR("Cannot make array constant with type: '" +
- (*$1)->getDescription() + "'!");
+ ($1.type->get())->getDescription() + "'!");
int NumElements = ATy->getNumElements();
const Type *ETy = ATy->getElementType();
std::vector<Constant*> Vals;
if (ETy == Type::SByteTy) {
for (signed char *C = (signed char *)$3; C != (signed char *)EndStr; ++C)
- Vals.push_back(ConstantSInt::get(ETy, *C));
+ Vals.push_back(ConstantInt::get(ETy, *C));
} else if (ETy == Type::UByteTy) {
for (unsigned char *C = (unsigned char *)$3;
C != (unsigned char*)EndStr; ++C)
- Vals.push_back(ConstantUInt::get(ETy, *C));
+ Vals.push_back(ConstantInt::get(ETy, *C));
} else {
free($3);
GEN_ERROR("Cannot build string arrays of non byte sized elements!");
}
free($3);
$$ = ConstantArray::get(ATy, Vals);
- delete $1;
+ delete $1.type;
CHECK_FOR_ERROR
}
| Types '<' ConstVector '>' { // Nonempty unsized arr
- const PackedType *PTy = dyn_cast<PackedType>($1->get());
+ const PackedType *PTy = dyn_cast<PackedType>($1.type->get());
if (PTy == 0)
GEN_ERROR("Cannot make packed constant with type: '" +
- (*$1)->getDescription() + "'!");
+ $1.type->get()->getDescription() + "'!");
const Type *ETy = PTy->getElementType();
int NumElements = PTy->getNumElements();
}
$$ = ConstantPacked::get(PTy, *$3);
- delete $1; delete $3;
+ delete $1.type; delete $3;
CHECK_FOR_ERROR
}
| Types '{' ConstVector '}' {
- const StructType *STy = dyn_cast<StructType>($1->get());
+ const StructType *STy = dyn_cast<StructType>($1.type->get());
if (STy == 0)
GEN_ERROR("Cannot make struct constant with type: '" +
- (*$1)->getDescription() + "'!");
+ $1.type->get()->getDescription() + "'!");
if ($3->size() != STy->getNumContainedTypes())
GEN_ERROR("Illegal number of initializers for structure type!");
" of structure initializer!");
$$ = ConstantStruct::get(STy, *$3);
- delete $1; delete $3;
+ delete $1.type; delete $3;
CHECK_FOR_ERROR
}
| Types '{' '}' {
- const StructType *STy = dyn_cast<StructType>($1->get());
+ const StructType *STy = dyn_cast<StructType>($1.type->get());
if (STy == 0)
GEN_ERROR("Cannot make struct constant with type: '" +
- (*$1)->getDescription() + "'!");
+ $1.type->get()->getDescription() + "'!");
if (STy->getNumContainedTypes() != 0)
GEN_ERROR("Illegal number of initializers for structure type!");
$$ = ConstantStruct::get(STy, std::vector<Constant*>());
- delete $1;
+ delete $1.type;
CHECK_FOR_ERROR
}
| Types NULL_TOK {
- const PointerType *PTy = dyn_cast<PointerType>($1->get());
+ const PointerType *PTy = dyn_cast<PointerType>($1.type->get());
if (PTy == 0)
GEN_ERROR("Cannot make null pointer constant with type: '" +
- (*$1)->getDescription() + "'!");
+ $1.type->get()->getDescription() + "'!");
$$ = ConstantPointerNull::get(PTy);
- delete $1;
+ delete $1.type;
CHECK_FOR_ERROR
}
| Types UNDEF {
- $$ = UndefValue::get($1->get());
- delete $1;
+ $$ = UndefValue::get($1.type->get());
+ delete $1.type;
CHECK_FOR_ERROR
}
| Types SymbolicValueRef {
- const PointerType *Ty = dyn_cast<PointerType>($1->get());
+ const PointerType *Ty = dyn_cast<PointerType>($1.type->get());
if (Ty == 0)
GEN_ERROR("Global const reference must be a pointer type!");
}
$$ = cast<GlobalValue>(V);
- delete $1; // Free the type handle
+ delete $1.type; // Free the type handle
CHECK_FOR_ERROR
}
| Types ConstExpr {
- if ($1->get() != $2->getType())
+ if ($1.type->get() != $2->getType())
GEN_ERROR("Mismatched types for constant expression!");
$$ = $2;
- delete $1;
+ delete $1.type;
CHECK_FOR_ERROR
}
| Types ZEROINITIALIZER {
- const Type *Ty = $1->get();
+ const Type *Ty = $1.type->get();
if (isa<FunctionType>(Ty) || Ty == Type::LabelTy || isa<OpaqueType>(Ty))
GEN_ERROR("Cannot create a null initialized value of this type!");
$$ = Constant::getNullValue(Ty);
- delete $1;
+ delete $1.type;
CHECK_FOR_ERROR
};
ConstVal : SIntType EINT64VAL { // integral constants
- if (!ConstantSInt::isValueValidForType($1, $2))
+ if (!ConstantInt::isValueValidForType($1.type->get(), $2))
GEN_ERROR("Constant value doesn't fit in type!");
- $$ = ConstantSInt::get($1, $2);
+ $$ = ConstantInt::get($1.type->get(), $2);
CHECK_FOR_ERROR
}
| UIntType EUINT64VAL { // integral constants
- if (!ConstantUInt::isValueValidForType($1, $2))
+ if (!ConstantInt::isValueValidForType($1.type->get(), $2))
GEN_ERROR("Constant value doesn't fit in type!");
- $$ = ConstantUInt::get($1, $2);
+ $$ = ConstantInt::get($1.type->get(), $2);
CHECK_FOR_ERROR
}
| BOOL TRUETOK { // Boolean constants
CHECK_FOR_ERROR
}
| FPType FPVAL { // Float & Double constants
- if (!ConstantFP::isValueValidForType($1, $2))
+ if (!ConstantFP::isValueValidForType($1.type->get(), $2))
GEN_ERROR("Floating point constant invalid for type!!");
- $$ = ConstantFP::get($1, $2);
+ $$ = ConstantFP::get($1.type->get(), $2);
CHECK_FOR_ERROR
};
-ConstExpr: CAST '(' ConstVal TO Types ')' {
- if (!$3->getType()->isFirstClassType())
+ConstExpr: CastOps '(' ConstVal TO Types ')' {
+ Constant *Val = $3;
+ const Type *Ty = $5.type->get();
+ if (!Val->getType()->isFirstClassType())
GEN_ERROR("cast constant expression from a non-primitive type: '" +
- $3->getType()->getDescription() + "'!");
- if (!$5->get()->isFirstClassType())
+ Val->getType()->getDescription() + "'!");
+ if (!Ty->isFirstClassType())
GEN_ERROR("cast constant expression to a non-primitive type: '" +
- $5->get()->getDescription() + "'!");
- $$ = ConstantExpr::getCast($3, $5->get());
- delete $5;
- CHECK_FOR_ERROR
+ Ty->getDescription() + "'!");
+ if ($1.obsolete) {
+ if (Ty == Type::BoolTy) {
+ // The previous definition of cast to bool was a compare against zero.
+ // We have to retain that semantic so we do it here.
+ $$ = ConstantExpr::get(Instruction::SetNE, Val,
+ Constant::getNullValue(Val->getType()));
+ } else if (Val->getType()->isFloatingPoint() && isa<PointerType>(Ty)) {
+ Constant *CE = ConstantExpr::getFPToUI(Val, Type::ULongTy);
+ $$ = ConstantExpr::getIntToPtr(CE, Ty);
+ } else {
+ $$ = ConstantExpr::getCast(Val, Ty);
+ }
+ } else {
+ $$ = ConstantExpr::getCast($1.opcode, $3, $5.type->get());
+ }
+ delete $5.type;
}
| GETELEMENTPTR '(' ConstVal IndexList ')' {
if (!isa<PointerType>($3->getType()))
GTE = gep_type_end($3->getType(), $4->begin(), $4->end());
for (unsigned i = 0, e = $4->size(); i != e && GTI != GTE; ++i, ++GTI)
if (isa<StructType>(*GTI)) // Only change struct indices
- if (ConstantUInt *CUI = dyn_cast<ConstantUInt>((*$4)[i]))
+ if (ConstantInt *CUI = dyn_cast<ConstantInt>((*$4)[i]))
if (CUI->getType() == Type::UByteTy)
(*$4)[i] = ConstantExpr::getCast(CUI, Type::UIntTy);
| ArithmeticOps '(' ConstVal ',' ConstVal ')' {
if ($3->getType() != $5->getType())
GEN_ERROR("Binary operator types must match!");
+ // First, make sure we're dealing with the right opcode by upgrading from
+ // obsolete versions.
+ sanitizeOpcode($1, $3->getType());
+ CHECK_FOR_ERROR;
+
// HACK: llvm 1.3 and earlier used to emit invalid pointer constant exprs.
// To retain backward compatibility with these early compilers, we emit a
// cast to the appropriate integer type automatically if we are in the
// broken case. See PR424 for more information.
if (!isa<PointerType>($3->getType())) {
- $$ = ConstantExpr::get($1, $3, $5);
+ $$ = ConstantExpr::get($1.opcode, $3, $5);
} else {
const Type *IntPtrTy = 0;
switch (CurModule.CurrentModule->getPointerSize()) {
case Module::Pointer64: IntPtrTy = Type::LongTy; break;
default: GEN_ERROR("invalid pointer binary constant expr!");
}
- $$ = ConstantExpr::get($1, ConstantExpr::getCast($3, IntPtrTy),
+ $$ = ConstantExpr::get($1.opcode, ConstantExpr::getCast($3, IntPtrTy),
ConstantExpr::getCast($5, IntPtrTy));
$$ = ConstantExpr::getCast($$, $3->getType());
}
!cast<PackedType>($3->getType())->getElementType()->isIntegral())
GEN_ERROR("Logical operator requires integral operands!");
}
- $$ = ConstantExpr::get($1, $3, $5);
+ $$ = ConstantExpr::get($1.opcode, $3, $5);
CHECK_FOR_ERROR
}
| SetCondOps '(' ConstVal ',' ConstVal ')' {
if ($3->getType() != $5->getType())
GEN_ERROR("setcc operand types must match!");
- $$ = ConstantExpr::get($1, $3, $5);
+ $$ = ConstantExpr::get($1.opcode, $3, $5);
CHECK_FOR_ERROR
}
| ShiftOps '(' ConstVal ',' ConstVal ')' {
GEN_ERROR("Shift count for shift constant must be unsigned byte!");
if (!$3->getType()->isInteger())
GEN_ERROR("Shift constant expression requires integer operand!");
- $$ = ConstantExpr::get($1, $3, $5);
+ // Handle opcode upgrade situations
+ sanitizeOpcode($1, $3->getType());
+ CHECK_FOR_ERROR;
+ $$ = ConstantExpr::get($1.opcode, $3, $5);
CHECK_FOR_ERROR
}
| EXTRACTELEMENT '(' ConstVal ',' ConstVal ')' {
Module : FunctionList {
$$ = ParserResult = $1;
CurModule.ModuleDone();
- CHECK_FOR_ERROR
+ CHECK_FOR_ERROR;
};
// FunctionList - A list of functions, preceeded by a constant pool.
// If types are not resolved eagerly, then the two types will not be
// determined to be the same type!
//
- ResolveTypeTo($2, *$4);
+ ResolveTypeTo($2, $4.type->get());
- if (!setTypeName(*$4, $2) && !$2) {
+ if (!setTypeName($4.type->get(), $2) && !$2) {
CHECK_FOR_ERROR
// If this is a named type that is not a redefinition, add it to the slot
// table.
- CurModule.Types.push_back(*$4);
+ CurModule.Types.push_back($4);
+ } else {
+ delete $4.type;
}
-
- delete $4;
CHECK_FOR_ERROR
}
| ConstPool FunctionProto { // Function prototypes can be in const pool
CurGV = 0;
}
| ConstPool OptAssign EXTERNAL GlobalType Types {
- CurGV = ParseGlobalVariable($2, GlobalValue::ExternalLinkage, $4, *$5, 0);
+ CurGV = ParseGlobalVariable($2, GlobalValue::ExternalLinkage, $4,
+ $5.type->get(), 0);
CHECK_FOR_ERROR
- delete $5;
+ delete $5.type;
} GlobalVarAttributes {
CurGV = 0;
CHECK_FOR_ERROR
}
| ConstPool OptAssign DLLIMPORT GlobalType Types {
- CurGV = ParseGlobalVariable($2, GlobalValue::DLLImportLinkage, $4, *$5, 0);
+ CurGV = ParseGlobalVariable($2, GlobalValue::DLLImportLinkage, $4,
+ $5.type->get(), 0);
CHECK_FOR_ERROR
- delete $5;
+ delete $5.type;
} GlobalVarAttributes {
CurGV = 0;
CHECK_FOR_ERROR
}
| ConstPool OptAssign EXTERN_WEAK GlobalType Types {
CurGV =
- ParseGlobalVariable($2, GlobalValue::ExternalWeakLinkage, $4, *$5, 0);
+ ParseGlobalVariable($2, GlobalValue::ExternalWeakLinkage, $4,
+ $5.type->get(), 0);
CHECK_FOR_ERROR
- delete $5;
+ delete $5.type;
} GlobalVarAttributes {
CurGV = 0;
CHECK_FOR_ERROR
| TRIPLE '=' STRINGCONSTANT {
CurModule.CurrentModule->setTargetTriple($3);
free($3);
- CHECK_FOR_ERROR
+ }
+ | DATALAYOUT '=' STRINGCONSTANT {
+ CurModule.CurrentModule->setDataLayout($3);
+ free($3);
};
LibrariesDefinition : '[' LibList ']';
OptName : Name | /*empty*/ { $$ = 0; };
ArgVal : Types OptName {
- if (*$1 == Type::VoidTy)
+ if ($1.type->get() == Type::VoidTy)
GEN_ERROR("void typed arguments are invalid!");
- $$ = new std::pair<PATypeHolder*, char*>($1, $2);
+ $$ = new std::pair<TypeInfo, char*>($1, $2);
CHECK_FOR_ERROR
};
CHECK_FOR_ERROR
}
| ArgVal {
- $$ = new std::vector<std::pair<PATypeHolder*,char*> >();
+ $$ = new std::vector<std::pair<TypeInfo,char*> >();
$$->push_back(*$1);
delete $1;
CHECK_FOR_ERROR
}
| ArgListH ',' DOTDOTDOT {
$$ = $1;
- $$->push_back(std::pair<PATypeHolder*,
- char*>(new PATypeHolder(Type::VoidTy), 0));
+ TypeInfo TI;
+ TI.type = new PATypeHolder(Type::VoidTy);
+ TI.signedness = isSignless;
+ $$->push_back(std::pair<TypeInfo,char*>(TI,(char*)0));
CHECK_FOR_ERROR
}
| DOTDOTDOT {
- $$ = new std::vector<std::pair<PATypeHolder*,char*> >();
- $$->push_back(std::make_pair(new PATypeHolder(Type::VoidTy), (char*)0));
+ $$ = new std::vector<std::pair<TypeInfo,char*> >();
+ TypeInfo TI;
+ TI.type = new PATypeHolder(Type::VoidTy);
+ TI.signedness = isSignless;
+ $$->push_back(std::make_pair(TI, (char*)0));
CHECK_FOR_ERROR
}
| /* empty */ {
std::string FunctionName($3);
free($3); // Free strdup'd memory!
- if (!(*$2)->isFirstClassType() && *$2 != Type::VoidTy)
+ if (!($2.type->get())->isFirstClassType() && $2.type->get() != Type::VoidTy)
GEN_ERROR("LLVM functions cannot return aggregate types!");
std::vector<const Type*> ParamTypeList;
if ($5) { // If there are arguments...
- for (std::vector<std::pair<PATypeHolder*,char*> >::iterator I = $5->begin();
+ for (std::vector<std::pair<TypeInfo,char*> >::iterator I = $5->begin();
I != $5->end(); ++I)
- ParamTypeList.push_back(I->first->get());
+ ParamTypeList.push_back(I->first.type->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($2.type->get(), ParamTypeList,
+ isVarArg);
const PointerType *PFT = PointerType::get(FT);
- delete $2;
+ delete $2.type;
ValID ID;
if (!FunctionName.empty()) {
// Add all of the arguments we parsed to the function...
if ($5) { // Is null if empty...
if (isVarArg) { // Nuke the last entry
- assert($5->back().first->get() == Type::VoidTy && $5->back().second == 0&&
- "Not a varargs marker!");
- delete $5->back().first;
+ assert($5->back().first.type->get() == Type::VoidTy &&
+ $5->back().second == 0 && "Not a varargs marker!");
+ delete $5->back().first.type;
$5->pop_back(); // Delete the last entry
}
Function::arg_iterator ArgIt = Fn->arg_begin();
- for (std::vector<std::pair<PATypeHolder*,char*> >::iterator I = $5->begin();
+ for (std::vector<std::pair<TypeInfo,char*> >::iterator I = $5->begin();
I != $5->end(); ++I, ++ArgIt) {
- delete I->first; // Delete the typeholder...
-
+ delete I->first.type; // Delete the typeholder...
setValueName(ArgIt, I->second); // Insert arg into symtab...
CHECK_FOR_ERROR
InsertValue(ArgIt);
}
-
delete $5; // We're now done with the argument list
}
CHECK_FOR_ERROR
};
FnDeclareLinkage: /*default*/ |
- DLLIMPORT { CurFun.Linkage = GlobalValue::DLLImportLinkage } |
- EXTERN_WEAK { CurFun.Linkage = GlobalValue::DLLImportLinkage };
+ DLLIMPORT { CurFun.Linkage = GlobalValue::DLLImportLinkage; } |
+ EXTERN_WEAK { CurFun.Linkage = GlobalValue::DLLImportLinkage; };
FunctionProto : DECLARE { CurFun.isDeclare = true; } FnDeclareLinkage FunctionHeaderH {
$$ = CurFun.CurrentFunction;
PackedType* pt = PackedType::get(ETy, NumElements);
PATypeHolder* PTy = new PATypeHolder(
- HandleUpRefs(
- PackedType::get(
- ETy,
- NumElements)
- )
- );
+ HandleUpRefs(PackedType::get( ETy, NumElements)));
// Verify all elements are correct type!
for (unsigned i = 0; i < $2->size(); i++) {
// type immediately preceeds the value reference, and allows complex constant
// pool references (for things like: 'ret [2 x int] [ int 12, int 42]')
ResolvedVal : Types ValueRef {
- $$ = getVal(*$1, $2); delete $1;
+ $$ = getVal($1.type->get(), $2); delete $1.type;
CHECK_FOR_ERROR
};
};
InstructionList : InstructionList Inst {
+ if (CastInst *CI1 = dyn_cast<CastInst>($2))
+ if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
+ if (CI2->getParent() == 0)
+ $1->getInstList().push_back(CI2);
$1->getInstList().push_back($2);
$$ = $1;
CHECK_FOR_ERROR
$$ = new BranchInst(tmpBBA, tmpBBB, tmpVal);
}
| SWITCH IntType ValueRef ',' LABEL ValueRef '[' JumpTable ']' {
- Value* tmpVal = getVal($2, $3);
+ Value* tmpVal = getVal($2.type->get(), $3);
CHECK_FOR_ERROR
BasicBlock* tmpBB = getBBVal($6);
CHECK_FOR_ERROR
CHECK_FOR_ERROR
}
| SWITCH IntType ValueRef ',' LABEL ValueRef '[' ']' {
- Value* tmpVal = getVal($2, $3);
+ Value* tmpVal = getVal($2.type->get(), $3);
CHECK_FOR_ERROR
BasicBlock* tmpBB = getBBVal($6);
CHECK_FOR_ERROR
const PointerType *PFTy;
const FunctionType *Ty;
- if (!(PFTy = dyn_cast<PointerType>($3->get())) ||
+ if (!(PFTy = dyn_cast<PointerType>($3.type->get())) ||
!(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
// Pull out the types of all of the arguments...
std::vector<const Type*> ParamTypes;
bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy;
if (isVarArg) ParamTypes.pop_back();
- Ty = FunctionType::get($3->get(), ParamTypes, isVarArg);
+ Ty = FunctionType::get($3.type->get(), ParamTypes, isVarArg);
PFTy = PointerType::get(Ty);
}
}
cast<InvokeInst>($$)->setCallingConv($2);
- delete $3;
+ delete $3.type;
delete $6;
CHECK_FOR_ERROR
}
JumpTable : JumpTable IntType ConstValueRef ',' LABEL ValueRef {
$$ = $1;
- Constant *V = cast<Constant>(getValNonImprovising($2, $3));
+ Constant *V = cast<Constant>(getValNonImprovising($2.type->get(), $3));
CHECK_FOR_ERROR
if (V == 0)
GEN_ERROR("May only switch on a constant pool value!");
}
| IntType ConstValueRef ',' LABEL ValueRef {
$$ = new std::vector<std::pair<Constant*, BasicBlock*> >();
- Constant *V = cast<Constant>(getValNonImprovising($1, $2));
+ Constant *V = cast<Constant>(getValNonImprovising($1.type->get(), $2));
CHECK_FOR_ERROR
if (V == 0)
PHIList : Types '[' ValueRef ',' ValueRef ']' { // Used for PHI nodes
$$ = new std::list<std::pair<Value*, BasicBlock*> >();
- Value* tmpVal = getVal(*$1, $3);
+ Value* tmpVal = getVal($1.type->get(), $3);
CHECK_FOR_ERROR
BasicBlock* tmpBB = getBBVal($5);
CHECK_FOR_ERROR
$$->push_back(std::make_pair(tmpVal, tmpBB));
- delete $1;
+ delete $1.type;
}
| PHIList ',' '[' ValueRef ',' ValueRef ']' {
$$ = $1;
};
InstVal : ArithmeticOps Types ValueRef ',' ValueRef {
- if (!(*$2)->isInteger() && !(*$2)->isFloatingPoint() &&
- !isa<PackedType>((*$2).get()))
+ if (!$2.type->get()->isInteger() && !$2.type->get()->isFloatingPoint() &&
+ !isa<PackedType>($2.type->get()))
GEN_ERROR(
"Arithmetic operator requires integer, FP, or packed operands!");
- if (isa<PackedType>((*$2).get()) && $1 == Instruction::Rem)
- GEN_ERROR("Rem not supported on packed types!");
- Value* val1 = getVal(*$2, $3);
- CHECK_FOR_ERROR
- Value* val2 = getVal(*$2, $5);
- CHECK_FOR_ERROR
- $$ = BinaryOperator::create($1, val1, val2);
+ if (isa<PackedType>($2.type->get()) &&
+ ($1.opcode == Instruction::URem ||
+ $1.opcode == Instruction::SRem ||
+ $1.opcode == Instruction::FRem))
+ GEN_ERROR("U/S/FRem not supported on packed types!");
+ // Upgrade the opcode from obsolete versions before we do anything with it.
+ sanitizeOpcode($1,$2.type->get());
+ CHECK_FOR_ERROR;
+ Value* val1 = getVal($2.type->get(), $3);
+ CHECK_FOR_ERROR
+ Value* val2 = getVal($2.type->get(), $5);
+ CHECK_FOR_ERROR
+ $$ = BinaryOperator::create($1.opcode, val1, val2);
if ($$ == 0)
GEN_ERROR("binary operator returned null!");
- delete $2;
+ delete $2.type;
}
| LogicalOps Types ValueRef ',' ValueRef {
- if (!(*$2)->isIntegral()) {
- if (!isa<PackedType>($2->get()) ||
- !cast<PackedType>($2->get())->getElementType()->isIntegral())
+ if (!$2.type->get()->isIntegral()) {
+ if (!isa<PackedType>($2.type->get()) ||
+ !cast<PackedType>($2.type->get())->getElementType()->isIntegral())
GEN_ERROR("Logical operator requires integral operands!");
}
- Value* tmpVal1 = getVal(*$2, $3);
+ Value* tmpVal1 = getVal($2.type->get(), $3);
CHECK_FOR_ERROR
- Value* tmpVal2 = getVal(*$2, $5);
+ Value* tmpVal2 = getVal($2.type->get(), $5);
CHECK_FOR_ERROR
- $$ = BinaryOperator::create($1, tmpVal1, tmpVal2);
+ $$ = BinaryOperator::create($1.opcode, tmpVal1, tmpVal2);
if ($$ == 0)
GEN_ERROR("binary operator returned null!");
- delete $2;
+ delete $2.type;
}
| SetCondOps Types ValueRef ',' ValueRef {
- if(isa<PackedType>((*$2).get())) {
+ if(isa<PackedType>($2.type->get())) {
GEN_ERROR(
"PackedTypes currently not supported in setcc instructions!");
}
- Value* tmpVal1 = getVal(*$2, $3);
+ Value* tmpVal1 = getVal($2.type->get(), $3);
CHECK_FOR_ERROR
- Value* tmpVal2 = getVal(*$2, $5);
+ Value* tmpVal2 = getVal($2.type->get(), $5);
CHECK_FOR_ERROR
- $$ = new SetCondInst($1, tmpVal1, tmpVal2);
+ $$ = new SetCondInst($1.opcode, tmpVal1, tmpVal2);
if ($$ == 0)
GEN_ERROR("binary operator returned null!");
- delete $2;
+ delete $2.type;
}
| NOT ResolvedVal {
std::cerr << "WARNING: Use of eliminated 'not' instruction:"
GEN_ERROR("Shift amount must be ubyte!");
if (!$2->getType()->isInteger())
GEN_ERROR("Shift constant expression requires integer operand!");
- $$ = new ShiftInst($1, $2, $4);
- CHECK_FOR_ERROR
- }
- | CAST ResolvedVal TO Types {
- if (!$4->get()->isFirstClassType())
- GEN_ERROR("cast instruction to a non-primitive type: '" +
- $4->get()->getDescription() + "'!");
- $$ = new CastInst($2, *$4);
- delete $4;
- CHECK_FOR_ERROR
+ // Handle opcode upgrade situations
+ sanitizeOpcode($1, $2->getType());
+ CHECK_FOR_ERROR;
+ $$ = new ShiftInst($1.opcode, $2, $4);
+ CHECK_FOR_ERROR
+ }
+ | CastOps ResolvedVal TO Types {
+ Value* Val = $2;
+ const Type* Ty = $4.type->get();
+ if (!Val->getType()->isFirstClassType())
+ GEN_ERROR("cast from a non-primitive type: '" +
+ Val->getType()->getDescription() + "'!");
+ if (!Ty->isFirstClassType())
+ GEN_ERROR("cast to a non-primitive type: '" + Ty->getDescription() +"'!");
+
+ if ($1.obsolete) {
+ if (Ty == Type::BoolTy) {
+ // The previous definition of cast to bool was a compare against zero.
+ // We have to retain that semantic so we do it here.
+ $$ = new SetCondInst(Instruction::SetNE, $2,
+ Constant::getNullValue($2->getType()));
+ } else if (Val->getType()->isFloatingPoint() && isa<PointerType>(Ty)) {
+ CastInst *CI = new FPToUIInst(Val, Type::ULongTy);
+ $$ = new IntToPtrInst(CI, Ty);
+ } else {
+ $$ = CastInst::createInferredCast(Val, Ty);
+ }
+ } else {
+ $$ = CastInst::create($1.opcode, $2, $4.type->get());
+ }
+ delete $4.type;
}
| SELECT ResolvedVal ',' ResolvedVal ',' ResolvedVal {
if ($2->getType() != Type::BoolTy)
}
| VAARG ResolvedVal ',' Types {
NewVarArgs = true;
- $$ = new VAArgInst($2, *$4);
- delete $4;
+ $$ = new VAArgInst($2, $4.type->get());
+ delete $4.type;
CHECK_FOR_ERROR
}
| VAARG_old ResolvedVal ',' Types {
CallInst* bar = new CallInst(NF, $2);
CurBB->getInstList().push_back(bar);
CurBB->getInstList().push_back(new StoreInst(bar, foo));
- $$ = new VAArgInst(foo, *$4);
- delete $4;
+ $$ = new VAArgInst(foo, $4.type->get());
+ delete $4.type;
CHECK_FOR_ERROR
}
| VANEXT_old ResolvedVal ',' Types {
CallInst* bar = new CallInst(NF, $2);
CurBB->getInstList().push_back(bar);
CurBB->getInstList().push_back(new StoreInst(bar, foo));
- Instruction* tmp = new VAArgInst(foo, *$4);
+ Instruction* tmp = new VAArgInst(foo, $4.type->get());
CurBB->getInstList().push_back(tmp);
$$ = new LoadInst(foo);
- delete $4;
+ delete $4.type;
CHECK_FOR_ERROR
}
| EXTRACTELEMENT ResolvedVal ',' ResolvedVal {
CHECK_FOR_ERROR
}
| OptTailCall OptCallingConv TypesV ValueRef '(' ValueRefListE ')' {
- const PointerType *PFTy;
- const FunctionType *Ty;
+ const PointerType *PFTy = 0;
+ const FunctionType *Ty = 0;
- if (!(PFTy = dyn_cast<PointerType>($3->get())) ||
+ if (!(PFTy = dyn_cast<PointerType>($3.type->get())) ||
!(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
// Pull out the types of all of the arguments...
std::vector<const Type*> ParamTypes;
bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy;
if (isVarArg) ParamTypes.pop_back();
- if (!(*$3)->isFirstClassType() && *$3 != Type::VoidTy)
+ if (!$3.type->get()->isFirstClassType() &&
+ $3.type->get() != Type::VoidTy)
GEN_ERROR("LLVM functions cannot return aggregate types!");
- Ty = FunctionType::get($3->get(), ParamTypes, isVarArg);
+ Ty = FunctionType::get($3.type->get(), ParamTypes, isVarArg);
PFTy = PointerType::get(Ty);
}
}
cast<CallInst>($$)->setTailCall($1);
cast<CallInst>($$)->setCallingConv($2);
- delete $3;
+ delete $3.type;
delete $6;
CHECK_FOR_ERROR
}
MemoryInst : MALLOC Types OptCAlign {
- $$ = new MallocInst(*$2, 0, $3);
- delete $2;
+ $$ = new MallocInst($2.type->get(), 0, $3);
+ delete $2.type;
CHECK_FOR_ERROR
}
| MALLOC Types ',' UINT ValueRef OptCAlign {
- Value* tmpVal = getVal($4, $5);
+ Value* tmpVal = getVal($4.type->get(), $5);
CHECK_FOR_ERROR
- $$ = new MallocInst(*$2, tmpVal, $6);
- delete $2;
+ $$ = new MallocInst($2.type->get(), tmpVal, $6);
+ delete $2.type;
}
| ALLOCA Types OptCAlign {
- $$ = new AllocaInst(*$2, 0, $3);
- delete $2;
+ $$ = new AllocaInst($2.type->get(), 0, $3);
+ delete $2.type;
CHECK_FOR_ERROR
}
| ALLOCA Types ',' UINT ValueRef OptCAlign {
- Value* tmpVal = getVal($4, $5);
+ Value* tmpVal = getVal($4.type->get(), $5);
CHECK_FOR_ERROR
- $$ = new AllocaInst(*$2, tmpVal, $6);
- delete $2;
+ $$ = new AllocaInst($2.type->get(), tmpVal, $6);
+ delete $2.type;
}
| FREE ResolvedVal {
if (!isa<PointerType>($2->getType()))
}
| OptVolatile LOAD Types ValueRef {
- if (!isa<PointerType>($3->get()))
+ if (!isa<PointerType>($3.type->get()))
GEN_ERROR("Can't load from nonpointer type: " +
- (*$3)->getDescription());
- if (!cast<PointerType>($3->get())->getElementType()->isFirstClassType())
+ $3.type->get()->getDescription());
+ if (!cast<PointerType>($3.type->get())->getElementType()->isFirstClassType())
GEN_ERROR("Can't load from pointer of non-first-class type: " +
- (*$3)->getDescription());
- Value* tmpVal = getVal(*$3, $4);
+ $3.type->get()->getDescription());
+ Value* tmpVal = getVal($3.type->get(), $4);
CHECK_FOR_ERROR
$$ = new LoadInst(tmpVal, "", $1);
- delete $3;
+ delete $3.type;
}
| OptVolatile STORE ResolvedVal ',' Types ValueRef {
- const PointerType *PT = dyn_cast<PointerType>($5->get());
+ const PointerType *PT = dyn_cast<PointerType>($5.type->get());
if (!PT)
GEN_ERROR("Can't store to a nonpointer type: " +
- (*$5)->getDescription());
+ ($5.type->get())->getDescription());
const Type *ElTy = PT->getElementType();
if (ElTy != $3->getType())
GEN_ERROR("Can't store '" + $3->getType()->getDescription() +
"' into space of type '" + ElTy->getDescription() + "'!");
- Value* tmpVal = getVal(*$5, $6);
+ Value* tmpVal = getVal($5.type->get(), $6);
CHECK_FOR_ERROR
$$ = new StoreInst($3, tmpVal, $1);
- delete $5;
+ delete $5.type;
}
| GETELEMENTPTR Types ValueRef IndexList {
- if (!isa<PointerType>($2->get()))
+ if (!isa<PointerType>($2.type->get()))
GEN_ERROR("getelementptr insn requires pointer operand!");
// LLVM 1.2 and earlier used ubyte struct indices. Convert any ubyte struct
// indices to uint struct indices for compatibility.
generic_gep_type_iterator<std::vector<Value*>::iterator>
- GTI = gep_type_begin($2->get(), $4->begin(), $4->end()),
- GTE = gep_type_end($2->get(), $4->begin(), $4->end());
+ GTI = gep_type_begin($2.type->get(), $4->begin(), $4->end()),
+ GTE = gep_type_end($2.type->get(), $4->begin(), $4->end());
for (unsigned i = 0, e = $4->size(); i != e && GTI != GTE; ++i, ++GTI)
if (isa<StructType>(*GTI)) // Only change struct indices
- if (ConstantUInt *CUI = dyn_cast<ConstantUInt>((*$4)[i]))
+ if (ConstantInt *CUI = dyn_cast<ConstantInt>((*$4)[i]))
if (CUI->getType() == Type::UByteTy)
(*$4)[i] = ConstantExpr::getCast(CUI, Type::UIntTy);
- if (!GetElementPtrInst::getIndexedType(*$2, *$4, true))
+ if (!GetElementPtrInst::getIndexedType($2.type->get(), *$4, true))
GEN_ERROR("Invalid getelementptr indices for type '" +
- (*$2)->getDescription()+ "'!");
- Value* tmpVal = getVal(*$2, $3);
+ $2.type->get()->getDescription()+ "'!");
+ Value* tmpVal = getVal($2.type->get(), $3);
CHECK_FOR_ERROR
$$ = new GetElementPtrInst(tmpVal, *$4);
- delete $2;
+ delete $2.type;
delete $4;
};
projects / oota-llvm.git / blobdiff