From 2ec5933eae2e889225d33bd2f93a35926e958c95 Mon Sep 17 00:00:00 2001 From: Vladimir Medic Date: Wed, 10 Jul 2013 10:18:10 +0000 Subject: [PATCH] Add support for Mips break and syscall insructions. The corresponding test cases are added. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185999 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/Mips/MipsInstrFormats.td | 28 ++++++++++++++++++++++++++++ lib/Target/Mips/MipsInstrInfo.td | 21 +++++++++++++++++++++ test/MC/Mips/mips_directives.s | 14 ++++++++++++-- 3 files changed, 61 insertions(+), 2 deletions(-) diff --git a/lib/Target/Mips/MipsInstrFormats.td b/lib/Target/Mips/MipsInstrFormats.td index 14cfcf96d34..6073476af2c 100644 --- a/lib/Target/Mips/MipsInstrFormats.td +++ b/lib/Target/Mips/MipsInstrFormats.td @@ -490,6 +490,34 @@ class TEQ_FM funct> { let Inst{5-0} = funct; } +//===----------------------------------------------------------------------===// +// System calls format +//===----------------------------------------------------------------------===// + +class SYS_FM funct> +{ + bits<20> code_; + bits<32> Inst; + let Inst{31-26} = 0x0; + let Inst{25-6} = code_; + let Inst{5-0} = funct; +} + +//===----------------------------------------------------------------------===// +// Break instruction format +//===----------------------------------------------------------------------===// + +class BRK_FM funct> +{ + bits<10> code_1; + bits<10> code_2; + bits<32> Inst; + let Inst{31-26} = 0x0; + let Inst{25-16} = code_1; + let Inst{15-6} = code_2; + let Inst{5-0} = funct; +} + //===----------------------------------------------------------------------===// // // FLOATING POINT INSTRUCTION FORMATS diff --git a/lib/Target/Mips/MipsInstrInfo.td b/lib/Target/Mips/MipsInstrInfo.td index d2164f72636..712e2044278 100644 --- a/lib/Target/Mips/MipsInstrInfo.td +++ b/lib/Target/Mips/MipsInstrInfo.td @@ -250,6 +250,12 @@ def simm16 : Operand { def simm20 : Operand { } +def uimm20 : Operand { +} + +def uimm10 : Operand { +} + def simm16_64 : Operand; def shamt : Operand; @@ -637,6 +643,14 @@ class BAL_FT : let hasDelaySlot = 1; let Defs = [RA]; } +// Syscall +class SYS_FT : + InstSE<(outs), (ins uimm20:$code_), + !strconcat(opstr, "\t$code_"), [], NoItinerary, FrmI>; +// Break +class BRK_FT : + InstSE<(outs), (ins uimm10:$code_1, uimm10:$code_2), + !strconcat(opstr, "\t$code_1, $code_2"), [], NoItinerary, FrmOther>; // Sync let hasSideEffects = 1 in @@ -941,6 +955,9 @@ defm SWR : StoreLeftRightM<"swr", MipsSWR, CPURegs>, LW_FM<0x2e>; def SYNC : SYNC_FT, SYNC_FM; def TEQ : TEQ_FT<"teq", CPURegsOpnd>, TEQ_FM<0x34>; +def BREAK : BRK_FT<"break">, BRK_FM<0xd>; +def SYSCALL : SYS_FT<"syscall">, SYS_FM<0xc>; + /// Load-linked, Store-conditional let Predicates = [NotN64, HasStdEnc] in { def LL : LLBase<"ll", CPURegsOpnd, mem>, LW_FM<0x30>; @@ -1119,6 +1136,10 @@ def : InstAlias<"bnez $rs,$offset", def : InstAlias<"beqz $rs,$offset", (BEQ CPURegsOpnd:$rs, ZERO, brtarget:$offset), 1>, Requires<[NotMips64]>; +def : InstAlias<"syscall", (SYSCALL 0), 1>; + +def : InstAlias<"break $imm", (BREAK uimm10:$imm, 0), 1>; +def : InstAlias<"break", (BREAK 0, 0), 1>; //===----------------------------------------------------------------------===// // Assembler Pseudo Instructions //===----------------------------------------------------------------------===// diff --git a/test/MC/Mips/mips_directives.s b/test/MC/Mips/mips_directives.s index 1bf46003b5c..c29806aeff7 100644 --- a/test/MC/Mips/mips_directives.s +++ b/test/MC/Mips/mips_directives.s @@ -39,7 +39,17 @@ $JTI0_0: .set FPU_MASK,$f7 .set r3,$3 .set f6,$f6 -#CHECK: abs.s $f6, $f7 # encoding: [0x46,0x00,0x39,0x85] -#CHECK: and $3, $15, $15 # encoding: [0x01,0xef,0x18,0x24] +# CHECK: abs.s $f6, $f7 # encoding: [0x46,0x00,0x39,0x85] +# CHECK: and $3, $15, $15 # encoding: [0x01,0xef,0x18,0x24] +# CHECK: break # encoding: [0x00,0x00,0x00,0x0d] +# CHECK: break 7, 0 # encoding: [0x00,0x07,0x00,0x0d] +# CHECK: break 7, 5 # encoding: [0x00,0x07,0x01,0x4d] +# CHECK: syscall # encoding: [0x00,0x00,0x00,0x0c] +# CHECK: syscall 13396 # encoding: [0x00,0x0d,0x15,0x0c] abs.s f6,FPU_MASK and r3,$t7,STORE_MASK + break + break 7 + break 7,5 + syscall + syscall 0x3454