#ifndef PARSER_INTERNALS_H
#define PARSER_INTERNALS_H
-#include <stdio.h>
-#define __STDC_LIMIT_MACROS
-
-#include "llvm/InstrTypes.h"
-#include "llvm/BasicBlock.h"
-#include "llvm/ConstantVals.h"
+#include "llvm/Constants.h"
#include "llvm/iOther.h"
#include "llvm/Function.h"
#include "llvm/DerivedTypes.h"
extern std::string CurFilename;
Module *RunVMAsmParser(const std::string &Filename, FILE *F);
+extern char* llvmAsmtext;
+extern int llvmAsmleng;
// UnEscapeLexed - Run through the specified buffer and change \xx codes to the
// appropriate character. If AllowNull is set to false, a \00 value will cause
//
struct ValID {
enum {
- NumberVal, NameVal, ConstSIntVal, ConstUIntVal, ConstStringVal,
- ConstFPVal, ConstNullVal
+ NumberVal, NameVal, ConstSIntVal, ConstUIntVal, ConstFPVal, ConstNullVal,
+ ConstantVal,
} Type;
union {
int64_t ConstPool64; // Constant pool reference. This is the value
uint64_t UConstPool64;// Unsigned constant pool reference.
double ConstPoolFP; // Floating point constant pool reference
+ Constant *ConstantValue; // Fully resolved constant for ConstantVal case.
};
static ValID create(int Num) {
ValID D; D.Type = ConstUIntVal; D.UConstPool64 = Val; return D;
}
- static ValID create_conststr(char *Name) {
- ValID D; D.Type = ConstStringVal; D.Name = Name; return D;
- }
-
static ValID create(double Val) {
ValID D; D.Type = ConstFPVal; D.ConstPoolFP = Val; return D;
}
ValID D; D.Type = ConstNullVal; return D;
}
+ static ValID create(Constant *Val) {
+ ValID D; D.Type = ConstantVal; D.ConstantValue = Val; return D;
+ }
+
inline void destroy() const {
- if (Type == NameVal || Type == ConstStringVal)
+ if (Type == NameVal)
free(Name); // Free this strdup'd memory...
}
inline ValID copy() const {
- if (Type != NameVal && Type != ConstStringVal) return *this;
+ if (Type != NameVal) return *this;
ValID Result = *this;
Result.Name = strdup(Name);
return Result;
switch (Type) {
case NumberVal : return std::string("#") + itostr(Num);
case NameVal : return Name;
- case ConstStringVal: return std::string("\"") + Name + std::string("\"");
case ConstFPVal : return ftostr(ConstPoolFP);
case ConstNullVal : return "null";
case ConstUIntVal :
case ConstSIntVal : return std::string("%") + itostr(ConstPool64);
+ case ConstantVal:
+ if (ConstantValue == ConstantBool::True) return "true";
+ if (ConstantValue == ConstantBool::False) return "false";
+ return "<constant expression>";
default:
assert(0 && "Unknown value!");
abort();
if (Type != V.Type) return Type < V.Type;
switch (Type) {
case NumberVal: return Num < V.Num;
- case ConstStringVal:
case NameVal: return strcmp(Name, V.Name) < 0;
case ConstSIntVal: return ConstPool64 < V.ConstPool64;
case ConstUIntVal: return UConstPool64 < V.UConstPool64;
case ConstFPVal: return ConstPoolFP < V.ConstPoolFP;
case ConstNullVal: return false;
+ case ConstantVal: return ConstantValue < V.ConstantValue;
default: assert(0 && "Unknown value type!"); return false;
}
}
struct MethPlaceHolderHelper : public Function {
MethPlaceHolderHelper(const Type *Ty)
- : Function(cast<FunctionType>(Ty), true) {}
+ : Function(cast<FunctionType>(Ty), InternalLinkage) {}
};
typedef PlaceholderValue<InstPlaceHolderHelper> ValuePlaceHolder;