This is an archive of the discontinued LLVM Phabricator instance.

Differential D12077

[MIPS] Move is 'or' instead of 'addu'.
AbandonedPublic

Authored by sdardis on Aug 17 2015, 3:44 AM.

Details

Reviewers
None
Summary

Change move encoding in PLTs and tests to be 'or' instead of 'addu'.

Diff Detail

Event Timeline

sdardis updated this revision to Diff 32284.Aug 17 2015, 3:44 AM
sdardis retitled this revision from to [MIPS] Move is 'or' instead of 'addu'..
sdardis updated this object.
sdardis added a reviewer: clayborg.
sdardis added a subscriber: lldb-commits.
clayborg resigned from this revision.Aug 17 2015, 9:40 AM
clayborg removed a reviewer: clayborg.

I don't think I am the right person to review this as this is in LLVM.

sdardis abandoned this revision.Aug 18 2015, 1:35 AM

Revision Contents

Diff 32284

lib/ReaderWriter/ELF/Mips/MipsRelocationPass.cpp

Show All 37 Lines
}; };
// Regular big-endian PLT0 entry // Regular big-endian PLT0 entry
static const uint8_t mipsBePlt0AtomContent[] = { static const uint8_t mipsBePlt0AtomContent[] = {
0x3c, 0x1c, 0x00, 0x00, // lui $28, %hi(&GOTPLT[0]) 0x3c, 0x1c, 0x00, 0x00, // lui $28, %hi(&GOTPLT[0])
0x8f, 0x99, 0x00, 0x00, // lw $25, %lo(&GOTPLT[0])($28) 0x8f, 0x99, 0x00, 0x00, // lw $25, %lo(&GOTPLT[0])($28)
0x27, 0x9c, 0x00, 0x00, // addiu $28, $28, %lo(&GOTPLT[0]) 0x27, 0x9c, 0x00, 0x00, // addiu $28, $28, %lo(&GOTPLT[0])
0x03, 0x1c, 0xc0, 0x23, // subu $24, $24, $28 0x03, 0x1c, 0xc0, 0x23, // subu $24, $24, $28
0x03, 0xe0, 0x78, 0x21, // move $15, $31 0x03, 0xe0, 0x78, 0x25, // move $15, $31
0x00, 0x18, 0xc0, 0x82, // srl $24, $24, 2 0x00, 0x18, 0xc0, 0x82, // srl $24, $24, 2
0x03, 0x20, 0xf8, 0x09, // jalr $25 0x03, 0x20, 0xf8, 0x09, // jalr $25
0x27, 0x18, 0xff, 0xfe // subu $24, $24, 2 0x27, 0x18, 0xff, 0xfe // subu $24, $24, 2
}; };
// Regular little-endian PLT0 entry // Regular little-endian PLT0 entry
static const uint8_t mipsLePlt0AtomContent[] = { static const uint8_t mipsLePlt0AtomContent[] = {
0x00, 0x00, 0x1c, 0x3c, // lui $28, %hi(&GOTPLT[0]) 0x00, 0x00, 0x1c, 0x3c, // lui $28, %hi(&GOTPLT[0])
0x00, 0x00, 0x99, 0x8f, // lw $25, %lo(&GOTPLT[0])($28) 0x00, 0x00, 0x99, 0x8f, // lw $25, %lo(&GOTPLT[0])($28)
0x00, 0x00, 0x9c, 0x27, // addiu $28, $28, %lo(&GOTPLT[0]) 0x00, 0x00, 0x9c, 0x27, // addiu $28, $28, %lo(&GOTPLT[0])
0x23, 0xc0, 0x1c, 0x03, // subu $24, $24, $28 0x23, 0xc0, 0x1c, 0x03, // subu $24, $24, $28
0x21, 0x78, 0xe0, 0x03, // move $15, $31 0x25, 0x78, 0xe0, 0x03, // move $15, $31
0x82, 0xc0, 0x18, 0x00, // srl $24, $24, 2 0x82, 0xc0, 0x18, 0x00, // srl $24, $24, 2
0x09, 0xf8, 0x20, 0x03, // jalr $25 0x09, 0xf8, 0x20, 0x03, // jalr $25
0xfe, 0xff, 0x18, 0x27 // subu $24, $24, 2 0xfe, 0xff, 0x18, 0x27 // subu $24, $24, 2
}; };
// microMIPS big-endian PLT0 entry // microMIPS big-endian PLT0 entry
static const uint8_t microMipsBePlt0AtomContent[] = { static const uint8_t microMipsBePlt0AtomContent[] = {
0x79, 0x80, 0x00, 0x00, // addiupc $3, (&GOTPLT[0]) - . 0x79, 0x80, 0x00, 0x00, // addiupc $3, (&GOTPLT[0]) - .
▲ Show 20 Lines • Show All 1,315 Lines • Show Last 20 Lines

test/elf/Mips/plt-entry-mixed-1.test

Show All 15 Lines
# RUN: llvm-objdump -d %t.exe | FileCheck %s # RUN: llvm-objdump -d %t.exe | FileCheck %s
# CHECK: Disassembly of section .plt: # CHECK: Disassembly of section .plt:
# CHECK-NEXT: .plt: # CHECK-NEXT: .plt:
# CHECK-NEXT: 400170: 40 00 1c 3c lui $gp, 64 # CHECK-NEXT: 400170: 40 00 1c 3c lui $gp, 64
# CHECK-NEXT: 400174: 00 20 99 8f lw $25, 8192($gp) # CHECK-NEXT: 400174: 00 20 99 8f lw $25, 8192($gp)
# CHECK-NEXT: 400178: 00 20 9c 27 addiu $gp, $gp, 8192 # CHECK-NEXT: 400178: 00 20 9c 27 addiu $gp, $gp, 8192
# CHECK-NEXT: 40017c: 23 c0 1c 03 subu $24, $24, $gp # CHECK-NEXT: 40017c: 23 c0 1c 03 subu $24, $24, $gp
# CHECK-NEXT: 400180: 21 78 e0 03 move $15, $ra # CHECK-NEXT: 400180: 25 78 e0 03 move $15, $ra
# CHECK-NEXT: 400184: 82 c0 18 00 srl $24, $24, 2 # CHECK-NEXT: 400184: 82 c0 18 00 srl $24, $24, 2
# CHECK-NEXT: 400188: 09 f8 20 03 jalr $25 # CHECK-NEXT: 400188: 09 f8 20 03 jalr $25
# CHECK-NEXT: 40018c: fe ff 18 27 addiu $24, $24, -2 # CHECK-NEXT: 40018c: fe ff 18 27 addiu $24, $24, -2
# CHECK-NEXT: 400190: 40 00 0f 3c lui $15, 64 # CHECK-NEXT: 400190: 40 00 0f 3c lui $15, 64
# CHECK-NEXT: 400194: 08 20 f9 8d lw $25, 8200($15) # CHECK-NEXT: 400194: 08 20 f9 8d lw $25, 8200($15)
# CHECK-NEXT: 400198: 08 00 20 03 jr $25 # CHECK-NEXT: 400198: 08 00 20 03 jr $25
# CHECK-NEXT: 40019c: 08 20 f8 25 addiu $24, $15, 8200 # CHECK-NEXT: 40019c: 08 20 f8 25 addiu $24, $15, 8200
▲ Show 20 Lines • Show All 82 Lines • Show Last 20 Lines

test/elf/Mips/plt-entry-r6-be.test

Show All 11 Lines
# RUN: llvm-objdump -d %t.exe | FileCheck %s # RUN: llvm-objdump -d %t.exe | FileCheck %s
# CHECK: Disassembly of section .plt: # CHECK: Disassembly of section .plt:
# CHECK-NEXT: .plt: # CHECK-NEXT: .plt:
# CHECK-NEXT: 400160: 3c 1c 00 40 lui $gp, 64 # CHECK-NEXT: 400160: 3c 1c 00 40 lui $gp, 64
# CHECK-NEXT: 400164: 8f 99 20 00 lw $25, 8192($gp) # CHECK-NEXT: 400164: 8f 99 20 00 lw $25, 8192($gp)
# CHECK-NEXT: 400168: 27 9c 20 00 addiu $gp, $gp, 8192 # CHECK-NEXT: 400168: 27 9c 20 00 addiu $gp, $gp, 8192
# CHECK-NEXT: 40016c: 03 1c c0 23 subu $24, $24, $gp # CHECK-NEXT: 40016c: 03 1c c0 23 subu $24, $24, $gp
# CHECK-NEXT: 400170: 03 e0 78 21 move $15, $ra # CHECK-NEXT: 400170: 03 e0 78 25 move $15, $ra
# CHECK-NEXT: 400174: 00 18 c0 82 srl $24, $24, 2 # CHECK-NEXT: 400174: 00 18 c0 82 srl $24, $24, 2
# CHECK-NEXT: 400178: 03 20 f8 09 jalr $25 # CHECK-NEXT: 400178: 03 20 f8 09 jalr $25
# CHECK-NEXT: 40017c: 27 18 ff fe addiu $24, $24, -2 # CHECK-NEXT: 40017c: 27 18 ff fe addiu $24, $24, -2
# CHECK-NEXT: 400180: 3c 0f 00 40 lui $15, 64 # CHECK-NEXT: 400180: 3c 0f 00 40 lui $15, 64
# CHECK-NEXT: 400184: 8d f9 20 08 lw $25, 8200($15) # CHECK-NEXT: 400184: 8d f9 20 08 lw $25, 8200($15)
# CHECK-NEXT: 400188: 03 20 00 09 jr $25 # CHECK-NEXT: 400188: 03 20 00 09 jr $25
# CHECK-NEXT: 40018c: 25 f8 20 08 addiu $24, $15, 8200 # CHECK-NEXT: 40018c: 25 f8 20 08 addiu $24, $15, 8200
▲ Show 20 Lines • Show All 81 Lines • Show Last 20 Lines

test/elf/Mips/plt-entry-r6.test

Show All 11 Lines
# RUN: llvm-objdump -d %t.exe | FileCheck %s # RUN: llvm-objdump -d %t.exe | FileCheck %s
# CHECK: Disassembly of section .plt: # CHECK: Disassembly of section .plt:
# CHECK-NEXT: .plt: # CHECK-NEXT: .plt:
# CHECK-NEXT: 400160: 40 00 1c 3c lui $gp, 64 # CHECK-NEXT: 400160: 40 00 1c 3c lui $gp, 64
# CHECK-NEXT: 400164: 00 20 99 8f lw $25, 8192($gp) # CHECK-NEXT: 400164: 00 20 99 8f lw $25, 8192($gp)
# CHECK-NEXT: 400168: 00 20 9c 27 addiu $gp, $gp, 8192 # CHECK-NEXT: 400168: 00 20 9c 27 addiu $gp, $gp, 8192
# CHECK-NEXT: 40016c: 23 c0 1c 03 subu $24, $24, $gp # CHECK-NEXT: 40016c: 23 c0 1c 03 subu $24, $24, $gp
# CHECK-NEXT: 400170: 21 78 e0 03 move $15, $ra # CHECK-NEXT: 400170: 25 78 e0 03 move $15, $ra
# CHECK-NEXT: 400174: 82 c0 18 00 srl $24, $24, 2 # CHECK-NEXT: 400174: 82 c0 18 00 srl $24, $24, 2
# CHECK-NEXT: 400178: 09 f8 20 03 jalr $25 # CHECK-NEXT: 400178: 09 f8 20 03 jalr $25
# CHECK-NEXT: 40017c: fe ff 18 27 addiu $24, $24, -2 # CHECK-NEXT: 40017c: fe ff 18 27 addiu $24, $24, -2
# CHECK-NEXT: 400180: 40 00 0f 3c lui $15, 64 # CHECK-NEXT: 400180: 40 00 0f 3c lui $15, 64
# CHECK-NEXT: 400184: 08 20 f9 8d lw $25, 8200($15) # CHECK-NEXT: 400184: 08 20 f9 8d lw $25, 8200($15)
# CHECK-NEXT: 400188: 09 00 20 03 jr $25 # CHECK-NEXT: 400188: 09 00 20 03 jr $25
# CHECK-NEXT: 40018c: 08 20 f8 25 addiu $24, $15, 8200 # CHECK-NEXT: 40018c: 08 20 f8 25 addiu $24, $15, 8200
▲ Show 20 Lines • Show All 81 Lines • Show Last 20 Lines

test/elf/Mips/plt-header-be.test

Show All 11 Lines
# RUN: llvm-objdump -section-headers -disassemble %t.exe | FileCheck %s # RUN: llvm-objdump -section-headers -disassemble %t.exe | FileCheck %s
# CHECK: Disassembly of section .plt: # CHECK: Disassembly of section .plt:
# CHECK-NEXT: .plt: # CHECK-NEXT: .plt:
# CHECK-NEXT: 400160: 3c 1c 00 40 lui $gp, 64 # CHECK-NEXT: 400160: 3c 1c 00 40 lui $gp, 64
# CHECK-NEXT: 400164: 8f 99 20 00 lw $25, 8192($gp) # CHECK-NEXT: 400164: 8f 99 20 00 lw $25, 8192($gp)
# CHECK-NEXT: 400168: 27 9c 20 00 addiu $gp, $gp, 8192 # CHECK-NEXT: 400168: 27 9c 20 00 addiu $gp, $gp, 8192
# CHECK-NEXT: 40016c: 03 1c c0 23 subu $24, $24, $gp # CHECK-NEXT: 40016c: 03 1c c0 23 subu $24, $24, $gp
# CHECK-NEXT: 400170: 03 e0 78 21 move $15, $ra # CHECK-NEXT: 400170: 03 e0 78 25 move $15, $ra
# CHECK-NEXT: 400174: 00 18 c0 82 srl $24, $24, 2 # CHECK-NEXT: 400174: 00 18 c0 82 srl $24, $24, 2
# CHECK-NEXT: 400178: 03 20 f8 09 jalr $25 # CHECK-NEXT: 400178: 03 20 f8 09 jalr $25
# CHECK-NEXT: 40017c: 27 18 ff fe addiu $24, $24, -2 # CHECK-NEXT: 40017c: 27 18 ff fe addiu $24, $24, -2
# CHECK-NEXT: 400180: 3c 0f 00 40 lui $15, 64 # CHECK-NEXT: 400180: 3c 0f 00 40 lui $15, 64
# CHECK-NEXT: 400184: 8d f9 20 08 lw $25, 8200($15) # CHECK-NEXT: 400184: 8d f9 20 08 lw $25, 8200($15)
# CHECK-NEXT: 400188: 03 20 00 08 jr $25 # CHECK-NEXT: 400188: 03 20 00 08 jr $25
# CHECK-NEXT: 40018c: 25 f8 20 08 addiu $24, $15, 8200 # CHECK-NEXT: 40018c: 25 f8 20 08 addiu $24, $15, 8200
▲ Show 20 Lines • Show All 76 Lines • Show Last 20 Lines

test/elf/Mips/plt-header-mixed.test

Show All 14 Lines
# RUN: llvm-objdump -section-headers %t.exe | FileCheck -check-prefix=EXE %s # RUN: llvm-objdump -section-headers %t.exe | FileCheck -check-prefix=EXE %s
# DIS: Disassembly of section .plt: # DIS: Disassembly of section .plt:
# DIS-NEXT: .plt: # DIS-NEXT: .plt:
# DIS-NEXT: 400170: 40 00 1c 3c lui $gp, 64 # DIS-NEXT: 400170: 40 00 1c 3c lui $gp, 64
# DIS-NEXT: 400174: 00 20 99 8f lw $25, 8192($gp) # DIS-NEXT: 400174: 00 20 99 8f lw $25, 8192($gp)
# DIS-NEXT: 400178: 00 20 9c 27 addiu $gp, $gp, 8192 # DIS-NEXT: 400178: 00 20 9c 27 addiu $gp, $gp, 8192
# DIS-NEXT: 40017c: 23 c0 1c 03 subu $24, $24, $gp # DIS-NEXT: 40017c: 23 c0 1c 03 subu $24, $24, $gp
# DIS-NEXT: 400180: 21 78 e0 03 move $15, $ra # DIS-NEXT: 400180: 25 78 e0 03 move $15, $ra
# DIS-NEXT: 400184: 82 c0 18 00 srl $24, $24, 2 # DIS-NEXT: 400184: 82 c0 18 00 srl $24, $24, 2
# DIS-NEXT: 400188: 09 f8 20 03 jalr $25 # DIS-NEXT: 400188: 09 f8 20 03 jalr $25
# DIS-NEXT: 40018c: fe ff 18 27 addiu $24, $24, -2 # DIS-NEXT: 40018c: fe ff 18 27 addiu $24, $24, -2
# DIS-NEXT: 400190: 40 00 0f 3c lui $15, 64 # DIS-NEXT: 400190: 40 00 0f 3c lui $15, 64
# DIS-NEXT: 400194: 08 20 f9 8d lw $25, 8200($15) # DIS-NEXT: 400194: 08 20 f9 8d lw $25, 8200($15)
# DIS-NEXT: 400198: 08 00 20 03 jr $25 # DIS-NEXT: 400198: 08 00 20 03 jr $25
# DIS-NEXT: 40019c: 08 20 f8 25 addiu $24, $15, 8200 # DIS-NEXT: 40019c: 08 20 f8 25 addiu $24, $15, 8200
▲ Show 20 Lines • Show All 74 Lines • Show Last 20 Lines

test/elf/Mips/plt-header.test

Show All 13 Lines
# EXE: Disassembly of section .plt: # EXE: Disassembly of section .plt:
# EXE: .plt: # EXE: .plt:
# PLT0 entry. Points to the .got.plt[0] # PLT0 entry. Points to the .got.plt[0]
# EXE-NEXT: 400160: 40 00 1c 3c lui $gp, 64 # EXE-NEXT: 400160: 40 00 1c 3c lui $gp, 64
# EXE-NEXT: 400164: 00 20 99 8f lw $25, 8192($gp) # EXE-NEXT: 400164: 00 20 99 8f lw $25, 8192($gp)
# EXE-NEXT: 400168: 00 20 9c 27 addiu $gp, $gp, 8192 # EXE-NEXT: 400168: 00 20 9c 27 addiu $gp, $gp, 8192
# EXE-NEXT: 40016c: 23 c0 1c 03 subu $24, $24, $gp # EXE-NEXT: 40016c: 23 c0 1c 03 subu $24, $24, $gp
# EXE-NEXT: 400170: 21 78 e0 03 move $15, $ra # EXE-NEXT: 400170: 25 78 e0 03 move $15, $ra
# EXE-NEXT: 400174: 82 c0 18 00 srl $24, $24, 2 # EXE-NEXT: 400174: 82 c0 18 00 srl $24, $24, 2
# EXE-NEXT: 400178: 09 f8 20 03 jalr $25 # EXE-NEXT: 400178: 09 f8 20 03 jalr $25
# EXE-NEXT: 40017c: fe ff 18 27 addiu $24, $24, -2 # EXE-NEXT: 40017c: fe ff 18 27 addiu $24, $24, -2
# EXE: Sections: # EXE: Sections:
# EXE: Idx Name Size Address Type # EXE: Idx Name Size Address Type
# EXE: 6 .plt 00000030 0000000000400160 TEXT DATA # EXE: 6 .plt 00000030 0000000000400160 TEXT DATA
# EXE: 10 .got.plt 0000000c 0000000000402000 DATA # EXE: 10 .got.plt 0000000c 0000000000402000 DATA
▲ Show 20 Lines • Show All 69 Lines • Show Last 20 Lines

test/elf/Mips/rel-dynamic-01.test

Show All 17 Lines
# RUN: llvm-readobj -mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s # RUN: llvm-readobj -mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s
# PLT: Disassembly of section .plt: # PLT: Disassembly of section .plt:
# PLT-NEXT: .plt: # PLT-NEXT: .plt:
# PLT-NEXT: 4001f0: 40 00 1c 3c lui $gp, 64 # PLT-NEXT: 4001f0: 40 00 1c 3c lui $gp, 64
# PLT-NEXT: 4001f4: 00 20 99 8f lw $25, 8192($gp) # PLT-NEXT: 4001f4: 00 20 99 8f lw $25, 8192($gp)
# PLT-NEXT: 4001f8: 00 20 9c 27 addiu $gp, $gp, 8192 # PLT-NEXT: 4001f8: 00 20 9c 27 addiu $gp, $gp, 8192
# PLT-NEXT: 4001fc: 23 c0 1c 03 subu $24, $24, $gp # PLT-NEXT: 4001fc: 23 c0 1c 03 subu $24, $24, $gp
# PLT-NEXT: 400200: 21 78 e0 03 move $15, $ra # PLT-NEXT: 400200: 25 78 e0 03 move $15, $ra
# PLT-NEXT: 400204: 82 c0 18 00 srl $24, $24, 2 # PLT-NEXT: 400204: 82 c0 18 00 srl $24, $24, 2
# PLT-NEXT: 400208: 09 f8 20 03 jalr $25 # PLT-NEXT: 400208: 09 f8 20 03 jalr $25
# PLT-NEXT: 40020c: fe ff 18 27 addiu $24, $24, -2 # PLT-NEXT: 40020c: fe ff 18 27 addiu $24, $24, -2
# #
# PLT-NEXT: 400210: 40 00 0f 3c lui $15, 64 # PLT-NEXT: 400210: 40 00 0f 3c lui $15, 64
# PLT-NEXT: 400214: 08 20 f9 8d lw $25, 8200($15) # PLT-NEXT: 400214: 08 20 f9 8d lw $25, 8200($15)
# PLT-NEXT: 400218: 08 00 20 03 jr $25 # PLT-NEXT: 400218: 08 00 20 03 jr $25
# PLT-NEXT: 40021c: 08 20 f8 25 addiu $24, $15, 8200 # PLT-NEXT: 40021c: 08 20 f8 25 addiu $24, $15, 8200
▲ Show 20 Lines • Show All 227 Lines • Show Last 20 Lines

test/elf/Mips/rel-dynamic-03.test

Show All 18 Lines
# RUN: llvm-readobj -dt -r %t.exe | FileCheck -check-prefix=PLT-SYM %s # RUN: llvm-readobj -dt -r %t.exe | FileCheck -check-prefix=PLT-SYM %s
# PLT: Disassembly of section .plt: # PLT: Disassembly of section .plt:
# PLT-NEXT: .plt: # PLT-NEXT: .plt:
# PLT-NEXT: 400160: 40 00 1c 3c lui $gp, 64 # PLT-NEXT: 400160: 40 00 1c 3c lui $gp, 64
# PLT-NEXT: 400164: 00 20 99 8f lw $25, 8192($gp) # PLT-NEXT: 400164: 00 20 99 8f lw $25, 8192($gp)
# PLT-NEXT: 400168: 00 20 9c 27 addiu $gp, $gp, 8192 # PLT-NEXT: 400168: 00 20 9c 27 addiu $gp, $gp, 8192
# PLT-NEXT: 40016c: 23 c0 1c 03 subu $24, $24, $gp # PLT-NEXT: 40016c: 23 c0 1c 03 subu $24, $24, $gp
# PLT-NEXT: 400170: 21 78 e0 03 move $15, $ra # PLT-NEXT: 400170: 25 78 e0 03 move $15, $ra
# PLT-NEXT: 400174: 82 c0 18 00 srl $24, $24, 2 # PLT-NEXT: 400174: 82 c0 18 00 srl $24, $24, 2
# PLT-NEXT: 400178: 09 f8 20 03 jalr $25 # PLT-NEXT: 400178: 09 f8 20 03 jalr $25
# PLT-NEXT: 40017c: fe ff 18 27 addiu $24, $24, -2 # PLT-NEXT: 40017c: fe ff 18 27 addiu $24, $24, -2
# #
# PLT-NEXT: 400180: 40 00 0f 3c lui $15, 64 # PLT-NEXT: 400180: 40 00 0f 3c lui $15, 64
# PLT-NEXT: 400184: 08 20 f9 8d lw $25, 8200($15) # PLT-NEXT: 400184: 08 20 f9 8d lw $25, 8200($15)
# PLT-NEXT: 400188: 08 00 20 03 jr $25 # PLT-NEXT: 400188: 08 00 20 03 jr $25
# PLT-NEXT: 40018c: 08 20 f8 25 addiu $24, $15, 8200 # PLT-NEXT: 40018c: 08 20 f8 25 addiu $24, $15, 8200
▲ Show 20 Lines • Show All 94 Lines • Show Last 20 Lines