[llvm] r191992 - reverting per request
Jack Carter
jack.carter at imgtec.com
Fri Oct 4 15:52:32 PDT 2013
Author: jacksprat
Date: Fri Oct 4 17:52:31 2013
New Revision: 191992
URL: http://llvm.org/viewvc/llvm-project?rev=191992&view=rev
Log:
reverting per request
Modified:
llvm/trunk/include/llvm/MC/MCTargetAsmParser.h
llvm/trunk/lib/MC/MCParser/AsmParser.cpp
llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.cpp
llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.h
llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp
llvm/trunk/test/MC/Mips/mips_directives.s
Modified: llvm/trunk/include/llvm/MC/MCTargetAsmParser.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCTargetAsmParser.h?rev=191992&r1=191991&r2=191992&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCTargetAsmParser.h (original)
+++ llvm/trunk/include/llvm/MC/MCTargetAsmParser.h Fri Oct 4 17:52:31 2013
@@ -176,11 +176,6 @@ public:
virtual void convertToMapAndConstraints(unsigned Kind,
const SmallVectorImpl<MCParsedAsmOperand*> &Operands) = 0;
- /// End of assembly processing.
- /// This gets called when all assembly has been read and gives the local
- /// Target AsmParsers an opportunity for any final data processing, etc..
- virtual void emitEndOfAsmFile(MCStreamer &Out) {}
-
virtual const MCExpr *applyModifierToExpr(const MCExpr *E,
MCSymbolRefExpr::VariantKind,
MCContext &Ctx) {
Modified: llvm/trunk/lib/MC/MCParser/AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/AsmParser.cpp?rev=191992&r1=191991&r2=191992&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCParser/AsmParser.cpp (original)
+++ llvm/trunk/lib/MC/MCParser/AsmParser.cpp Fri Oct 4 17:52:31 2013
@@ -673,10 +673,8 @@ bool AsmParser::Run(bool NoInitialTextSe
// Finalize the output stream if there are no errors and if the client wants
// us to.
- if (!HadError && !NoFinalize) {
- getTargetParser().emitEndOfAsmFile(Out);
+ if (!HadError && !NoFinalize)
Out.Finish();
- }
return HadError;
}
Modified: llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp?rev=191992&r1=191991&r2=191992&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp (original)
+++ llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp Fri Oct 4 17:52:31 2013
@@ -7,8 +7,6 @@
//
//===----------------------------------------------------------------------===//
-#include "AsmParser/MipsAsmFlags.h"
-#include "MCTargetDesc/MipsELFStreamer.h"
#include "MCTargetDesc/MipsMCTargetDesc.h"
#include "MipsRegisterInfo.h"
#include "llvm/ADT/StringSwitch.h"
@@ -61,7 +59,6 @@ class MipsAsmParser : public MCTargetAsm
MCSubtargetInfo &STI;
MCAsmParser &Parser;
MipsAssemblerOptions Options;
- MipsMCAsmFlags Flags;
bool hasConsumedDollar;
#define GET_ASSEMBLER_HEADER
@@ -231,8 +228,6 @@ class MipsAsmParser : public MCTargetAsm
bool processInstruction(MCInst &Inst, SMLoc IDLoc,
SmallVectorImpl<MCInst> &Instructions);
- void emitEndOfAsmFile(MCStreamer &Out);
-
public:
MipsAsmParser(MCSubtargetInfo &sti, MCAsmParser &parser,
const MCInstrInfo &MII)
@@ -2177,23 +2172,9 @@ bool MipsAsmParser::ParseDirective(AsmTo
return false;
}
- if (IDVal == ".abicalls") {
- Flags.setRelocationModel(MipsMCAsmFlags::MAF_RM_CPIC);
- if (Parser.getTok().isNot(AsmToken::EndOfStatement))
- return Error(Parser.getTok().getLoc(), "unexpected token in directive");
- return false;
- }
-
return true;
}
-/// End of assembly processing such as updating ELF header flags.
-void MipsAsmParser::emitEndOfAsmFile(MCStreamer &OutStreamer) {
- if (MipsELFStreamer *MES = dyn_cast<MipsELFStreamer>(&OutStreamer))
- MES->emitELFHeaderFlagsAsm(Flags);
- MCTargetAsmParser::emitEndOfAsmFile(OutStreamer);
-}
-
extern "C" void LLVMInitializeMipsAsmParser() {
RegisterMCAsmParser<MipsAsmParser> X(TheMipsTarget);
RegisterMCAsmParser<MipsAsmParser> Y(TheMipselTarget);
Modified: llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.cpp?rev=191992&r1=191991&r2=191992&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.cpp (original)
+++ llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.cpp Fri Oct 4 17:52:31 2013
@@ -7,7 +7,6 @@
//
//===-------------------------------------------------------------------===//
#include "MCTargetDesc/MipsELFStreamer.h"
-#include "AsmParser/MipsAsmFlags.h"
#include "MipsSubtarget.h"
#include "llvm/MC/MCAssembler.h"
#include "llvm/MC/MCELF.h"
@@ -67,26 +66,10 @@ namespace llvm {
Reloc::Model RM = Subtarget.getRelocationModel();
if (RM == Reloc::PIC_ || RM == Reloc::Default)
EFlags |= ELF::EF_MIPS_PIC;
-
- MCA.setELFHeaderEFlags(EFlags);
- }
-
- // For llvm-mc. Set a group of ELF header flags
- void MipsELFStreamer::emitELFHeaderFlagsAsm(const MipsMCAsmFlags &Flags) {
-
- // Update e_header flags
- MCAssembler &MCA = getAssembler();
- unsigned EFlags = MCA.getELFHeaderEFlags();
-
- // Relocation Model
- if (Flags.isModelCpic() || Flags.isModelDefault())
- EFlags |= ELF::EF_MIPS_CPIC;
- if (Flags.isModelStatic())
+ else if (RM == Reloc::Static)
; // Do nothing for Reloc::Static
- else if (Flags.isModelPic() || Flags.isModelDefault())
- EFlags |= ELF::EF_MIPS_PIC;
else
- assert(0 && "Unsupported relocation model for e_flags");
+ llvm_unreachable("Unsupported relocation model for e_flags");
MCA.setELFHeaderEFlags(EFlags);
}
Modified: llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.h?rev=191992&r1=191991&r2=191992&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.h (original)
+++ llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFStreamer.h Fri Oct 4 17:52:31 2013
@@ -13,7 +13,6 @@
namespace llvm {
class MipsAsmPrinter;
-class MipsMCAsmFlags;
class MipsSubtarget;
class MCSymbol;
@@ -27,7 +26,6 @@ public:
~MipsELFStreamer() {}
void emitELFHeaderFlagsCG(const MipsSubtarget &Subtarget);
- void emitELFHeaderFlagsAsm(const MipsMCAsmFlags &MAFlags);
void emitMipsSTOCG(const MipsSubtarget &Subtarget,
MCSymbol *Sym,
unsigned Val);
Modified: llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp?rev=191992&r1=191991&r2=191992&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp Fri Oct 4 17:52:31 2013
@@ -594,8 +594,8 @@ void MipsAsmPrinter::EmitEndOfAsmFile(Mo
// Emit Mips ELF register info
Subtarget->getMReginfo().emitMipsReginfoSectionCG(
OutStreamer, getObjFileLowering(), *Subtarget);
- MipsELFStreamer *MES = cast<MipsELFStreamer>(&OutStreamer);
- MES->emitELFHeaderFlagsCG(*Subtarget);
+ if (MipsELFStreamer *MES = dyn_cast<MipsELFStreamer>(&OutStreamer))
+ MES->emitELFHeaderFlagsCG(*Subtarget);
}
void MipsAsmPrinter::PrintDebugValueComment(const MachineInstr *MI,
Modified: llvm/trunk/test/MC/Mips/mips_directives.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Mips/mips_directives.s?rev=191992&r1=191991&r2=191992&view=diff
==============================================================================
--- llvm/trunk/test/MC/Mips/mips_directives.s (original)
+++ llvm/trunk/test/MC/Mips/mips_directives.s Fri Oct 4 17:52:31 2013
@@ -1,12 +1,9 @@
# RUN: llvm-mc -show-encoding -triple mips-unknown-unknown %s | FileCheck %s
-# RUN: llvm-mc -filetype=obj -triple mips-unknown-unknown %s | \
-# RUN: llvm-readobj -h | FileCheck -check-prefix=CHECK-ELF %s
#
# CHECK: .text
# CHECK: $BB0_2:
$BB0_2:
- .ent directives_test
- .abicalls
+ .ent directives_test
.frame $sp,0,$ra
.mask 0x00000000,0
.fmask 0x00000000,0
@@ -46,5 +43,3 @@ $JTI0_0:
# CHECK: and $3, $15, $15 # encoding: [0x01,0xef,0x18,0x24]
abs.s f6,FPU_MASK
and r3,$t7,STORE_MASK
-
-# CHECK-ELF: Flags [ (0x6)
More information about the llvm-commits
mailing list