Revert earlier unnecessary hack. Make sure we correctly force on 64bit and cmov...

[oota-llvm.git] / lib / Target / TargetAsmInfo.cpp

diff --git a/lib/Target/TargetAsmInfo.cpp b/lib/Target/TargetAsmInfo.cpp
index 253d72c359ce631a20ace826afcd2a30f78fc7d9..1d57d8498e6625f7de4d0864d110b3a6fba1cfbb 100644 (file)
--- a/lib/Target/TargetAsmInfo.cpp
+++ b/lib/Target/TargetAsmInfo.cpp
@@ -1,4 +1,4 @@
-//===-- TargetAsmInfo.cpp - Asm Info ---------------------------------------==//
+//===-- llvm/Target/TargetAsmInfo.cpp - Target Assembly Info --------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -6,107 +6,29 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
-//
-// This file defines target asm properties related what form asm statements
-// should take.
-//
-//===----------------------------------------------------------------------===//
 
 #include "llvm/Target/TargetAsmInfo.h"
-#include <cctype>
-#include <cstring>
+#include "llvm/Target/TargetData.h"
+#include "llvm/Target/TargetLowering.h"
+#include "llvm/Target/TargetLoweringObjectFile.h"
+#include "llvm/Target/TargetMachine.h"
+#include "llvm/Target/TargetRegisterInfo.h"
 using namespace llvm;
 
-TargetAsmInfo::TargetAsmInfo() {
-  ZeroFillDirective = 0;
-  NonexecutableStackDirective = 0;
-  NeedsSet = false;
-  MaxInstLength = 4;
-  PCSymbol = "$";
-  SeparatorChar = ';';
-  CommentColumn = 60;
-  CommentString = "#";
-  GlobalPrefix = "";
-  PrivateGlobalPrefix = ".";
-  LinkerPrivateGlobalPrefix = "";
-  JumpTableSpecialLabelPrefix = 0;
-  GlobalVarAddrPrefix = "";
-  GlobalVarAddrSuffix = "";
-  FunctionAddrPrefix = "";
-  FunctionAddrSuffix = "";
-  PersonalityPrefix = "";
-  PersonalitySuffix = "";
-  NeedsIndirectEncoding = false;
-  InlineAsmStart = "APP";
-  InlineAsmEnd = "NO_APP";
-  AssemblerDialect = 0;
-  AllowQuotesInName = false;
-  ZeroDirective = "\t.zero\t";
-  ZeroDirectiveSuffix = 0;
-  AsciiDirective = "\t.ascii\t";
-  AscizDirective = "\t.asciz\t";
-  Data8bitsDirective = "\t.byte\t";
-  Data16bitsDirective = "\t.short\t";
-  Data32bitsDirective = "\t.long\t";
-  Data64bitsDirective = "\t.quad\t";
-  SunStyleELFSectionSwitchSyntax = false;
-  AlignDirective = "\t.align\t";
-  AlignmentIsInBytes = true;
-  TextAlignFillValue = 0;
-  JumpTableDirective = 0;
-  PICJumpTableDirective = 0;
-  GlobalDirective = "\t.globl\t";
-  SetDirective = 0;
-  LCOMMDirective = 0;
-  COMMDirective = "\t.comm\t";
-  COMMDirectiveTakesAlignment = true;
-  HasDotTypeDotSizeDirective = true;
-  HasSingleParameterDotFile = true;
-  UsedDirective = 0;
-  WeakRefDirective = 0;
-  WeakDefDirective = 0;
-  // FIXME: These are ELFish - move to ELFTAI.
-  HiddenDirective = "\t.hidden\t";
-  ProtectedDirective = "\t.protected\t";
-  AbsoluteDebugSectionOffsets = false;
-  AbsoluteEHSectionOffsets = false;
-  HasLEB128 = false;
-  HasDotLocAndDotFile = false;
-  SupportsDebugInformation = false;
-  ExceptionsType = ExceptionHandling::None;
-  DwarfRequiresFrameSection = true;
-  DwarfUsesInlineInfoSection = false;
-  Is_EHSymbolPrivate = true;
-  GlobalEHDirective = 0;
-  SupportsWeakOmittedEHFrame = true;
-  DwarfSectionOffsetDirective = 0;
-
-  AsmTransCBE = 0;
-}
+TargetAsmInfo::TargetAsmInfo(const TargetMachine &TM) {
+  TLOF = &TM.getTargetLowering()->getObjFileLowering();
+  const TargetData &TD = *TM.getTargetData();
+  IsLittleEndian = TD.isLittleEndian();
+  PointerSize = TD.getPointerSize();
 
-TargetAsmInfo::~TargetAsmInfo() {
+  TFI = TM.getFrameLowering();
+  StackDir = TFI->getStackGrowthDirection();
+  TRI = TM.getRegisterInfo();
+  TFI->getInitialFrameState(InitialFrameState);
 }
 
-
-unsigned TargetAsmInfo::getULEB128Size(unsigned Value) {
-  unsigned Size = 0;
-  do {
-    Value >>= 7;
-    Size += sizeof(int8_t);
-  } while (Value);
-  return Size;
-}
-
-unsigned TargetAsmInfo::getSLEB128Size(int Value) {
-  unsigned Size = 0;
-  int Sign = Value >> (8 * sizeof(Value) - 1);
-  bool IsMore;
-
-  do {
-    unsigned Byte = Value & 0x7f;
-    Value >>= 7;
-    IsMore = Value != Sign || ((Byte ^ Sign) & 0x40) != 0;
-    Size += sizeof(int8_t);
-  } while (IsMore);
-  return Size;
+int TargetAsmInfo::getCompactUnwindEncoding(ArrayRef<MCCFIInstruction> Instrs,
+                                            int DataAlignmentFactor,
+                                            bool IsEH) const {
+  return TFI->getCompactUnwindEncoding(Instrs, DataAlignmentFactor, IsEH);
 }