6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-11-02 07:11:49 +00:00
Code Issues Projects Releases Wiki Activity

Refactor common code from ParseAssemblyString and ParseAssemblyFile,

Browse Source 
to expose a low-level interface for parsing from an existing MemoryBuffer.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80803 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman 2009-09-02 17:18:19 +00:00
parent 3445d9a72a
commit 2ec5fe524c
2 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/llvm/Assembly/Parser.h
View File

@ -19,6 +19,7 @@
namespace llvm {
class Module;
class MemoryBuffer;
class SMDiagnostic;
class raw_ostream;
class LLVMContext;
@ -48,6 +49,17 @@ Module *ParseAssemblyString(
LLVMContext &Context
);
/// This function is the low-level interface to the LLVM Assembly Parser.
/// ParseAssemblyFile and ParseAssemblyString are wrappers around this function.
/// @brief Parse LLVM Assembly from a MemoryBuffer.
Module *ParseAssembly(
MemoryBuffer *F, ///< The MemoryBuffer containing assembly
const std::string &Name, ///< The name of the original source file
Module *M, ///< A module to add the assembly too.
SMDiagnostic &Err, ///< Error result info.
LLVMContext &Context
);
} // End llvm namespace
#endif

40
lib/AsmParser/Parser.cpp
View File

@ -21,6 +21,25 @@
#include <cstring>
using namespace llvm;
Module *llvm::ParseAssembly(MemoryBuffer *F,
const std::string &Name,
Module *M,
SMDiagnostic &Err,
LLVMContext &Context) {
SourceMgr SM;
SM.AddNewSourceBuffer(F, SMLoc());
// If we are parsing into an existing module, do it.
if (M)
return LLParser(F, SM, Err, M).Run() ? 0 : M;
// Otherwise create a new module.
OwningPtr<Module> M2(new Module(Name, Context));
if (LLParser(F, SM, Err, M2.get()).Run())
return 0;
return M2.take();
}
Module *llvm::ParseAssemblyFile(const std::string &Filename, SMDiagnostic &Err,
LLVMContext &Context) {
std::string ErrorStr;
@ -31,13 +50,7 @@ Module *llvm::ParseAssemblyFile(const std::string &Filename, SMDiagnostic &Err,
return 0;
}
SourceMgr SM;
SM.AddNewSourceBuffer(F, SMLoc());
OwningPtr<Module> M(new Module(Filename, Context));
if (LLParser(F, SM, Err, M.get()).Run())
return 0;
return M.take();
return ParseAssembly(F, Filename, 0, Err, Context);
}
Module *llvm::ParseAssemblyString(const char *AsmString, Module *M,
@ -46,16 +59,5 @@ Module *llvm::ParseAssemblyString(const char *AsmString, Module *M,
MemoryBuffer::getMemBuffer(AsmString, AsmString+strlen(AsmString),
"<string>");
SourceMgr SM;
SM.AddNewSourceBuffer(F, SMLoc());
// If we are parsing into an existing module, do it.
if (M)
return LLParser(F, SM, Err, M).Run() ? 0 : M;
// Otherwise create a new module.
OwningPtr<Module> M2(new Module("<string>", Context));
if (LLParser(F, SM, Err, M2.get()).Run())
return 0;
return M2.take();
return ParseAssembly(F, "<string>", M, Err, Context);
}