Commit b9f4df59 authored by Bill Wendling's avatar Bill Wendling
Browse files

Merging r181706: 

------------------------------------------------------------------------
r181706 | rafael | 2013-05-13 07:34:48 -0700 (Mon, 13 May 2013) | 1 line

Remove unused fields and arguments.
------------------------------------------------------------------------

llvm-svn: 182147
parent d695546e

llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static MCCodeEmitter *createAMDGPUMCCodeEmitter(const MCInstrInfo &MCII, 
  if (STI.getFeatureBits() & AMDGPU::Feature64BitPtr) {

    return createSIMCCodeEmitter(MCII, MRI, STI, Ctx);

  } else {

    return createR600MCCodeEmitter(MCII, MRI, STI, Ctx);

    return createR600MCCodeEmitter(MCII, MRI);

  }

}

llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h

+1 −3
Original line number Diff line number Diff line
@@ -32,9 +32,7 @@ class raw_ostream; 
extern Target TheAMDGPUTarget;



MCCodeEmitter *createR600MCCodeEmitter(const MCInstrInfo &MCII,

                                       const MCRegisterInfo &MRI,

                                       const MCSubtargetInfo &STI,

                                       MCContext &Ctx);

                                       const MCRegisterInfo &MRI);



MCCodeEmitter *createSIMCCodeEmitter(const MCInstrInfo &MCII,

                                     const MCRegisterInfo &MRI,

llvm/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp

+4 −9
Original line number Diff line number Diff line
@@ -35,14 +35,11 @@ class R600MCCodeEmitter : public AMDGPUMCCodeEmitter { 
  void operator=(const R600MCCodeEmitter &) LLVM_DELETED_FUNCTION;

  const MCInstrInfo &MCII;

  const MCRegisterInfo &MRI;

  const MCSubtargetInfo &STI;

  MCContext &Ctx;



public:



  R600MCCodeEmitter(const MCInstrInfo &mcii, const MCRegisterInfo &mri,

                    const MCSubtargetInfo &sti, MCContext &ctx)

    : MCII(mcii), MRI(mri), STI(sti), Ctx(ctx) { }

  R600MCCodeEmitter(const MCInstrInfo &mcii, const MCRegisterInfo &mri)

    : MCII(mcii), MRI(mri) { }



  /// \brief Encode the instruction and write it to the OS.

  virtual void EncodeInstruction(const MCInst &MI, raw_ostream &OS,
@@ -98,10 +95,8 @@ enum TextureTypes { 
};



MCCodeEmitter *llvm::createR600MCCodeEmitter(const MCInstrInfo &MCII,

                                           const MCRegisterInfo &MRI,

                                           const MCSubtargetInfo &STI,

                                           MCContext &Ctx) {

  return new R600MCCodeEmitter(MCII, MRI, STI, Ctx);

                                           const MCRegisterInfo &MRI) {

  return new R600MCCodeEmitter(MCII, MRI);

}



void R600MCCodeEmitter::EncodeInstruction(const MCInst &MI, raw_ostream &OS,