diff options
author | Jozef Kolek <jozef.kolek@imgtec.com> | 2015-01-20 19:29:28 +0000 |
---|---|---|
committer | Jozef Kolek <jozef.kolek@imgtec.com> | 2015-01-20 19:29:28 +0000 |
commit | 0d49117769ba90beb60a4eccf7ed755617b21936 (patch) | |
tree | fde00e0dea5efa3c1bdd18731dba914f89f6f1c6 /llvm/test | |
parent | 3a62216a8a4d4d8d3de0ba164645dbf8725088f3 (diff) | |
download | bcm5719-llvm-0d49117769ba90beb60a4eccf7ed755617b21936.tar.gz bcm5719-llvm-0d49117769ba90beb60a4eccf7ed755617b21936.zip |
Reverted revision 226577.
llvm-svn: 226595
Diffstat (limited to 'llvm/test')
-rw-r--r-- | llvm/test/MC/Disassembler/Mips/micromips.txt | 3 | ||||
-rw-r--r-- | llvm/test/MC/Disassembler/Mips/micromips_le.txt | 3 | ||||
-rw-r--r-- | llvm/test/MC/Mips/micromips-16-bit-instructions.s | 10 | ||||
-rw-r--r-- | llvm/test/MC/Mips/micromips-branch-fixup.s | 91 | ||||
-rw-r--r-- | llvm/test/MC/Mips/micromips-branch-instructions.s | 12 | ||||
-rw-r--r-- | llvm/test/MC/Mips/micromips-diagnostic-fixup.s | 2 |
6 files changed, 5 insertions, 116 deletions
diff --git a/llvm/test/MC/Disassembler/Mips/micromips.txt b/llvm/test/MC/Disassembler/Mips/micromips.txt index f1287581388..07c1df91441 100644 --- a/llvm/test/MC/Disassembler/Mips/micromips.txt +++ b/llvm/test/MC/Disassembler/Mips/micromips.txt @@ -474,6 +474,3 @@ # CHECK: bnez16 $6, 20 0xaf 0x0a - -# CHECK: b16 132 -0xcc 0x42 diff --git a/llvm/test/MC/Disassembler/Mips/micromips_le.txt b/llvm/test/MC/Disassembler/Mips/micromips_le.txt index 0f8b3610bff..9a8c4a94530 100644 --- a/llvm/test/MC/Disassembler/Mips/micromips_le.txt +++ b/llvm/test/MC/Disassembler/Mips/micromips_le.txt @@ -474,6 +474,3 @@ # CHECK: bnez16 $6, 20 0x0a 0xaf - -# CHECK: b16 132 -0x42 0xcc diff --git a/llvm/test/MC/Mips/micromips-16-bit-instructions.s b/llvm/test/MC/Mips/micromips-16-bit-instructions.s index bde03502df4..8fd6d450ac9 100644 --- a/llvm/test/MC/Mips/micromips-16-bit-instructions.s +++ b/llvm/test/MC/Mips/micromips-16-bit-instructions.s @@ -53,10 +53,6 @@ # CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EL: bnez16 $6, 20 # encoding: [0x0a,0xaf] # CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00] -# CHECK-EL: b16 132 # encoding: [0x42,0xcc] -# CHECK-EL: nop -# CHECK-EL: b16 132 # encoding: [0x42,0xcc] -# CHECK-EL: nop # CHECK-EL: break16 8 # encoding: [0x88,0x46] # CHECK-EL: sdbbp16 14 # encoding: [0xce,0x46] #------------------------------------------------------------------------------ @@ -106,10 +102,6 @@ # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: bnez16 $6, 20 # encoding: [0xaf,0x0a] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] -# CHECK-EB: b16 132 # encoding: [0xcc,0x42] -# CHECK-EB: nop -# CHECK-EB: b16 132 # encoding: [0xcc,0x42] -# CHECK-EB: nop # CHECK-EB: break16 8 # encoding: [0x46,0x88] # CHECK-EB: sdbbp16 14 # encoding: [0x46,0xce] @@ -153,7 +145,5 @@ jr16 $9 beqz16 $6, 20 bnez16 $6, 20 - b 132 - b16 132 break16 8 sdbbp16 14 diff --git a/llvm/test/MC/Mips/micromips-branch-fixup.s b/llvm/test/MC/Mips/micromips-branch-fixup.s deleted file mode 100644 index 98b48421b05..00000000000 --- a/llvm/test/MC/Mips/micromips-branch-fixup.s +++ /dev/null @@ -1,91 +0,0 @@ -# RUN: llvm-mc %s -triple=mipsel-unknown-linux -show-encoding \ -# RUN: -mattr=micromips | FileCheck %s -check-prefix=CHECK-FIXUP -# RUN: llvm-mc %s -filetype=obj -triple=mipsel-unknown-linux \ -# RUN: -mattr=micromips | llvm-readobj -r \ -# RUN: | FileCheck %s -check-prefix=CHECK-ELF -#------------------------------------------------------------------------------ -# Check that the assembler can handle the documented syntax -# for relocations. -#------------------------------------------------------------------------------ -# CHECK-FIXUP: beqz16 $6, bar # encoding: [0b0AAAAAAA,0x8f] -# CHECK-FIXUP: # fixup A - offset: 0, -# CHECK-FIXUP: value: bar, kind: fixup_MICROMIPS_PC7_S1 -# CHECK-FIXUP: nop # encoding: [0x00,0x00,0x00,0x00] -# CHECK-FIXUP: bnez16 $6, bar # encoding: [0b0AAAAAAA,0xaf] -# CHECK-FIXUP: # fixup A - offset: 0, -# CHECK-FIXUP: value: bar, kind: fixup_MICROMIPS_PC7_S1 -# CHECK-FIXUP: nop # encoding: [0x00,0x00,0x00,0x00] -# CHECK-FIXUP: b16 bar # encoding: [A,0b110011AA] -# CHECK-FIXUP: # fixup A - offset: 0, -# CHECK-FIXUP: value: bar, kind: fixup_MICROMIPS_PC10_S1 -# CHECK-FIXUP: nop # encoding: [0x00,0x00,0x00,0x00] -# CHECK-FIXUP: b bar # encoding: [A,0x94'A',0x00,0x00] -# CHECK-FIXUP: # fixup A - offset: 0, -# CHECK-FIXUP: value: bar, kind: fixup_MICROMIPS_PC16_S1 -# CHECK-FIXUP: nop # encoding: [0x00,0x0c] -# CHECK-FIXUP: beq $3, $4, bar # encoding: [0x83'A',0x94'A',0x00,0x00] -# CHECK-FIXUP: # fixup A - offset: 0, -# CHECK-FIXUP: value: bar, kind: fixup_MICROMIPS_PC16_S1 -# CHECK-FIXUP: nop # encoding: [0x00,0x00,0x00,0x00] -# CHECK-FIXUP: bne $3, $4, bar # encoding: [0x83'A',0xb4'A',0x00,0x00] -# CHECK-FIXUP: # fixup A - offset: 0, -# CHECK-FIXUP: value: bar, kind: fixup_MICROMIPS_PC16_S1 -# CHECK-FIXUP: nop # encoding: [0x00,0x00,0x00,0x00] -# CHECK-FIXUP: bgez $4, bar # encoding: [0x44'A',0x40'A',0x00,0x00] -# CHECK-FIXUP: # fixup A - offset: 0, -# CHECK-FIXUP: value: bar, kind: fixup_MICROMIPS_PC16_S1 -# CHECK-FIXUP: nop # encoding: [0x00,0x00,0x00,0x00] -# CHECK-FIXUP: bgtz $4, bar # encoding: [0xc4'A',0x40'A',0x00,0x00] -# CHECK-FIXUP: # fixup A - offset: 0, -# CHECK-FIXUP: value: bar, kind: fixup_MICROMIPS_PC16_S1 -# CHECK-FIXUP: nop # encoding: [0x00,0x00,0x00,0x00] -# CHECK-FIXUP: blez $4, bar # encoding: [0x84'A',0x40'A',0x00,0x00] -# CHECK-FIXUP: # fixup A - offset: 0, -# CHECK-FIXUP: value: bar, kind: fixup_MICROMIPS_PC16_S1 -# CHECK-FIXUP: nop # encoding: [0x00,0x00,0x00,0x00] -# CHECK-FIXUP: bltz $4, bar # encoding: [0x04'A',0x40'A',0x00,0x00] -# CHECK-FIXUP: # fixup A - offset: 0, -# CHECK-FIXUP: value: bar, kind: fixup_MICROMIPS_PC16_S1 -# CHECK-FIXUP: nop # encoding: [0x00,0x00,0x00,0x00] -# CHECK-FIXUP: bgezal $4, bar # encoding: [0x64'A',0x40'A',0x00,0x00] -# CHECK-FIXUP: # fixup A - offset: 0, -# CHECK-FIXUP: value: bar, kind: fixup_MICROMIPS_PC16_S1 -# CHECK-FIXUP: nop # encoding: [0x00,0x00,0x00,0x00] -# CHECK-FIXUP: bltzal $4, bar # encoding: [0x24'A',0x40'A',0x00,0x00] -# CHECK-FIXUP: # fixup A - offset: 0, -# CHECK-FIXUP: value: bar, kind: fixup_MICROMIPS_PC16_S1 -# CHECK-FIXUP: nop # encoding: [0x00,0x00,0x00,0x00] -#------------------------------------------------------------------------------ -# Check that the appropriate relocations were created. -#------------------------------------------------------------------------------ -# CHECK-ELF: Relocations [ -# CHECK-ELF: 0x{{[0-9,A-F]+}} R_MICROMIPS_PC7_S1 -# CHECK-ELF: 0x{{[0-9,A-F]+}} R_MICROMIPS_PC7_S1 -# CHECK-ELF: 0x{{[0-9,A-F]+}} R_MICROMIPS_PC10_S1 -# CHECK-ELF: 0x{{[0-9,A-F]+}} R_MICROMIPS_PC16_S1 -# CHECK-ELF: 0x{{[0-9,A-F]+}} R_MICROMIPS_PC16_S1 -# CHECK-ELF: 0x{{[0-9,A-F]+}} R_MICROMIPS_PC16_S1 -# CHECK-ELF: 0x{{[0-9,A-F]+}} R_MICROMIPS_PC16_S1 -# CHECK-ELF: 0x{{[0-9,A-F]+}} R_MICROMIPS_PC16_S1 -# CHECK-ELF: 0x{{[0-9,A-F]+}} R_MICROMIPS_PC16_S1 -# CHECK-ELF: 0x{{[0-9,A-F]+}} R_MICROMIPS_PC16_S1 -# CHECK-ELF: 0x{{[0-9,A-F]+}} R_MICROMIPS_PC16_S1 -# CHECK-ELF: 0x{{[0-9,A-F]+}} R_MICROMIPS_PC16_S1 -# CHECK-ELF: ] - - .text - .type main, @function - .set micromips -main: - beqz16 $6, bar - bnez16 $6, bar - b16 bar - b bar - beq $3, $4, bar - bne $3, $4, bar - bgez $4, bar - bgtz $4, bar - blez $4, bar - bltz $4, bar - bgezal $4, bar - bltzal $4, bar diff --git a/llvm/test/MC/Mips/micromips-branch-instructions.s b/llvm/test/MC/Mips/micromips-branch-instructions.s index e85b92521ea..d1e78988901 100644 --- a/llvm/test/MC/Mips/micromips-branch-instructions.s +++ b/llvm/test/MC/Mips/micromips-branch-instructions.s @@ -9,8 +9,8 @@ #------------------------------------------------------------------------------ # Little endian #------------------------------------------------------------------------------ -# CHECK-EL: b 1332 # encoding: [0x00,0x94,0x9a,0x02] -# CHECK-EL: nop # encoding: [0x00,0x0c] +# CHECK-EL: b 1332 # encoding: [0x00,0x94,0x9a,0x02] +# CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EL: beq $9, $6, 1332 # encoding: [0xc9,0x94,0x9a,0x02] # CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EL: bgez $6, 1332 # encoding: [0x46,0x40,0x9a,0x02] @@ -36,8 +36,8 @@ #------------------------------------------------------------------------------ # Big endian #------------------------------------------------------------------------------ -# CHECK-EB: b 1332 # encoding: [0x94,0x00,0x02,0x9a] -# CHECK-EB: nop # encoding: [0x0c,0x00] +# CHECK-EB: b 1332 # encoding: [0x94,0x00,0x02,0x9a] +# CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: beq $9, $6, 1332 # encoding: [0x94,0xc9,0x02,0x9a] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: bgez $6, 1332 # encoding: [0x40,0x46,0x02,0x9a] @@ -61,10 +61,6 @@ # CHECK-EB: bltzals $6, 1332 # encoding: [0x42,0x26,0x02,0x9a] # CHECK-EB: nop # encoding: [0x0c,0x00] - .text - .type main, @function - .set micromips -main: b 1332 beq $9,$6,1332 bgez $6,1332 diff --git a/llvm/test/MC/Mips/micromips-diagnostic-fixup.s b/llvm/test/MC/Mips/micromips-diagnostic-fixup.s index 041338ac2d3..f8fe447c283 100644 --- a/llvm/test/MC/Mips/micromips-diagnostic-fixup.s +++ b/llvm/test/MC/Mips/micromips-diagnostic-fixup.s @@ -4,7 +4,7 @@ .text b foo - .space 65536 - 6, 1 # -6 = size of b instr plus size of automatically inserted nop + .space 65536 - 8, 1 # -8 = size of b instr plus size of automatically inserted nop nop # This instr makes the branch too long to fit into a 17-bit offset foo: add $0,$0,$0 |