X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FAsmParser%2FParserInternals.h;h=8fd5031c05a42141610dbe7df7500f78d02dad04;hb=389056110f861ef8f5af5c3c10ddd854d260a0b8;hp=e315902c31f452821fbc99d9e3ed8f4689c54298;hpb=6ecdcc1c031c9dcece82472a889f6a6b6c5d4cef;p=oota-llvm.git

diff --git a/lib/AsmParser/ParserInternals.h b/lib/AsmParser/ParserInternals.h
index e315902c31f..8fd5031c05a 100644
--- a/lib/AsmParser/ParserInternals.h
+++ b/lib/AsmParser/ParserInternals.h
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -22,38 +22,26 @@
 #include "llvm/Instructions.h"
 #include "llvm/Assembly/Parser.h"
 #include "llvm/ADT/StringExtras.h"
-
+#include "llvm/ADT/APFloat.h"
+namespace llvm { class MemoryBuffer; }
 
 // Global variables exported from the lexer...
 
-extern int llvmAsmlineno;         /// FIXME: Not threading friendly
 extern llvm::ParseError* TheParseError; /// FIXME: Not threading friendly
 
-extern std::string &llvmAsmTextin;
-
 // functions exported from the lexer
-void set_scan_file(FILE * F);
-void set_scan_string (const char * str);
-
-// Globals exported by the parser...
-extern char* llvmAsmtext;
-extern int   llvmAsmleng;
+void InitLLLexer(llvm::MemoryBuffer *MB);
+const char *LLLgetTokenStart();
+unsigned LLLgetTokenLength();
+std::string LLLgetFilename();
+unsigned LLLgetLineNo();
+void FreeLexer();
 
 namespace llvm {
 class Module;
 
-// Globals exported by the parser...
-extern std::string CurFilename;   /// FIXME: Not threading friendly
-
-// 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.  
-char *UnEscapeLexed(char *Buffer);
+// RunVMAsmParser - Parse a buffer and return Module
+Module *RunVMAsmParser(llvm::MemoryBuffer *MB);
 
 // GenerateError - Wrapper around the ParseException class that automatically
 // fills in file line number and column number and options info.
@@ -93,10 +81,10 @@ struct ValID {
     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;
@@ -119,7 +107,7 @@ struct ValID {
     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;
   }
 
@@ -168,7 +156,7 @@ struct ValID {
     case GlobalID      : return '@' + utostr(Num);
     case LocalName     : return *Name;
     case GlobalName    : return *Name;
-    case ConstFPVal    : return ftostr(ConstPoolFP);
+    case ConstFPVal    : return ftostr(*ConstPoolFP);
     case ConstNullVal  : return "null";
     case ConstUndefVal : return "undef";
     case ConstZeroVal  : return "zeroinitializer";
@@ -194,7 +182,8 @@ struct ValID {
     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;
@@ -212,7 +201,8 @@ struct ValID {
         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;
@@ -239,12 +229,12 @@ struct ArgListEntry {
 
 typedef std::vector<struct ArgListEntry> ArgListType;
 
-struct ValueRefListEntry {
+struct ParamListEntry {
   Value *Val;
   uint16_t Attrs;
 };
 
-typedef std::vector<ValueRefListEntry> ValueRefList;
+typedef std::vector<ParamListEntry> ParamList;
 
 
 } // End llvm namespace