sdardis created this revision. sdardis added a reviewer: clayborg. sdardis added a subscriber: lldb-commits.
Change move encoding in PLTs and tests to be 'or' instead of 'addu'. http://reviews.llvm.org/D12077 Files: lib/ReaderWriter/ELF/Mips/MipsRelocationPass.cpp test/elf/Mips/plt-entry-mixed-1.test test/elf/Mips/plt-entry-r6-be.test test/elf/Mips/plt-entry-r6.test test/elf/Mips/plt-header-be.test test/elf/Mips/plt-header-mixed.test test/elf/Mips/plt-header.test test/elf/Mips/rel-dynamic-01.test test/elf/Mips/rel-dynamic-03.test
Index: test/elf/Mips/rel-dynamic-03.test =================================================================== --- test/elf/Mips/rel-dynamic-03.test +++ test/elf/Mips/rel-dynamic-03.test @@ -24,7 +24,7 @@ # PLT-NEXT: 400164: 00 20 99 8f lw $25, 8192($gp) # PLT-NEXT: 400168: 00 20 9c 27 addiu $gp, $gp, 8192 # 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: 400178: 09 f8 20 03 jalr $25 # PLT-NEXT: 40017c: fe ff 18 27 addiu $24, $24, -2 Index: test/elf/Mips/rel-dynamic-01.test =================================================================== --- test/elf/Mips/rel-dynamic-01.test +++ test/elf/Mips/rel-dynamic-01.test @@ -23,7 +23,7 @@ # PLT-NEXT: 4001f4: 00 20 99 8f lw $25, 8192($gp) # PLT-NEXT: 4001f8: 00 20 9c 27 addiu $gp, $gp, 8192 # 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: 400208: 09 f8 20 03 jalr $25 # PLT-NEXT: 40020c: fe ff 18 27 addiu $24, $24, -2 Index: test/elf/Mips/plt-header.test =================================================================== --- test/elf/Mips/plt-header.test +++ test/elf/Mips/plt-header.test @@ -19,7 +19,7 @@ # EXE-NEXT: 400164: 00 20 99 8f lw $25, 8192($gp) # EXE-NEXT: 400168: 00 20 9c 27 addiu $gp, $gp, 8192 # 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: 400178: 09 f8 20 03 jalr $25 # EXE-NEXT: 40017c: fe ff 18 27 addiu $24, $24, -2 Index: test/elf/Mips/plt-header-mixed.test =================================================================== --- test/elf/Mips/plt-header-mixed.test +++ test/elf/Mips/plt-header-mixed.test @@ -20,7 +20,7 @@ # DIS-NEXT: 400174: 00 20 99 8f lw $25, 8192($gp) # DIS-NEXT: 400178: 00 20 9c 27 addiu $gp, $gp, 8192 # 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: 400188: 09 f8 20 03 jalr $25 # DIS-NEXT: 40018c: fe ff 18 27 addiu $24, $24, -2 Index: test/elf/Mips/plt-header-be.test =================================================================== --- test/elf/Mips/plt-header-be.test +++ test/elf/Mips/plt-header-be.test @@ -17,7 +17,7 @@ # CHECK-NEXT: 400164: 8f 99 20 00 lw $25, 8192($gp) # CHECK-NEXT: 400168: 27 9c 20 00 addiu $gp, $gp, 8192 # 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: 400178: 03 20 f8 09 jalr $25 # CHECK-NEXT: 40017c: 27 18 ff fe addiu $24, $24, -2 Index: test/elf/Mips/plt-entry-r6.test =================================================================== --- test/elf/Mips/plt-entry-r6.test +++ test/elf/Mips/plt-entry-r6.test @@ -17,7 +17,7 @@ # CHECK-NEXT: 400164: 00 20 99 8f lw $25, 8192($gp) # CHECK-NEXT: 400168: 00 20 9c 27 addiu $gp, $gp, 8192 # 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: 400178: 09 f8 20 03 jalr $25 # CHECK-NEXT: 40017c: fe ff 18 27 addiu $24, $24, -2 Index: test/elf/Mips/plt-entry-r6-be.test =================================================================== --- test/elf/Mips/plt-entry-r6-be.test +++ test/elf/Mips/plt-entry-r6-be.test @@ -17,7 +17,7 @@ # CHECK-NEXT: 400164: 8f 99 20 00 lw $25, 8192($gp) # CHECK-NEXT: 400168: 27 9c 20 00 addiu $gp, $gp, 8192 # 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: 400178: 03 20 f8 09 jalr $25 # CHECK-NEXT: 40017c: 27 18 ff fe addiu $24, $24, -2 Index: test/elf/Mips/plt-entry-mixed-1.test =================================================================== --- test/elf/Mips/plt-entry-mixed-1.test +++ test/elf/Mips/plt-entry-mixed-1.test @@ -21,7 +21,7 @@ # CHECK-NEXT: 400174: 00 20 99 8f lw $25, 8192($gp) # CHECK-NEXT: 400178: 00 20 9c 27 addiu $gp, $gp, 8192 # 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: 400188: 09 f8 20 03 jalr $25 # CHECK-NEXT: 40018c: fe ff 18 27 addiu $24, $24, -2 Index: lib/ReaderWriter/ELF/Mips/MipsRelocationPass.cpp =================================================================== --- lib/ReaderWriter/ELF/Mips/MipsRelocationPass.cpp +++ lib/ReaderWriter/ELF/Mips/MipsRelocationPass.cpp @@ -43,7 +43,7 @@ 0x8f, 0x99, 0x00, 0x00, // lw $25, %lo(&GOTPLT[0])($28) 0x27, 0x9c, 0x00, 0x00, // addiu $28, $28, %lo(&GOTPLT[0]) 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 0x03, 0x20, 0xf8, 0x09, // jalr $25 0x27, 0x18, 0xff, 0xfe // subu $24, $24, 2 @@ -55,7 +55,7 @@ 0x00, 0x00, 0x99, 0x8f, // lw $25, %lo(&GOTPLT[0])($28) 0x00, 0x00, 0x9c, 0x27, // addiu $28, $28, %lo(&GOTPLT[0]) 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 0x09, 0xf8, 0x20, 0x03, // jalr $25 0xfe, 0xff, 0x18, 0x27 // subu $24, $24, 2
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
