diff options
Diffstat (limited to 'llvm')
7 files changed, 26 insertions, 11 deletions
diff --git a/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp b/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp index 521ef0d0b69..0c86d11659c 100644 --- a/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp +++ b/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp @@ -173,7 +173,8 @@ EncodeInstruction(const MCInst &MI, raw_ostream &OS, // Unfortunately in MIPS both NOP and SLL will come in with Binary == 0 // so we have to special check for them. unsigned Opcode = TmpInst.getOpcode(); - if ((Opcode != Mips::NOP) && (Opcode != Mips::SLL) && !Binary) + if ((Opcode != Mips::NOP) && (Opcode != Mips::SLL) && + (Opcode != Mips::SLL_MM) && !Binary) llvm_unreachable("unimplemented opcode in EncodeInstruction()"); if (STI.getFeatureBits() & Mips::FeatureMicroMips) { diff --git a/llvm/lib/Target/Mips/MicroMipsInstrInfo.td b/llvm/lib/Target/Mips/MicroMipsInstrInfo.td index 7180fb449aa..209cff1c66a 100644 --- a/llvm/lib/Target/Mips/MicroMipsInstrInfo.td +++ b/llvm/lib/Target/Mips/MicroMipsInstrInfo.td @@ -710,4 +710,6 @@ def : MipsPat<(srl GPR32:$src, immZExt5:$imm), //===----------------------------------------------------------------------===// def : MipsInstAlias<"wait", (WAIT_MM 0x0), 1>; + def : MipsInstAlias<"nop", (SLL_MM ZERO, ZERO, 0), 1>; + def : MipsInstAlias<"nop", (MOVE16_MM ZERO, ZERO), 1>; } diff --git a/llvm/test/MC/Disassembler/Mips/micromips.txt b/llvm/test/MC/Disassembler/Mips/micromips.txt index aedd269f23b..7529d266dc7 100644 --- a/llvm/test/MC/Disassembler/Mips/micromips.txt +++ b/llvm/test/MC/Disassembler/Mips/micromips.txt @@ -322,6 +322,9 @@ # CHECK: swm32 $16, $17, 8($4) 0x20 0x44 0xd0 0x08 +# CHECK: nop +0x00 0x00 0x00 0x00 + # CHECK: addu16 $6, $17, $4 0x07 0x42 @@ -408,3 +411,6 @@ # CHECK: addius5 $7, -2 0x4c 0xfc + +# CHECK: nop +0x0c 0x00 diff --git a/llvm/test/MC/Disassembler/Mips/micromips_le.txt b/llvm/test/MC/Disassembler/Mips/micromips_le.txt index 50e6569b895..10bd7c3b23b 100644 --- a/llvm/test/MC/Disassembler/Mips/micromips_le.txt +++ b/llvm/test/MC/Disassembler/Mips/micromips_le.txt @@ -322,6 +322,9 @@ # CHECK: swm32 $16, $17, 8($4) 0x44 0x20 0x08 0xd0 +# CHECK: nop +0x00 0x00 0x00 0x00 + # CHECK: addu16 $6, $17, $4 0x42 0x07 @@ -408,3 +411,6 @@ # CHECK: addius5 $7, -2 0xfc 0x4c + +# CHECK: nop +0x00 0x0c diff --git a/llvm/test/MC/Mips/micromips-16-bit-instructions.s b/llvm/test/MC/Mips/micromips-16-bit-instructions.s index 8529350c642..a21c4c99d5e 100644 --- a/llvm/test/MC/Mips/micromips-16-bit-instructions.s +++ b/llvm/test/MC/Mips/micromips-16-bit-instructions.s @@ -40,7 +40,7 @@ # CHECK-NEXT: jalr $9 # encoding: [0xc9,0x45] # CHECK-EL: jraddiusp 20 # encoding: [0x05,0x47] # CHECK-NEXT: jalrs16 $9 # encoding: [0xe9,0x45] -# CHECK-EL: move $zero, $zero # encoding: [0x00,0x0c] +# CHECK-EL: nop # encoding: [0x00,0x0c] # CHECK-EL: jr16 $9 # encoding: [0x89,0x45] # CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EL: break16 8 # encoding: [0x88,0x46] @@ -79,7 +79,7 @@ # CHECK-NEXT: jalr $9 # encoding: [0x45,0xc9] # CHECK-EB: jraddiusp 20 # encoding: [0x47,0x05] # CHECK-NEXT: jalrs16 $9 # encoding: [0x45,0xe9] -# CHECK-EB: move $zero, $zero # encoding: [0x0c,0x00] +# CHECK-EB: nop # encoding: [0x0c,0x00] # CHECK-EB: jr16 $9 # encoding: [0x45,0x89] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: break16 8 # encoding: [0x46,0x88] diff --git a/llvm/test/MC/Mips/micromips-branch-instructions.s b/llvm/test/MC/Mips/micromips-branch-instructions.s index cf0aab7873d..d1e78988901 100644 --- a/llvm/test/MC/Mips/micromips-branch-instructions.s +++ b/llvm/test/MC/Mips/micromips-branch-instructions.s @@ -30,9 +30,9 @@ # CHECK-EL: bltz $6, 1332 # encoding: [0x06,0x40,0x9a,0x02] # CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EL: bgezals $6, 1332 # encoding: [0x66,0x42,0x9a,0x02] -# CHECK-EL: move $zero, $zero # encoding: [0x00,0x0c] +# CHECK-EL: nop # encoding: [0x00,0x0c] # CHECK-EL: bltzals $6, 1332 # encoding: [0x26,0x42,0x9a,0x02] -# CHECK-EL: move $zero, $zero # encoding: [0x00,0x0c] +# CHECK-EL: nop # encoding: [0x00,0x0c] #------------------------------------------------------------------------------ # Big endian #------------------------------------------------------------------------------ @@ -57,9 +57,9 @@ # CHECK-EB: bltz $6, 1332 # encoding: [0x40,0x06,0x02,0x9a] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: bgezals $6, 1332 # encoding: [0x42,0x66,0x02,0x9a] -# CHECK-EB: move $zero, $zero # encoding: [0x0c,0x00] +# CHECK-EB: nop # encoding: [0x0c,0x00] # CHECK-EB: bltzals $6, 1332 # encoding: [0x42,0x26,0x02,0x9a] -# CHECK-EB: move $zero, $zero # encoding: [0x0c,0x00] +# CHECK-EB: nop # encoding: [0x0c,0x00] b 1332 beq $9,$6,1332 diff --git a/llvm/test/MC/Mips/micromips-jump-instructions.s b/llvm/test/MC/Mips/micromips-jump-instructions.s index aed18dc2074..76f85abafe7 100644 --- a/llvm/test/MC/Mips/micromips-jump-instructions.s +++ b/llvm/test/MC/Mips/micromips-jump-instructions.s @@ -20,9 +20,9 @@ # CHECK-EL: jr $7 # encoding: [0x07,0x00,0x3c,0x0f] # CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EL: jals 1328 # encoding: [0x00,0x74,0x98,0x02] -# CHECK-EL: move $zero, $zero # encoding: [0x00,0x0c] +# CHECK-EL: nop # encoding: [0x00,0x0c] # CHECK-EL: jalrs $ra, $6 # encoding: [0xe6,0x03,0x3c,0x4f] -# CHECK-EL: move $zero, $zero # encoding: [0x00,0x0c] +# CHECK-EL: nop # encoding: [0x00,0x0c] #------------------------------------------------------------------------------ # Big endian #------------------------------------------------------------------------------ @@ -37,9 +37,9 @@ # CHECK-EB: jr $7 # encoding: [0x00,0x07,0x0f,0x3c] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: jals 1328 # encoding: [0x74,0x00,0x02,0x98] -# CHECK-EB: move $zero, $zero # encoding: [0x0c,0x00] +# CHECK-EB: nop # encoding: [0x0c,0x00] # CHECK-EB: jalrs $ra, $6 # encoding: [0x03,0xe6,0x4f,0x3c] -# CHECK-EB: move $zero, $zero # encoding: [0x0c,0x00] +# CHECK-EB: nop # encoding: [0x0c,0x00] j 1328 jal 1328 |
