Commit 5d672088 authored by Bill Wendling's avatar Bill Wendling
Browse files

Merging r142841: 

------------------------------------------------------------------------
r142841 | efriedma | 2011-10-24 13:24:21 -0700 (Mon, 24 Oct 2011) | 3 lines

Add support to the old JIT for acquire/release loads and stores on x86.  PR11207.


------------------------------------------------------------------------

llvm-svn: 142842
parent 85debca4

llvm/lib/Target/X86/X86CodeEmitter.cpp

+24 −9
Original line number Diff line number Diff line
@@ -589,6 +589,13 @@ void Emitter<CodeEmitter>::emitMemModRMByte(const MachineInstr &MI, 
  }

}



static const MCInstrDesc *UpdateOp(MachineInstr &MI, const X86InstrInfo *II,

                                   unsigned Opcode) {

  const MCInstrDesc *Desc = &II->get(Opcode);

  MI.setDesc(*Desc);

  return Desc;

}



template<class CodeEmitter>

void Emitter<CodeEmitter>::emitInstruction(MachineInstr &MI,

                                           const MCInstrDesc *Desc) {
@@ -596,15 +603,23 @@ void Emitter<CodeEmitter>::emitInstruction(MachineInstr &MI, 
  

  // If this is a pseudo instruction, lower it.

  switch (Desc->getOpcode()) {

  case X86::ADD16rr_DB:   Desc = &II->get(X86::OR16rr); MI.setDesc(*Desc);break;

  case X86::ADD32rr_DB:   Desc = &II->get(X86::OR32rr); MI.setDesc(*Desc);break;

  case X86::ADD64rr_DB:   Desc = &II->get(X86::OR64rr); MI.setDesc(*Desc);break;

  case X86::ADD16ri_DB:   Desc = &II->get(X86::OR16ri); MI.setDesc(*Desc);break;

  case X86::ADD32ri_DB:   Desc = &II->get(X86::OR32ri); MI.setDesc(*Desc);break;

  case X86::ADD64ri32_DB:Desc = &II->get(X86::OR64ri32);MI.setDesc(*Desc);break;

  case X86::ADD16ri8_DB:  Desc = &II->get(X86::OR16ri8);MI.setDesc(*Desc);break;

  case X86::ADD32ri8_DB:  Desc = &II->get(X86::OR32ri8);MI.setDesc(*Desc);break;

  case X86::ADD64ri8_DB:  Desc = &II->get(X86::OR64ri8);MI.setDesc(*Desc);break;

  case X86::ADD16rr_DB:      Desc = UpdateOp(MI, II, X86::OR16rr); break;

  case X86::ADD32rr_DB:      Desc = UpdateOp(MI, II, X86::OR32rr); break;

  case X86::ADD64rr_DB:      Desc = UpdateOp(MI, II, X86::OR64rr); break;

  case X86::ADD16ri_DB:      Desc = UpdateOp(MI, II, X86::OR16ri); break;

  case X86::ADD32ri_DB:      Desc = UpdateOp(MI, II, X86::OR32ri); break;

  case X86::ADD64ri32_DB:    Desc = UpdateOp(MI, II, X86::OR64ri32); break;

  case X86::ADD16ri8_DB:     Desc = UpdateOp(MI, II, X86::OR16ri8); break;

  case X86::ADD32ri8_DB:     Desc = UpdateOp(MI, II, X86::OR32ri8); break;

  case X86::ADD64ri8_DB:     Desc = UpdateOp(MI, II, X86::OR64ri8); break;

  case X86::ACQUIRE_MOV8rm:  Desc = UpdateOp(MI, II, X86::MOV8rm); break;

  case X86::ACQUIRE_MOV16rm: Desc = UpdateOp(MI, II, X86::MOV16rm); break;

  case X86::ACQUIRE_MOV32rm: Desc = UpdateOp(MI, II, X86::MOV32rm); break;

  case X86::ACQUIRE_MOV64rm: Desc = UpdateOp(MI, II, X86::MOV64rm); break;

  case X86::RELEASE_MOV8mr:  Desc = UpdateOp(MI, II, X86::MOV8mr); break;

  case X86::RELEASE_MOV16mr: Desc = UpdateOp(MI, II, X86::MOV16mr); break;

  case X86::RELEASE_MOV32mr: Desc = UpdateOp(MI, II, X86::MOV32mr); break;

  case X86::RELEASE_MOV64mr: Desc = UpdateOp(MI, II, X86::MOV64mr); break;

  }