[llvm-commits] [llvm] r156241 - in /llvm/trunk: include/llvm/Config/config.h.cmake include/llvm/MC/MCAsmInfo.h lib/MC/MCAsmInfo.cpp lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp

[Benjamin Kramer]

On 05.05.2012, at 19:45, Jim Grosbach wrote:

> Author: grosbach
> Date: Sat May  5 12:45:12 2012
> New Revision: 156241
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=156241&view=rev
> Log:
> Nuke a few dead remnants of the CBE.
> 
> Modified:
>    llvm/trunk/include/llvm/Config/config.h.cmake
>    llvm/trunk/include/llvm/MC/MCAsmInfo.h
>    llvm/trunk/lib/MC/MCAsmInfo.cpp
>    llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp
>    llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp
> 
> Modified: llvm/trunk/include/llvm/Config/config.h.cmake
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/config.h.cmake?rev=156241&r1=156240&r2=156241&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/Config/config.h.cmake (original)
> +++ llvm/trunk/include/llvm/Config/config.h.cmake Sat May  5 12:45:12 2012
> @@ -14,9 +14,6 @@
> /* Directories clang will search for headers */
> #define C_INCLUDE_DIRS "${C_INCLUDE_DIRS}"
> 
> -/* Define if CBE is enabled for printf %a output */
> -#cmakedefine ENABLE_CBE_PRINTF_A ${ENABLE_CBE_PRINTF_A}
> -

There should be corresponding code that sets ENABLE_CBE_PRINTF_A in a CMakeLists.txt somewhere, that code should be nuked too.

- Ben

> /* Define if position independent code is enabled */
> #cmakedefine ENABLE_PIC
> 
> 
> Modified: llvm/trunk/include/llvm/MC/MCAsmInfo.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCAsmInfo.h?rev=156241&r1=156240&r2=156241&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/MC/MCAsmInfo.h (original)
> +++ llvm/trunk/include/llvm/MC/MCAsmInfo.h Sat May  5 12:45:12 2012
> @@ -338,10 +338,6 @@
>     /// instead of symbolic register names in .cfi_* directives.
>     bool DwarfRegNumForCFI;  // Defaults to false;
> 
> -    //===--- CBE Asm Translation Table -----------------------------------===//
> -
> -    const char *const *AsmTransCBE;          // Defaults to empty
> -
>     //===--- Prologue State ----------------------------------------------===//
> 
>     std::vector<MachineMove> InitialFrameState;
> @@ -577,9 +573,6 @@
>     bool useDwarfRegNumForCFI() const {
>       return DwarfRegNumForCFI;
>     }
> -    const char *const *getAsmCBE() const {
> -      return AsmTransCBE;
> -    }
> 
>     void addInitialFrameState(MCSymbol *label, const MachineLocation &D,
>                               const MachineLocation &S) {
> 
> Modified: llvm/trunk/lib/MC/MCAsmInfo.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAsmInfo.cpp?rev=156241&r1=156240&r2=156241&view=diff
> ==============================================================================
> --- llvm/trunk/lib/MC/MCAsmInfo.cpp (original)
> +++ llvm/trunk/lib/MC/MCAsmInfo.cpp Sat May  5 12:45:12 2012
> @@ -95,8 +95,6 @@
>   DwarfUsesRelocationsForStringPool = true;
>   DwarfRegNumForCFI = false;
>   HasMicrosoftFastStdCallMangling = false;
> -
> -  AsmTransCBE = 0;
> }
> 
> MCAsmInfo::~MCAsmInfo() {
> 
> Modified: llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp?rev=156241&r1=156240&r2=156241&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp (original)
> +++ llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp Sat May  5 12:45:12 2012
> @@ -22,36 +22,9 @@
>   cl::init(false));
> 
> 
> -static const char *const arm_asm_table[] = {
> -  "{r0}", "r0",
> -  "{r1}", "r1",
> -  "{r2}", "r2",
> -  "{r3}", "r3",
> -  "{r4}", "r4",
> -  "{r5}", "r5",
> -  "{r6}", "r6",
> -  "{r7}", "r7",
> -  "{r8}", "r8",
> -  "{r9}", "r9",
> -  "{r10}", "r10",
> -  "{r11}", "r11",
> -  "{r12}", "r12",
> -  "{r13}", "r13",
> -  "{r14}", "r14",
> -  "{lr}", "lr",
> -  "{sp}", "sp",
> -  "{ip}", "ip",
> -  "{fp}", "fp",
> -  "{sl}", "sl",
> -  "{memory}", "memory",
> -  "{cc}", "cc",
> -  0,0
> -};
> -
> void ARMMCAsmInfoDarwin::anchor() { }
> 
> ARMMCAsmInfoDarwin::ARMMCAsmInfoDarwin() {
> -  AsmTransCBE = arm_asm_table;
>   Data64bitsDirective = 0;
>   CommentString = "@";
>   Code16Directive = ".code\t16";
> 
> Modified: llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp?rev=156241&r1=156240&r2=156241&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp (original)
> +++ llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp Sat May  5 12:45:12 2012
> @@ -35,19 +35,6 @@
>              clEnumValEnd));
> 
> 
> -static const char *const x86_asm_table[] = {
> -  "{si}", "S",
> -  "{di}", "D",
> -  "{ax}", "a",
> -  "{cx}", "c",
> -  "{memory}", "memory",
> -  "{flags}", "",
> -  "{dirflag}", "",
> -  "{fpsr}", "",
> -  "{fpcr}", "",
> -  "{cc}", "cc",
> -  0,0};
> -
> void X86MCAsmInfoDarwin::anchor() { }
> 
> X86MCAsmInfoDarwin::X86MCAsmInfoDarwin(const Triple &T) {
> @@ -55,7 +42,6 @@
>   if (is64Bit)
>     PointerSize = 8;
> 
> -  AsmTransCBE = x86_asm_table;
>   AssemblerDialect = AsmWriterFlavor;
> 
>   TextAlignFillValue = 0x90;
> @@ -88,7 +74,6 @@
>   if (T.getArch() == Triple::x86_64)
>     PointerSize = 8;
> 
> -  AsmTransCBE = x86_asm_table;
>   AssemblerDialect = AsmWriterFlavor;
> 
>   TextAlignFillValue = 0x90;
> @@ -137,7 +122,6 @@
>     PrivateGlobalPrefix = ".L";
>   }
> 
> -  AsmTransCBE = x86_asm_table;
>   AssemblerDialect = AsmWriterFlavor;
> 
>   TextAlignFillValue = 0x90;
> @@ -151,7 +135,6 @@
>     PrivateGlobalPrefix = ".L";
>   }
> 
> -  AsmTransCBE = x86_asm_table;
>   AssemblerDialect = AsmWriterFlavor;
> 
>   TextAlignFillValue = 0x90;
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits