This is an archive of the discontinued LLVM Phabricator instance.

Differential D47584

[mips] Restore the availablity of trap for microMIPS
ClosedPublic

Authored by sdardis on May 31 2018, 5:55 AM.

Details

Reviewers
smaksimovic
atanasyan
abeserminji
Commits
rGfb4dde114228: [mips] Restore the availablity of trap for microMIPS
rL333895: [mips] Restore the availablity of trap for microMIPS

Diff Detail

Event Timeline

sdardis created this revision.May 31 2018, 5:55 AM
Herald added a subscriber: arichardson. · View Herald TranscriptMay 31 2018, 5:55 AM
atanasyan accepted this revision.Jun 1 2018, 8:43 AM

LGTM

This revision is now accepted and ready to land.Jun 1 2018, 8:43 AM
Closed by commit rL333895: [mips] Restore the availablity of trap for microMIPS (authored by sdardis). · Explain WhyJun 4 2018, 5:54 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Target/
Mips/
1 line
test/
CodeGen/
Mips/
llvm-ir/
34 lines

Diff 149272

lib/Target/Mips/MicroMipsInstrInfo.td

Show First 20 Lines • Show All 1,008 Lines • ▼ Show 20 Lineslet DecoderNamespace = "MicroMips" in {
def ERET_MM : MMRel, ER_FT<"eret", II_ERET>, ER_FM_MM<0x3cd>, def ERET_MM : MMRel, ER_FT<"eret", II_ERET>, ER_FM_MM<0x3cd>,
ISA_MICROMIPS; ISA_MICROMIPS;
def DERET_MM : MMRel, ER_FT<"deret", II_DERET>, ER_FM_MM<0x38d>, def DERET_MM : MMRel, ER_FT<"deret", II_DERET>, ER_FM_MM<0x38d>,
ISA_MICROMIPS; ISA_MICROMIPS;
def EI_MM : MMRel, DEI_FT<"ei", GPR32Opnd, II_EI>, EI_FM_MM<0x15d>, def EI_MM : MMRel, DEI_FT<"ei", GPR32Opnd, II_EI>, EI_FM_MM<0x15d>,
ISA_MICROMIPS; ISA_MICROMIPS;
def DI_MM : MMRel, DEI_FT<"di", GPR32Opnd, II_DI>, EI_FM_MM<0x11d>, def DI_MM : MMRel, DEI_FT<"di", GPR32Opnd, II_DI>, EI_FM_MM<0x11d>,
ISA_MICROMIPS; ISA_MICROMIPS;
def TRAP_MM : TrapBase<BREAK_MM>, ISA_MICROMIPS;
/// Trap Instructions /// Trap Instructions
def TEQ_MM : MMRel, TEQ_FT<"teq", GPR32Opnd, uimm4, II_TEQ>, TEQ_FM_MM<0x0>, def TEQ_MM : MMRel, TEQ_FT<"teq", GPR32Opnd, uimm4, II_TEQ>, TEQ_FM_MM<0x0>,
ISA_MICROMIPS; ISA_MICROMIPS;
def TGE_MM : MMRel, TEQ_FT<"tge", GPR32Opnd, uimm4, II_TGE>, TEQ_FM_MM<0x08>, def TGE_MM : MMRel, TEQ_FT<"tge", GPR32Opnd, uimm4, II_TGE>, TEQ_FM_MM<0x08>,
ISA_MICROMIPS; ISA_MICROMIPS;
def TGEU_MM : MMRel, TEQ_FT<"tgeu", GPR32Opnd, uimm4, II_TGEU>, def TGEU_MM : MMRel, TEQ_FT<"tgeu", GPR32Opnd, uimm4, II_TGEU>,
TEQ_FM_MM<0x10>, ISA_MICROMIPS; TEQ_FM_MM<0x10>, ISA_MICROMIPS;
▲ Show 20 Lines • Show All 348 Lines • Show Last 20 Lines

test/CodeGen/Mips/llvm-ir/trap.ll

  • This file was added.
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
; RUN: llc -mtriple=mips-mti-linux-gnu < %s --show-mc-encoding | FileCheck %s --check-prefix=MTI
; RUN: llc -mtriple=mips-mti-linux-gnu -mattr=+micromips < %s --show-mc-encoding | FileCheck %s --check-prefix=MM
; RUN: llc -mtriple=mips-img-linux-gnu < %s --show-mc-encoding | FileCheck %s --check-prefix=IMG
; RUN: llc -mtriple=mips-img-linux-gnu -mattr=+micromips < %s --show-mc-encoding | FileCheck %s --check-prefix=MMR6
define void @test() noreturn nounwind {
; MTI-LABEL: test:
; MTI: # %bb.0: # %entry
; MTI-NEXT: break # encoding: [0x00,0x00,0x00,0x0d]
; MTI-NEXT: jr $ra # encoding: [0x03,0xe0,0x00,0x08]
; MTI-NEXT: nop # encoding: [0x00,0x00,0x00,0x00]
;
; MM-LABEL: test:
; MM: # %bb.0: # %entry
; MM-NEXT: break # encoding: [0x00,0x00,0x00,0x07]
; MM-NEXT: jrc $ra # encoding: [0x45,0xbf]
;
; IMG-LABEL: test:
; IMG: # %bb.0: # %entry
; IMG-NEXT: break # encoding: [0x00,0x00,0x00,0x0d]
; IMG-NEXT: jr $ra # encoding: [0x03,0xe0,0x00,0x08]
; IMG-NEXT: nop # encoding: [0x00,0x00,0x00,0x00]
;
; MMR6-LABEL: test:
; MMR6: # %bb.0: # %entry
; MMR6-NEXT: break # encoding: [0x00,0x00,0x00,0x07]
; MMR6-NEXT: jrc $ra # encoding: [0x45,0xbf]
entry:
tail call void @llvm.trap( )
ret void
}
declare void @llvm.trap() nounwind