6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 20:32:21 +00:00
Code Issues Projects Releases Wiki Activity

edis: Sink EDMain.cpp into lib/MC/MCDisassembler.

Browse Source 
- This fixes some layering violations and matches how we handle the llvm-c lib,
   for example.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@145338 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2011-11-29 00:25:57 +00:00
parent 36e1ac7fff
commit 5a939956b8
5 changed files with 4 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/edis/EDMain.cpp → lib/MC/MCDisassembler/EDMain.cpp
View File

@ -11,12 +11,10 @@
//
//===----------------------------------------------------------------------===//
// FIXME: This code isn't layered right, the headers should be moved to
// include llvm/MC/MCDisassembler or something.
#include "../../lib/MC/MCDisassembler/EDDisassembler.h"
#include "../../lib/MC/MCDisassembler/EDInst.h"
#include "../../lib/MC/MCDisassembler/EDOperand.h"
#include "../../lib/MC/MCDisassembler/EDToken.h"
#include "EDDisassembler.h"
#include "EDInst.h"
#include "EDOperand.h"
#include "EDToken.h"
#include "llvm-c/EnhancedDisassembly.h"
using namespace llvm;

1
tools/CMakeLists.txt
View File

@ -50,7 +50,6 @@ add_subdirectory(bugpoint)
add_subdirectory(bugpoint-passes)
add_subdirectory(llvm-bcanalyzer)
add_subdirectory(llvm-stub)
add_subdirectory(edis)
if( NOT WIN32 )
add_subdirectory(lto)

8
tools/Makefile
View File

@ -56,14 +56,6 @@ ifeq ($(ENABLE_PIC),1)
endif
PARALLEL_DIRS += bugpoint-passes
# The edis library is only supported if ARM and/or X86 are enabled, and if
# LLVM is being built PIC on platforms that support dylibs.
ifneq ($(DISABLE_EDIS),1)
ifneq ($(filter $(TARGETS_TO_BUILD), X86 ARM),)
PARALLEL_DIRS += edis
endif
endif
endif
ifdef LLVM_HAS_POLLY

21
tools/edis/CMakeLists.txt
View File

@ -1,21 +0,0 @@
include_directories(${CMAKE_CURRENT_BINARY_DIR})
set(SOURCES
../../include/llvm-c/EnhancedDisassembly.h
EDMain.cpp
)
set(EDIS_DEPENDS LLVMMCDisassembler LLVMMCParser)
if( LLVM_TARGETS_TO_BUILD MATCHES X86 )
list(APPEND EDIS_DEPENDS LLVMX86AsmPrinter LLVMX86AsmParser LLVMX86Disassembler LLVMX86Desc)
endif()
if( LLVM_TARGETS_TO_BUILD MATCHES ARM )
list(APPEND EDIS_DEPENDS LLVMARMAsmPrinter LLVMARMAsmParser LLVMARMDisassembler LLVMARMDesc)
endif()
add_llvm_library(EnhancedDisassembly ${SOURCES})
set_property(TARGET EnhancedDisassembly PROPERTY
OUTPUT_NAME "EnhancedDisassembly")
add_llvm_library_dependencies(EnhancedDisassembly
${EDIS_DEPENDS})

30
tools/edis/Makefile
View File

@ -1,30 +0,0 @@
##===- tools/edis/Makefile -----------------------------------*- Makefile -*-===##
#
# The LLVM Compiler Infrastructure
#
# This file is distributed under the University of Illinois Open Source
# License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
LEVEL := ../..
LIBRARYNAME := EnhancedDisassembly
# Include this here so we can get the configuration of the targets
# that have been configured for construction. We have to do this
# early so we can set up LINK_COMPONENTS before including Makefile.rules
include $(LEVEL)/Makefile.config
LINK_COMPONENTS := mcdisassembler
# If the X86 target is enabled, link in the asmprinter and disassembler.
ifneq ($(filter $(TARGETS_TO_BUILD), X86),)
LINK_COMPONENTS += x86asmprinter x86disassembler
endif
# If the ARM target is enabled, link in the asmprinter and disassembler.
ifneq ($(filter $(TARGETS_TO_BUILD), ARM),)
LINK_COMPONENTS += armasmprinter armdisassembler
endif
include $(LEVEL)/Makefile.common