Implement the TargetMachine::getJITStubForFunction method for X86, finegrainify

[oota-llvm.git] / lib / AsmParser / Parser.cpp

diff --git a/lib/AsmParser/Parser.cpp b/lib/AsmParser/Parser.cpp
index 57c831e9e17e581e22746ee6a3d61dc488fd2a46..2d6185efeb03384bbb82ce5c4b3a992f4ff1b411 100644 (file)
--- a/lib/AsmParser/Parser.cpp
+++ b/lib/AsmParser/Parser.cpp
@@ -1,46 +1,46 @@
 //===- Parser.cpp - Main dispatch module for the Parser library -------------===
+// 
+//                     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 library implements the functionality defined in llvm/assembly/parser.h
 //
 //===------------------------------------------------------------------------===
 
-#include "llvm/Analysis/Verifier.h"
-#include "llvm/Module.h"
 #include "ParserInternals.h"
-#include <stdio.h>  // for sprintf
+#include "llvm/Module.h"
+#include "llvm/Analysis/Verifier.h"
+
+namespace llvm {
 
-// The useful interface defined by this file... Parse an ascii file, and return
+// The useful interface defined by this file... Parse an ASCII file, and return
 // the internal representation in a nice slice'n'dice'able representation.
 //
-Module *ParseAssemblyFile(const ToolCommandLine &Opts) throw (ParseException) {
+Module *ParseAssemblyFile(const std::string &Filename) {
   FILE *F = stdin;
 
-  if (Opts.getInputFilename() != "-") 
-    F = fopen(Opts.getInputFilename().c_str(), "r");
+  if (Filename != "-") {
+    F = fopen(Filename.c_str(), "r");
 
-  if (F == 0) {
-    throw ParseException(Opts, string("Could not open file '") + 
-                        Opts.getInputFilename() + "'");
+    if (F == 0)
+      throw ParseException(Filename, "Could not open file '" + Filename + "'");
   }
 
-  // TODO: If this throws an exception, F is not closed.
-  Module *Result = RunVMAsmParser(Opts, F);
+  Module *Result;
+  try {
+    Result = RunVMAsmParser(Filename, F);
+  } catch (...) {
+    if (F != stdin) fclose(F);      // Make sure to close file descriptor if an
+    throw;                          // exception is thrown
+  }
 
   if (F != stdin)
     fclose(F);
 
-  if (Result) {  // Check to see that it is valid...
-    vector<string> Errors;
-    if (verify(Result, Errors)) {
-      delete Result; Result = 0;
-      string Message;
-
-      for (unsigned i = 0; i < Errors.size(); i++)
-       Message += Errors[i] + "\n";
-
-      throw ParseException(Opts, Message);
-    }
-  }
   return Result;
 }
 
@@ -50,35 +50,39 @@ Module *ParseAssemblyFile(const ToolCommandLine &Opts) throw (ParseException) {
 //===------------------------------------------------------------------------===
 
 
-ParseException::ParseException(const ToolCommandLine &opts, 
-                              const string &message, int lineNo, int colNo) 
-  : Opts(opts), Message(message) {
+ParseException::ParseException(const std::string &filename,
+                               const std::string &message, 
+                              int lineNo, int colNo) 
+  : Filename(filename), Message(message) {
   LineNo = lineNo; ColumnNo = colNo;
 }
 
 ParseException::ParseException(const ParseException &E) 
-  : Opts(E.Opts), Message(E.Message) {
+  : Filename(E.Filename), Message(E.Message) {
   LineNo = E.LineNo;
   ColumnNo = E.ColumnNo;
 }
 
-const string ParseException::getMessage() const { // Includes info from options
-  string Result;
+// Includes info from options
+const std::string ParseException::getMessage() const { 
+  std::string Result;
   char Buffer[10];
 
-  if (Opts.getInputFilename() == "-") 
+  if (Filename == "-") 
     Result += "<stdin>";
   else
-    Result += Opts.getInputFilename();
+    Result += Filename;
 
   if (LineNo != -1) {
     sprintf(Buffer, "%d", LineNo);
-    Result += string(":") + Buffer;
+    Result += std::string(":") + Buffer;
     if (ColumnNo != -1) {
       sprintf(Buffer, "%d", ColumnNo);
-      Result += string(",") + Buffer;
+      Result += std::string(",") + Buffer;
     }
   }
   
   return Result + ": " + Message;
 }
+
+} // End llvm namespace