[llvm-commits] [llvm] r94129 - in /llvm/trunk: include/llvm/MC/ include/llvm/MC/MCParser/ lib/MC/ lib/MC/MCParser/ lib/Target/ARM/AsmParser/ lib/Target/X86/AsmParser/ tools/llvm-mc/
Chris Lattner
sabre at nondot.org
Thu Jan 21 17:44:57 PST 2010
Author: lattner
Date: Thu Jan 21 19:44:57 2010
New Revision: 94129
URL: http://llvm.org/viewvc/llvm-project?rev=94129&view=rev
Log:
create a new MCParser library and move some stuff into it.
Added:
llvm/trunk/include/llvm/MC/MCParser/
llvm/trunk/include/llvm/MC/MCParser/MCAsmLexer.h
- copied unchanged from r94118, llvm/trunk/include/llvm/MC/MCAsmLexer.h
llvm/trunk/include/llvm/MC/MCParser/MCAsmParser.h
- copied unchanged from r94118, llvm/trunk/include/llvm/MC/MCAsmParser.h
llvm/trunk/include/llvm/MC/MCParser/MCParsedAsmOperand.h
- copied unchanged from r94118, llvm/trunk/include/llvm/MC/MCParsedAsmOperand.h
llvm/trunk/lib/MC/MCParser/
llvm/trunk/lib/MC/MCParser/MCAsmLexer.cpp
- copied, changed from r94118, llvm/trunk/lib/MC/MCAsmLexer.cpp
llvm/trunk/lib/MC/MCParser/MCAsmParser.cpp
- copied, changed from r94118, llvm/trunk/lib/MC/MCAsmParser.cpp
llvm/trunk/lib/MC/MCParser/TargetAsmParser.cpp
- copied unchanged from r94118, llvm/trunk/lib/MC/TargetAsmParser.cpp
Removed:
llvm/trunk/include/llvm/MC/MCAsmLexer.h
llvm/trunk/include/llvm/MC/MCAsmParser.h
llvm/trunk/include/llvm/MC/MCParsedAsmOperand.h
llvm/trunk/lib/MC/MCAsmLexer.cpp
llvm/trunk/lib/MC/MCAsmParser.cpp
llvm/trunk/lib/MC/TargetAsmParser.cpp
Modified:
llvm/trunk/lib/MC/CMakeLists.txt
llvm/trunk/lib/MC/Makefile
llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp
llvm/trunk/tools/llvm-mc/AsmLexer.h
llvm/trunk/tools/llvm-mc/AsmParser.cpp
llvm/trunk/tools/llvm-mc/AsmParser.h
llvm/trunk/tools/llvm-mc/CMakeLists.txt
llvm/trunk/tools/llvm-mc/Makefile
llvm/trunk/tools/llvm-mc/llvm-mc.cpp
Removed: llvm/trunk/include/llvm/MC/MCAsmLexer.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCAsmLexer.h?rev=94128&view=auto
==============================================================================
--- llvm/trunk/include/llvm/MC/MCAsmLexer.h (original)
+++ llvm/trunk/include/llvm/MC/MCAsmLexer.h (removed)
@@ -1,161 +0,0 @@
-//===-- llvm/MC/MCAsmLexer.h - Abstract Asm Lexer Interface -----*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_MC_MCASMLEXER_H
-#define LLVM_MC_MCASMLEXER_H
-
-#include "llvm/ADT/StringRef.h"
-#include "llvm/System/DataTypes.h"
-#include "llvm/Support/SMLoc.h"
-
-namespace llvm {
-class MCAsmLexer;
-class MCInst;
-class Target;
-
-/// AsmToken - Target independent representation for an assembler token.
-class AsmToken {
-public:
- enum TokenKind {
- // Markers
- Eof, Error,
-
- // String values.
- Identifier,
- String,
-
- // Integer values.
- Integer,
-
- // No-value.
- EndOfStatement,
- Colon,
- Plus, Minus, Tilde,
- Slash, // '/'
- LParen, RParen, LBrac, RBrac, LCurly, RCurly,
- Star, Comma, Dollar, Equal, EqualEqual,
-
- Pipe, PipePipe, Caret,
- Amp, AmpAmp, Exclaim, ExclaimEqual, Percent, Hash,
- Less, LessEqual, LessLess, LessGreater,
- Greater, GreaterEqual, GreaterGreater
- };
-
- TokenKind Kind;
-
- /// A reference to the entire token contents; this is always a pointer into
- /// a memory buffer owned by the source manager.
- StringRef Str;
-
- int64_t IntVal;
-
-public:
- AsmToken() {}
- AsmToken(TokenKind _Kind, StringRef _Str, int64_t _IntVal = 0)
- : Kind(_Kind), Str(_Str), IntVal(_IntVal) {}
-
- TokenKind getKind() const { return Kind; }
- bool is(TokenKind K) const { return Kind == K; }
- bool isNot(TokenKind K) const { return Kind != K; }
-
- SMLoc getLoc() const;
-
- /// getStringContents - Get the contents of a string token (without quotes).
- StringRef getStringContents() const {
- assert(Kind == String && "This token isn't a string!");
- return Str.slice(1, Str.size() - 1);
- }
-
- /// getIdentifier - Get the identifier string for the current token, which
- /// should be an identifier or a string. This gets the portion of the string
- /// which should be used as the identifier, e.g., it does not include the
- /// quotes on strings.
- StringRef getIdentifier() const {
- if (Kind == Identifier)
- return getString();
- return getStringContents();
- }
-
- /// getString - Get the string for the current token, this includes all
- /// characters (for example, the quotes on strings) in the token.
- ///
- /// The returned StringRef points into the source manager's memory buffer, and
- /// is safe to store across calls to Lex().
- StringRef getString() const { return Str; }
-
- // FIXME: Don't compute this in advance, it makes every token larger, and is
- // also not generally what we want (it is nicer for recovery etc. to lex 123br
- // as a single token, then diagnose as an invalid number).
- int64_t getIntVal() const {
- assert(Kind == Integer && "This token isn't an integer!");
- return IntVal;
- }
-};
-
-/// MCAsmLexer - Generic assembler lexer interface, for use by target specific
-/// assembly lexers.
-class MCAsmLexer {
- /// The current token, stored in the base class for faster access.
- AsmToken CurTok;
-
- /// The location and description of the current error
- SMLoc ErrLoc;
- std::string Err;
-
- MCAsmLexer(const MCAsmLexer &); // DO NOT IMPLEMENT
- void operator=(const MCAsmLexer &); // DO NOT IMPLEMENT
-protected: // Can only create subclasses.
- MCAsmLexer();
-
- virtual AsmToken LexToken() = 0;
-
- void SetError(const SMLoc &errLoc, const std::string &err) {
- ErrLoc = errLoc;
- Err = err;
- }
-
-public:
- virtual ~MCAsmLexer();
-
- /// Lex - Consume the next token from the input stream and return it.
- ///
- /// The lexer will continuosly return the end-of-file token once the end of
- /// the main input file has been reached.
- const AsmToken &Lex() {
- return CurTok = LexToken();
- }
-
- /// getTok - Get the current (last) lexed token.
- const AsmToken &getTok() {
- return CurTok;
- }
-
- /// getErrLoc - Get the current error location
- const SMLoc &getErrLoc() {
- return ErrLoc;
- }
-
- /// getErr - Get the current error string
- const std::string &getErr() {
- return Err;
- }
-
- /// getKind - Get the kind of current token.
- AsmToken::TokenKind getKind() const { return CurTok.getKind(); }
-
- /// is - Check if the current token has kind \arg K.
- bool is(AsmToken::TokenKind K) const { return CurTok.is(K); }
-
- /// isNot - Check if the current token has kind \arg K.
- bool isNot(AsmToken::TokenKind K) const { return CurTok.isNot(K); }
-};
-
-} // End llvm namespace
-
-#endif
Removed: llvm/trunk/include/llvm/MC/MCAsmParser.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCAsmParser.h?rev=94128&view=auto
==============================================================================
--- llvm/trunk/include/llvm/MC/MCAsmParser.h (original)
+++ llvm/trunk/include/llvm/MC/MCAsmParser.h (removed)
@@ -1,88 +0,0 @@
-//===-- llvm/MC/MCAsmParser.h - Abstract Asm Parser Interface ---*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_MC_MCASMPARSER_H
-#define LLVM_MC_MCASMPARSER_H
-
-#include "llvm/System/DataTypes.h"
-
-namespace llvm {
-class AsmToken;
-class MCAsmLexer;
-class MCContext;
-class MCExpr;
-class MCStreamer;
-class MCValue;
-class SMLoc;
-class Twine;
-
-/// MCAsmParser - Generic assembler parser interface, for use by target specific
-/// assembly parsers.
-class MCAsmParser {
- MCAsmParser(const MCAsmParser &); // DO NOT IMPLEMENT
- void operator=(const MCAsmParser &); // DO NOT IMPLEMENT
-protected: // Can only create subclasses.
- MCAsmParser();
-
-public:
- virtual ~MCAsmParser();
-
- virtual MCAsmLexer &getLexer() = 0;
-
- virtual MCContext &getContext() = 0;
-
- /// getSteamer - Return the output streamer for the assembler.
- virtual MCStreamer &getStreamer() = 0;
-
- /// Warning - Emit a warning at the location \arg L, with the message \arg
- /// Msg.
- virtual void Warning(SMLoc L, const Twine &Msg) = 0;
-
- /// Warning - Emit an error at the location \arg L, with the message \arg
- /// Msg.
- ///
- /// \return The return value is always true, as an idiomatic convenience to
- /// clients.
- virtual bool Error(SMLoc L, const Twine &Msg) = 0;
-
- /// Lex - Get the next AsmToken in the stream, possibly handling file
- /// inclusion first.
- virtual const AsmToken &Lex() = 0;
-
- /// getTok - Get the current AsmToken from the stream.
- const AsmToken &getTok();
-
- /// ParseExpression - Parse an arbitrary expression.
- ///
- /// @param Res - The value of the expression. The result is undefined
- /// on error.
- /// @result - False on success.
- virtual bool ParseExpression(const MCExpr *&Res, SMLoc &EndLoc) = 0;
- bool ParseExpression(const MCExpr *&Res);
-
- /// ParseParenExpression - Parse an arbitrary expression, assuming that an
- /// initial '(' has already been consumed.
- ///
- /// @param Res - The value of the expression. The result is undefined
- /// on error.
- /// @result - False on success.
- virtual bool ParseParenExpression(const MCExpr *&Res, SMLoc &EndLoc) = 0;
-
- /// ParseAbsoluteExpression - Parse an expression which must evaluate to an
- /// absolute value.
- ///
- /// @param Res - The value of the absolute expression. The result is undefined
- /// on error.
- /// @result - False on success.
- virtual bool ParseAbsoluteExpression(int64_t &Res) = 0;
-};
-
-} // End llvm namespace
-
-#endif
Removed: llvm/trunk/include/llvm/MC/MCParsedAsmOperand.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCParsedAsmOperand.h?rev=94128&view=auto
==============================================================================
--- llvm/trunk/include/llvm/MC/MCParsedAsmOperand.h (original)
+++ llvm/trunk/include/llvm/MC/MCParsedAsmOperand.h (removed)
@@ -1,33 +0,0 @@
-//===-- llvm/MC/MCParsedAsmOperand.h - Asm Parser Operand -------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_MC_MCASMOPERAND_H
-#define LLVM_MC_MCASMOPERAND_H
-
-namespace llvm {
-class SMLoc;
-
-/// MCParsedAsmOperand - This abstract class represents a source-level assembly
-/// instruction operand. It should be subclassed by target-specific code. This
-/// base class is used by target-independent clients and is the interface
-/// between parsing an asm instruction and recognizing it.
-class MCParsedAsmOperand {
-public:
- MCParsedAsmOperand() {}
- virtual ~MCParsedAsmOperand() {}
-
- /// getStartLoc - Get the location of the first token of this operand.
- virtual SMLoc getStartLoc() const;
- /// getEndLoc - Get the location of the last token of this operand.
- virtual SMLoc getEndLoc() const;
-};
-
-} // end namespace llvm.
-
-#endif
Modified: llvm/trunk/lib/MC/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/CMakeLists.txt?rev=94129&r1=94128&r2=94129&view=diff
==============================================================================
--- llvm/trunk/lib/MC/CMakeLists.txt (original)
+++ llvm/trunk/lib/MC/CMakeLists.txt Thu Jan 21 19:44:57 2010
@@ -2,8 +2,6 @@
MCAsmInfo.cpp
MCAsmInfoCOFF.cpp
MCAsmInfoDarwin.cpp
- MCAsmLexer.cpp
- MCAsmParser.cpp
MCAsmStreamer.cpp
MCAssembler.cpp
MCCodeEmitter.cpp
@@ -20,5 +18,4 @@
MCStreamer.cpp
MCSymbol.cpp
MCValue.cpp
- TargetAsmParser.cpp
)
Removed: llvm/trunk/lib/MC/MCAsmLexer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAsmLexer.cpp?rev=94128&view=auto
==============================================================================
--- llvm/trunk/lib/MC/MCAsmLexer.cpp (original)
+++ llvm/trunk/lib/MC/MCAsmLexer.cpp (removed)
@@ -1,23 +0,0 @@
-//===-- MCAsmLexer.cpp - Abstract Asm Lexer Interface ---------------------===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/MC/MCAsmLexer.h"
-#include "llvm/Support/SourceMgr.h"
-
-using namespace llvm;
-
-MCAsmLexer::MCAsmLexer() : CurTok(AsmToken::Error, StringRef()) {
-}
-
-MCAsmLexer::~MCAsmLexer() {
-}
-
-SMLoc AsmToken::getLoc() const {
- return SMLoc::getFromPointer(Str.data());
-}
Removed: llvm/trunk/lib/MC/MCAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAsmParser.cpp?rev=94128&view=auto
==============================================================================
--- llvm/trunk/lib/MC/MCAsmParser.cpp (original)
+++ llvm/trunk/lib/MC/MCAsmParser.cpp (removed)
@@ -1,35 +0,0 @@
-//===-- MCAsmParser.cpp - Abstract Asm Parser Interface -------------------===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/MC/MCAsmParser.h"
-#include "llvm/MC/MCAsmLexer.h"
-#include "llvm/MC/MCParsedAsmOperand.h"
-#include "llvm/Support/SourceMgr.h"
-using namespace llvm;
-
-MCAsmParser::MCAsmParser() {
-}
-
-MCAsmParser::~MCAsmParser() {
-}
-
-const AsmToken &MCAsmParser::getTok() {
- return getLexer().getTok();
-}
-
-bool MCAsmParser::ParseExpression(const MCExpr *&Res) {
- SMLoc L;
- return ParseExpression(Res, L);
-}
-
-/// getStartLoc - Get the location of the first token of this operand.
-SMLoc MCParsedAsmOperand::getStartLoc() const { return SMLoc(); }
-SMLoc MCParsedAsmOperand::getEndLoc() const { return SMLoc(); }
-
-
Copied: llvm/trunk/lib/MC/MCParser/MCAsmLexer.cpp (from r94118, llvm/trunk/lib/MC/MCAsmLexer.cpp)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/MCAsmLexer.cpp?p2=llvm/trunk/lib/MC/MCParser/MCAsmLexer.cpp&p1=llvm/trunk/lib/MC/MCAsmLexer.cpp&r1=94118&r2=94129&rev=94129&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCAsmLexer.cpp (original)
+++ llvm/trunk/lib/MC/MCParser/MCAsmLexer.cpp Thu Jan 21 19:44:57 2010
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/MC/MCAsmLexer.h"
+#include "llvm/MC/MCParser/MCAsmLexer.h"
#include "llvm/Support/SourceMgr.h"
using namespace llvm;
Copied: llvm/trunk/lib/MC/MCParser/MCAsmParser.cpp (from r94118, llvm/trunk/lib/MC/MCAsmParser.cpp)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/MCAsmParser.cpp?p2=llvm/trunk/lib/MC/MCParser/MCAsmParser.cpp&p1=llvm/trunk/lib/MC/MCAsmParser.cpp&r1=94118&r2=94129&rev=94129&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCAsmParser.cpp (original)
+++ llvm/trunk/lib/MC/MCParser/MCAsmParser.cpp Thu Jan 21 19:44:57 2010
@@ -7,9 +7,9 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/MC/MCAsmParser.h"
-#include "llvm/MC/MCAsmLexer.h"
-#include "llvm/MC/MCParsedAsmOperand.h"
+#include "llvm/MC/MCParser/MCAsmParser.h"
+#include "llvm/MC/MCParser/MCAsmLexer.h"
+#include "llvm/MC/MCParser/MCParsedAsmOperand.h"
#include "llvm/Support/SourceMgr.h"
using namespace llvm;
Modified: llvm/trunk/lib/MC/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/Makefile?rev=94129&r1=94128&r2=94129&view=diff
==============================================================================
--- llvm/trunk/lib/MC/Makefile (original)
+++ llvm/trunk/lib/MC/Makefile Thu Jan 21 19:44:57 2010
@@ -10,6 +10,7 @@
LEVEL = ../..
LIBRARYNAME = LLVMMC
BUILD_ARCHIVE := 1
+PARALLEL_DIRS := MCParser
include $(LEVEL)/Makefile.common
Removed: llvm/trunk/lib/MC/TargetAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/TargetAsmParser.cpp?rev=94128&view=auto
==============================================================================
--- llvm/trunk/lib/MC/TargetAsmParser.cpp (original)
+++ llvm/trunk/lib/MC/TargetAsmParser.cpp (removed)
@@ -1,19 +0,0 @@
-//===-- TargetAsmParser.cpp - Target Assembly Parser -----------------------==//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Target/TargetAsmParser.h"
-using namespace llvm;
-
-TargetAsmParser::TargetAsmParser(const Target &T)
- : TheTarget(T)
-{
-}
-
-TargetAsmParser::~TargetAsmParser() {
-}
Modified: llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp?rev=94129&r1=94128&r2=94129&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp (original)
+++ llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Thu Jan 21 19:44:57 2010
@@ -8,18 +8,18 @@
//===----------------------------------------------------------------------===//
#include "ARM.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/Twine.h"
-#include "llvm/MC/MCAsmLexer.h"
-#include "llvm/MC/MCAsmParser.h"
-#include "llvm/MC/MCParsedAsmOperand.h"
+#include "llvm/MC/MCParser/MCAsmLexer.h"
+#include "llvm/MC/MCParser/MCAsmParser.h"
+#include "llvm/MC/MCParser/MCParsedAsmOperand.h"
#include "llvm/MC/MCStreamer.h"
#include "llvm/MC/MCExpr.h"
#include "llvm/MC/MCInst.h"
-#include "llvm/Support/Compiler.h"
-#include "llvm/Support/SourceMgr.h"
#include "llvm/Target/TargetRegistry.h"
#include "llvm/Target/TargetAsmParser.h"
+#include "llvm/Support/Compiler.h"
+#include "llvm/Support/SourceMgr.h"
+#include "llvm/ADT/SmallVector.h"
+#include "llvm/ADT/Twine.h"
using namespace llvm;
namespace {
Modified: llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp?rev=94129&r1=94128&r2=94129&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp Thu Jan 21 19:44:57 2010
@@ -11,12 +11,12 @@
#include "X86.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/Twine.h"
-#include "llvm/MC/MCAsmLexer.h"
-#include "llvm/MC/MCAsmParser.h"
#include "llvm/MC/MCStreamer.h"
#include "llvm/MC/MCExpr.h"
#include "llvm/MC/MCInst.h"
-#include "llvm/MC/MCParsedAsmOperand.h"
+#include "llvm/MC/MCParser/MCAsmLexer.h"
+#include "llvm/MC/MCParser/MCAsmParser.h"
+#include "llvm/MC/MCParser/MCParsedAsmOperand.h"
#include "llvm/Support/SourceMgr.h"
#include "llvm/Target/TargetRegistry.h"
#include "llvm/Target/TargetAsmParser.h"
Modified: llvm/trunk/tools/llvm-mc/AsmLexer.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/AsmLexer.h?rev=94129&r1=94128&r2=94129&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/AsmLexer.h (original)
+++ llvm/trunk/tools/llvm-mc/AsmLexer.h Thu Jan 21 19:44:57 2010
@@ -15,7 +15,7 @@
#define ASMLEXER_H
#include "llvm/ADT/StringRef.h"
-#include "llvm/MC/MCAsmLexer.h"
+#include "llvm/MC/MCParser/MCAsmLexer.h"
#include "llvm/MC/MCAsmInfo.h"
#include "llvm/System/DataTypes.h"
#include <string>
Modified: llvm/trunk/tools/llvm-mc/AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/AsmParser.cpp?rev=94129&r1=94128&r2=94129&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/AsmParser.cpp (original)
+++ llvm/trunk/tools/llvm-mc/AsmParser.cpp Thu Jan 21 19:44:57 2010
@@ -18,11 +18,11 @@
#include "llvm/MC/MCContext.h"
#include "llvm/MC/MCExpr.h"
#include "llvm/MC/MCInst.h"
-#include "llvm/MC/MCParsedAsmOperand.h"
#include "llvm/MC/MCSectionMachO.h"
#include "llvm/MC/MCStreamer.h"
#include "llvm/MC/MCSymbol.h"
#include "llvm/MC/MCValue.h"
+#include "llvm/MC/MCParser/MCParsedAsmOperand.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/SourceMgr.h"
#include "llvm/Support/raw_ostream.h"
Modified: llvm/trunk/tools/llvm-mc/AsmParser.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/AsmParser.h?rev=94129&r1=94128&r2=94129&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/AsmParser.h (original)
+++ llvm/trunk/tools/llvm-mc/AsmParser.h Thu Jan 21 19:44:57 2010
@@ -17,7 +17,7 @@
#include <vector>
#include "AsmLexer.h"
#include "AsmCond.h"
-#include "llvm/MC/MCAsmParser.h"
+#include "llvm/MC/MCParser/MCAsmParser.h"
#include "llvm/MC/MCSectionMachO.h"
#include "llvm/MC/MCStreamer.h"
#include "llvm/MC/MCAsmInfo.h"
Modified: llvm/trunk/tools/llvm-mc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/CMakeLists.txt?rev=94129&r1=94128&r2=94129&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-mc/CMakeLists.txt Thu Jan 21 19:44:57 2010
@@ -1,4 +1,4 @@
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} support MC)
+set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} support MC MCParser)
add_llvm_tool(llvm-mc
llvm-mc.cpp
Modified: llvm/trunk/tools/llvm-mc/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/Makefile?rev=94129&r1=94128&r2=94129&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/Makefile (original)
+++ llvm/trunk/tools/llvm-mc/Makefile Thu Jan 21 19:44:57 2010
@@ -19,6 +19,6 @@
# early so we can set up LINK_COMPONENTS before including Makefile.rules
include $(LEVEL)/Makefile.config
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) MC support
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) MCParser MC support
include $(LLVM_SRC_ROOT)/Makefile.rules
Modified: llvm/trunk/tools/llvm-mc/llvm-mc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/llvm-mc.cpp?rev=94129&r1=94128&r2=94129&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/llvm-mc.cpp (original)
+++ llvm/trunk/tools/llvm-mc/llvm-mc.cpp Thu Jan 21 19:44:57 2010
@@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/MC/MCAsmLexer.h"
+#include "llvm/MC/MCParser/MCAsmLexer.h"
#include "llvm/MC/MCContext.h"
#include "llvm/MC/MCCodeEmitter.h"
#include "llvm/MC/MCInstPrinter.h"
More information about the llvm-commits
mailing list