#include "llvm/Constants.h"
#include "llvm/DerivedTypes.h"
+#include "llvm/ParameterAttributes.h"
#include "llvm/Function.h"
#include "llvm/Instructions.h"
#include "llvm/Assembly/Parser.h"
#include "llvm/ADT/StringExtras.h"
-
+#include "llvm/ADT/APFloat.h"
// Global variables exported from the lexer...
extern int llvmAsmleng;
namespace llvm {
+class Module;
// Globals exported by the parser...
extern std::string CurFilename; /// FIXME: Not threading friendly
-class Module;
+// RunVMAsmParser - Parse a file and return Module
Module *RunVMAsmParser(const std::string &Filename, FILE *F);
// Parse a string directly
Module *RunVMAsmParser(const char * AsmString, Module * M);
-
// 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
-// an error.
-//
-// If AllowNull is set to true, the return value of the function points to the
-// last character of the string in memory.
-//
-char *UnEscapeLexed(char *Buffer, bool AllowNull = false);
-
+// appropriate character.
+char *UnEscapeLexed(char *Buffer);
-// ThrowException - Wrapper around the ParseException class that automatically
+// GenerateError - Wrapper around the ParseException class that automatically
// fills in file line number and column number and options info.
//
// This also helps me because I keep typing 'throw new ParseException' instead
union {
unsigned Num; // If it's a numeric reference like %1234
- char *Name; // If it's a named reference. Memory must be free'd.
+ std::string *Name; // If it's a named reference. Memory must be deleted.
int64_t ConstPool64; // Constant pool reference. This is the value
uint64_t UConstPool64;// Unsigned constant pool reference.
- double ConstPoolFP; // Floating point constant pool reference
+ APFloat *ConstPoolFP; // Floating point constant pool reference
Constant *ConstantValue; // Fully resolved constant for ConstantVal case.
InlineAsmDescriptor *IAD;
- };
+ };
static ValID createLocalID(unsigned Num) {
ValID D; D.Type = LocalID; D.Num = Num; return D;
static ValID createGlobalID(unsigned Num) {
ValID D; D.Type = GlobalID; D.Num = Num; return D;
}
- static ValID createLocalName(char *Name) {
- ValID D; D.Type = LocalName; D.Name = Name; return D;
+ static ValID createLocalName(const std::string &Name) {
+ ValID D; D.Type = LocalName; D.Name = new std::string(Name); return D;
}
- static ValID createGlobalName(char *Name) {
- ValID D; D.Type = GlobalName; D.Name = Name; return D;
+ static ValID createGlobalName(const std::string &Name) {
+ ValID D; D.Type = GlobalName; D.Name = new std::string(Name); return D;
}
static ValID create(int64_t Val) {
ValID D; D.Type = ConstUIntVal; D.UConstPool64 = Val; return D;
}
- static ValID create(double Val) {
+ static ValID create(APFloat *Val) {
ValID D; D.Type = ConstFPVal; D.ConstPoolFP = Val; return D;
}
inline void destroy() const {
if (Type == LocalName || Type == GlobalName)
- free(Name); // Free this strdup'd memory.
+ delete Name; // Free this strdup'd memory.
else if (Type == InlineAsmVal)
delete IAD;
}
inline ValID copy() const {
if (Type != LocalName && Type != GlobalName) return *this;
ValID Result = *this;
- Result.Name = strdup(Name);
+ Result.Name = new std::string(*Name);
return Result;
}
switch (Type) {
case LocalID : return '%' + utostr(Num);
case GlobalID : return '@' + utostr(Num);
- case LocalName : return Name;
- case GlobalName : return Name;
- case ConstFPVal : return ftostr(ConstPoolFP);
+ case LocalName : return *Name;
+ case GlobalName : return *Name;
+ case ConstFPVal : return ftostr(*ConstPoolFP);
case ConstNullVal : return "null";
case ConstUndefVal : return "undef";
case ConstZeroVal : return "zeroinitializer";
case LocalID:
case GlobalID: return Num < V.Num;
case LocalName:
- case GlobalName: return strcmp(Name, V.Name) < 0;
+ case GlobalName: return *Name < *V.Name;
case ConstSIntVal: return ConstPool64 < V.ConstPool64;
case ConstUIntVal: return UConstPool64 < V.UConstPool64;
- case ConstFPVal: return ConstPoolFP < V.ConstPoolFP;
+ case ConstFPVal: return ConstPoolFP->compare(*V.ConstPoolFP) ==
+ APFloat::cmpLessThan;
case ConstNullVal: return false;
case ConstUndefVal: return false;
case ConstZeroVal: return false;
case LocalID:
case GlobalID: return Num == V.Num;
case LocalName:
- case GlobalName: return strcmp(Name, V.Name) == 0;
+ case GlobalName: return *Name == *(V.Name);
case ConstSIntVal: return ConstPool64 == V.ConstPool64;
case ConstUIntVal: return UConstPool64 == V.UConstPool64;
- case ConstFPVal: return ConstPoolFP == V.ConstPoolFP;
+ case ConstFPVal: return ConstPoolFP->compare(*V.ConstPoolFP) ==
+ APFloat::cmpEqual;
case ConstantVal: return ConstantValue == V.ConstantValue;
case ConstNullVal: return true;
case ConstUndefVal: return true;
struct TypeWithAttrs {
llvm::PATypeHolder *Ty;
- FunctionType::ParameterAttributes Attrs;
+ uint16_t Attrs;
};
typedef std::vector<TypeWithAttrs> TypeWithAttrsList;
struct ArgListEntry {
- FunctionType::ParameterAttributes Attrs;
+ uint16_t Attrs;
llvm::PATypeHolder *Ty;
- char *Name;
+ std::string *Name;
};
typedef std::vector<struct ArgListEntry> ArgListType;
struct ValueRefListEntry {
Value *Val;
- FunctionType::ParameterAttributes Attrs;
+ uint16_t Attrs;
};
typedef std::vector<ValueRefListEntry> ValueRefList;