From c6ef277a0b8f43af22d86aea9d5053749cacfbbb Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 22 Jan 2010 01:44:57 +0000 Subject: [PATCH] create a new MCParser library and move some stuff into it. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@94129 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/MC/{ => MCParser}/MCAsmLexer.h | 0 include/llvm/MC/{ => MCParser}/MCAsmParser.h | 0 .../llvm/MC/{ => MCParser}/MCParsedAsmOperand.h | 0 lib/MC/CMakeLists.txt | 3 --- lib/MC/{ => MCParser}/MCAsmLexer.cpp | 2 +- lib/MC/{ => MCParser}/MCAsmParser.cpp | 6 +++--- lib/MC/{ => MCParser}/TargetAsmParser.cpp | 0 lib/MC/Makefile | 1 + lib/Target/ARM/AsmParser/ARMAsmParser.cpp | 14 +++++++------- lib/Target/X86/AsmParser/X86AsmParser.cpp | 6 +++--- tools/llvm-mc/AsmLexer.h | 2 +- tools/llvm-mc/AsmParser.cpp | 2 +- tools/llvm-mc/AsmParser.h | 2 +- tools/llvm-mc/CMakeLists.txt | 2 +- tools/llvm-mc/Makefile | 2 +- tools/llvm-mc/llvm-mc.cpp | 2 +- 16 files changed, 21 insertions(+), 23 deletions(-) rename include/llvm/MC/{ => MCParser}/MCAsmLexer.h (100%) rename include/llvm/MC/{ => MCParser}/MCAsmParser.h (100%) rename include/llvm/MC/{ => MCParser}/MCParsedAsmOperand.h (100%) rename lib/MC/{ => MCParser}/MCAsmLexer.cpp (93%) rename lib/MC/{ => MCParser}/MCAsmParser.cpp (86%) rename lib/MC/{ => MCParser}/TargetAsmParser.cpp (100%) diff --git a/include/llvm/MC/MCAsmLexer.h b/include/llvm/MC/MCParser/MCAsmLexer.h similarity index 100% rename from include/llvm/MC/MCAsmLexer.h rename to include/llvm/MC/MCParser/MCAsmLexer.h diff --git a/include/llvm/MC/MCAsmParser.h b/include/llvm/MC/MCParser/MCAsmParser.h similarity index 100% rename from include/llvm/MC/MCAsmParser.h rename to include/llvm/MC/MCParser/MCAsmParser.h diff --git a/include/llvm/MC/MCParsedAsmOperand.h b/include/llvm/MC/MCParser/MCParsedAsmOperand.h similarity index 100% rename from include/llvm/MC/MCParsedAsmOperand.h rename to include/llvm/MC/MCParser/MCParsedAsmOperand.h diff --git a/lib/MC/CMakeLists.txt b/lib/MC/CMakeLists.txt index 8a1a0586374..9ead33b481f 100644 --- a/lib/MC/CMakeLists.txt +++ b/lib/MC/CMakeLists.txt @@ -2,8 +2,6 @@ add_llvm_library(LLVMMC MCAsmInfo.cpp MCAsmInfoCOFF.cpp MCAsmInfoDarwin.cpp - MCAsmLexer.cpp - MCAsmParser.cpp MCAsmStreamer.cpp MCAssembler.cpp MCCodeEmitter.cpp @@ -20,5 +18,4 @@ add_llvm_library(LLVMMC MCStreamer.cpp MCSymbol.cpp MCValue.cpp - TargetAsmParser.cpp ) diff --git a/lib/MC/MCAsmLexer.cpp b/lib/MC/MCParser/MCAsmLexer.cpp similarity index 93% rename from lib/MC/MCAsmLexer.cpp rename to lib/MC/MCParser/MCAsmLexer.cpp index 1e34ed6f790..e5b29550966 100644 --- a/lib/MC/MCAsmLexer.cpp +++ b/lib/MC/MCParser/MCAsmLexer.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "llvm/MC/MCAsmLexer.h" +#include "llvm/MC/MCParser/MCAsmLexer.h" #include "llvm/Support/SourceMgr.h" using namespace llvm; diff --git a/lib/MC/MCAsmParser.cpp b/lib/MC/MCParser/MCAsmParser.cpp similarity index 86% rename from lib/MC/MCAsmParser.cpp rename to lib/MC/MCParser/MCAsmParser.cpp index 299d005323a..b8c20544f58 100644 --- a/lib/MC/MCAsmParser.cpp +++ b/lib/MC/MCParser/MCAsmParser.cpp @@ -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; diff --git a/lib/MC/TargetAsmParser.cpp b/lib/MC/MCParser/TargetAsmParser.cpp similarity index 100% rename from lib/MC/TargetAsmParser.cpp rename to lib/MC/MCParser/TargetAsmParser.cpp diff --git a/lib/MC/Makefile b/lib/MC/Makefile index 314a5b1af2f..a661fa6f408 100644 --- a/lib/MC/Makefile +++ b/lib/MC/Makefile @@ -10,6 +10,7 @@ LEVEL = ../.. LIBRARYNAME = LLVMMC BUILD_ARCHIVE := 1 +PARALLEL_DIRS := MCParser include $(LEVEL)/Makefile.common diff --git a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp index b6dac44cfce..89c77690907 100644 --- a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp +++ b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp @@ -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 { diff --git a/lib/Target/X86/AsmParser/X86AsmParser.cpp b/lib/Target/X86/AsmParser/X86AsmParser.cpp index 8bff9bfd913..6ced1f4f151 100644 --- a/lib/Target/X86/AsmParser/X86AsmParser.cpp +++ b/lib/Target/X86/AsmParser/X86AsmParser.cpp @@ -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" diff --git a/tools/llvm-mc/AsmLexer.h b/tools/llvm-mc/AsmLexer.h index 1d49e4b766d..cf6eefb4083 100644 --- a/tools/llvm-mc/AsmLexer.h +++ b/tools/llvm-mc/AsmLexer.h @@ -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 diff --git a/tools/llvm-mc/AsmParser.cpp b/tools/llvm-mc/AsmParser.cpp index 068e506be26..503addb5e6c 100644 --- a/tools/llvm-mc/AsmParser.cpp +++ b/tools/llvm-mc/AsmParser.cpp @@ -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" diff --git a/tools/llvm-mc/AsmParser.h b/tools/llvm-mc/AsmParser.h index 9336d358063..ef53d79ec8d 100644 --- a/tools/llvm-mc/AsmParser.h +++ b/tools/llvm-mc/AsmParser.h @@ -17,7 +17,7 @@ #include #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" diff --git a/tools/llvm-mc/CMakeLists.txt b/tools/llvm-mc/CMakeLists.txt index 46c5c6bfd64..fbfc2d4e26b 100644 --- a/tools/llvm-mc/CMakeLists.txt +++ b/tools/llvm-mc/CMakeLists.txt @@ -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 diff --git a/tools/llvm-mc/Makefile b/tools/llvm-mc/Makefile index 9bfb773076d..5b0fe3f5446 100644 --- a/tools/llvm-mc/Makefile +++ b/tools/llvm-mc/Makefile @@ -19,6 +19,6 @@ NO_INSTALL = 1 # 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 diff --git a/tools/llvm-mc/llvm-mc.cpp b/tools/llvm-mc/llvm-mc.cpp index fe545ab6e90..9979df91757 100644 --- a/tools/llvm-mc/llvm-mc.cpp +++ b/tools/llvm-mc/llvm-mc.cpp @@ -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" -- 2.34.1