[llvm-commits] [llvm] r136872 - in /llvm/trunk/test: CodeGen/ARM/2010-11-30-reloc-movt.ll MC/ARM/elf-movt.s MC/ARM/elf-reloc-01.ll MC/ARM/elf-reloc-02.ll MC/ARM/elf-reloc-03.ll MC/ARM/elf-thumbfunc-reloc.ll MC/ELF/basic-elf-32.s MC/ELF/call-abs.s MC/ELF/relocation-386.s Scripts/elf-dump
Rafael Espindola
rafael.espindola at gmail.com
Thu Aug 4 07:39:30 PDT 2011
Author: rafael
Date: Thu Aug 4 09:39:30 2011
New Revision: 136872
URL: http://llvm.org/viewvc/llvm-project?rev=136872&view=rev
Log:
Print r_type with the correct number of bits.
Modified:
llvm/trunk/test/CodeGen/ARM/2010-11-30-reloc-movt.ll
llvm/trunk/test/MC/ARM/elf-movt.s
llvm/trunk/test/MC/ARM/elf-reloc-01.ll
llvm/trunk/test/MC/ARM/elf-reloc-02.ll
llvm/trunk/test/MC/ARM/elf-reloc-03.ll
llvm/trunk/test/MC/ARM/elf-thumbfunc-reloc.ll
llvm/trunk/test/MC/ELF/basic-elf-32.s
llvm/trunk/test/MC/ELF/call-abs.s
llvm/trunk/test/MC/ELF/relocation-386.s
llvm/trunk/test/Scripts/elf-dump
Modified: llvm/trunk/test/CodeGen/ARM/2010-11-30-reloc-movt.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2010-11-30-reloc-movt.ll?rev=136872&r1=136871&r2=136872&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2010-11-30-reloc-movt.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2010-11-30-reloc-movt.ll Thu Aug 4 09:39:30 2011
@@ -24,17 +24,17 @@
; OBJ: Relocation 0
; OBJ-NEXT: 'r_offset', 0x00000004
; OBJ-NEXT: 'r_sym', 0x00000007
-; OBJ-NEXT: 'r_type', 0x0000002b
+; OBJ-NEXT: 'r_type', 0x2b
; OBJ: Relocation 1
; OBJ-NEXT: 'r_offset', 0x00000008
; OBJ-NEXT: 'r_sym'
-; OBJ-NEXT: 'r_type', 0x0000002c
+; OBJ-NEXT: 'r_type', 0x2c
; OBJ: # Relocation 2
; OBJ-NEXT: 'r_offset', 0x0000000c
; OBJ-NEXT: 'r_sym', 0x00000008
-; OBJ-NEXT: 'r_type', 0x0000001c
+; OBJ-NEXT: 'r_type', 0x1c
}
Modified: llvm/trunk/test/MC/ARM/elf-movt.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/elf-movt.s?rev=136872&r1=136871&r2=136872&view=diff
==============================================================================
--- llvm/trunk/test/MC/ARM/elf-movt.s (original)
+++ llvm/trunk/test/MC/ARM/elf-movt.s Thu Aug 4 09:39:30 2011
@@ -30,10 +30,10 @@
@ OBJ: Relocation 0
@ OBJ-NEXT: 'r_offset', 0x00000000
@ OBJ-NEXT: 'r_sym'
-@ OBJ-NEXT: 'r_type', 0x0000002d
+@ OBJ-NEXT: 'r_type', 0x2d
@ OBJ: Relocation 1
@ OBJ-NEXT: 'r_offset', 0x00000004
@ OBJ-NEXT: 'r_sym'
-@ OBJ-NEXT: 'r_type', 0x0000002e
+@ OBJ-NEXT: 'r_type', 0x2e
Modified: llvm/trunk/test/MC/ARM/elf-reloc-01.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/elf-reloc-01.ll?rev=136872&r1=136871&r2=136872&view=diff
==============================================================================
--- llvm/trunk/test/MC/ARM/elf-reloc-01.ll (original)
+++ llvm/trunk/test/MC/ARM/elf-reloc-01.ll Thu Aug 4 09:39:30 2011
@@ -63,7 +63,7 @@
;; OBJ: Relocation 1
;; OBJ-NEXT: 'r_offset',
;; OBJ-NEXT: 'r_sym', 0x00000002
-;; OBJ-NEXT: 'r_type', 0x0000002b
+;; OBJ-NEXT: 'r_type', 0x2b
;; OBJ: Symbol 2
;; OBJ-NEXT: '_MergedGlobals'
Modified: llvm/trunk/test/MC/ARM/elf-reloc-02.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/elf-reloc-02.ll?rev=136872&r1=136871&r2=136872&view=diff
==============================================================================
--- llvm/trunk/test/MC/ARM/elf-reloc-02.ll (original)
+++ llvm/trunk/test/MC/ARM/elf-reloc-02.ll Thu Aug 4 09:39:30 2011
@@ -44,7 +44,7 @@
;; OBJ: Relocation 0
;; OBJ-NEXT: 'r_offset',
;; OBJ-NEXT: 'r_sym', 0x00000002
-;; OBJ-NEXT: 'r_type', 0x0000002b
+;; OBJ-NEXT: 'r_type', 0x2b
;; OBJ: Symbol 2
;; OBJ-NEXT: '.L.str'
Modified: llvm/trunk/test/MC/ARM/elf-reloc-03.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/elf-reloc-03.ll?rev=136872&r1=136871&r2=136872&view=diff
==============================================================================
--- llvm/trunk/test/MC/ARM/elf-reloc-03.ll (original)
+++ llvm/trunk/test/MC/ARM/elf-reloc-03.ll Thu Aug 4 09:39:30 2011
@@ -91,7 +91,7 @@
;; OBJ: Relocation 1
;; OBJ-NEXT: 'r_offset',
;; OBJ-NEXT: 'r_sym', 0x0000000c
-;; OBJ-NEXT: 'r_type', 0x0000002b
+;; OBJ-NEXT: 'r_type', 0x2b
;; OBJ: Symbol 12
;; OBJ-NEXT: 'vtable'
Modified: llvm/trunk/test/MC/ARM/elf-thumbfunc-reloc.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/elf-thumbfunc-reloc.ll?rev=136872&r1=136871&r2=136872&view=diff
==============================================================================
--- llvm/trunk/test/MC/ARM/elf-thumbfunc-reloc.ll (original)
+++ llvm/trunk/test/MC/ARM/elf-thumbfunc-reloc.ll Thu Aug 4 09:39:30 2011
@@ -29,7 +29,7 @@
; CHECK: Relocation 0
; CHECK-NEXT: 'r_offset', 0x00000008
; CHECK-NEXT: 'r_sym', 0x00000007
-; CHECK-NEXT: 'r_type', 0x0000000a
+; CHECK-NEXT: 'r_type', 0x0a
; make sure foo is thumb function: bit 0 = 1
; CHECK: Symbol 7
Modified: llvm/trunk/test/MC/ELF/basic-elf-32.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ELF/basic-elf-32.s?rev=136872&r1=136871&r2=136872&view=diff
==============================================================================
--- llvm/trunk/test/MC/ELF/basic-elf-32.s (original)
+++ llvm/trunk/test/MC/ELF/basic-elf-32.s Thu Aug 4 09:39:30 2011
@@ -44,19 +44,19 @@
// CHECK: ('_relocations', [
// CHECK: # Relocation 0
// CHECK: (('r_offset', 0x00000006)
-// CHECK: ('r_type', 0x00000001)
+// CHECK: ('r_type', 0x01)
// CHECK: ),
// CHECK: # Relocation 1
// CHECK: (('r_offset', 0x0000000b)
-// CHECK: ('r_type', 0x00000002)
+// CHECK: ('r_type', 0x02)
// CHECK: ),
// CHECK: # Relocation 2
// CHECK: (('r_offset', 0x00000012)
-// CHECK: ('r_type', 0x00000001)
+// CHECK: ('r_type', 0x01)
// CHECK: ),
// CHECK: # Relocation 3
// CHECK: (('r_offset', 0x00000017)
-// CHECK: ('r_type', 0x00000002)
+// CHECK: ('r_type', 0x02)
// CHECK: ),
// CHECK: ])
Modified: llvm/trunk/test/MC/ELF/call-abs.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ELF/call-abs.s?rev=136872&r1=136871&r2=136872&view=diff
==============================================================================
--- llvm/trunk/test/MC/ELF/call-abs.s (original)
+++ llvm/trunk/test/MC/ELF/call-abs.s Thu Aug 4 09:39:30 2011
@@ -19,6 +19,6 @@
// CHECK-NEXT: # Relocation 0
// CHECK-NEXT: (('r_offset', 0x00000004)
// CHECK-NEXT: ('r_sym', 0x00000000)
-// CHECK-NEXT: ('r_type', 0x00000002)
+// CHECK-NEXT: ('r_type', 0x02)
// CHECK-NEXT: ),
// CHECK-NEXT: ])
Modified: llvm/trunk/test/MC/ELF/relocation-386.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ELF/relocation-386.s?rev=136872&r1=136871&r2=136872&view=diff
==============================================================================
--- llvm/trunk/test/MC/ELF/relocation-386.s (original)
+++ llvm/trunk/test/MC/ELF/relocation-386.s Thu Aug 4 09:39:30 2011
@@ -6,17 +6,17 @@
// CHECK: # Relocation 0
// CHECK-NEXT: (('r_offset', 0x00000002)
// CHECK-NEXT: ('r_sym', 0x00000001)
-// CHECK-NEXT: ('r_type', 0x00000009)
+// CHECK-NEXT: ('r_type', 0x09)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 1
// CHECK-NEXT: (('r_offset',
// CHECK-NEXT: ('r_sym',
-// CHECK-NEXT: ('r_type', 0x00000004)
+// CHECK-NEXT: ('r_type', 0x04)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 2
// CHECK-NEXT: (('r_offset',
// CHECK-NEXT: ('r_sym',
-// CHECK-NEXT: ('r_type', 0x0000000a)
+// CHECK-NEXT: ('r_type', 0x0a)
// CHECK-NEXT: ),
// Relocation 3 (bar3 at GOTOFF) is done with symbol 7 (bss)
@@ -30,135 +30,135 @@
// CHECK-NEXT: # Relocation 4
// CHECK-NEXT: (('r_offset',
// CHECK-NEXT: ('r_sym',
-// CHECK-NEXT: ('r_type', 0x00000003
+// CHECK-NEXT: ('r_type', 0x03
// CHECK-NEXT: ),
// Relocation 5 (foo at TLSGD) is of type R_386_TLS_GD
// CHECK-NEXT: # Relocation 5
// CHECK-NEXT: (('r_offset', 0x00000020)
// CHECK-NEXT: ('r_sym', 0x0000000d)
-// CHECK-NEXT: ('r_type', 0x00000012)
+// CHECK-NEXT: ('r_type', 0x12)
// CHECK-NEXT: ),
// Relocation 6 ($foo at TPOFF) is of type R_386_TLS_LE_32
// CHECK-NEXT: # Relocation 6
// CHECK-NEXT: (('r_offset', 0x00000025)
// CHECK-NEXT: ('r_sym', 0x0000000d)
-// CHECK-NEXT: ('r_type', 0x00000022)
+// CHECK-NEXT: ('r_type', 0x22)
// CHECK-NEXT: ),
// Relocation 7 (foo at INDNTPOFF) is of type R_386_TLS_IE
// CHECK-NEXT: # Relocation 7
// CHECK-NEXT: (('r_offset', 0x0000002b)
// CHECK-NEXT: ('r_sym', 0x0000000d)
-// CHECK-NEXT: ('r_type', 0x0000000f)
+// CHECK-NEXT: ('r_type', 0x0f)
// CHECK-NEXT: ),
// Relocation 8 (foo at NTPOFF) is of type R_386_TLS_LE
// CHECK-NEXT: # Relocation 8
// CHECK-NEXT: (('r_offset', 0x00000031)
// CHECK-NEXT: ('r_sym', 0x0000000d)
-// CHECK-NEXT: ('r_type', 0x00000011)
+// CHECK-NEXT: ('r_type', 0x11)
// CHECK-NEXT: ),
// Relocation 9 (foo at GOTNTPOFF) is of type R_386_TLS_GOTIE
// CHECK-NEXT: # Relocation 9
// CHECK-NEXT: (('r_offset', 0x00000037)
// CHECK-NEXT: ('r_sym', 0x0000000d)
-// CHECK-NEXT: ('r_type', 0x00000010)
+// CHECK-NEXT: ('r_type', 0x10)
// CHECK-NEXT: ),
// Relocation 10 (foo at TLSLDM) is of type R_386_TLS_LDM
// CHECK-NEXT: # Relocation 10
// CHECK-NEXT: (('r_offset', 0x0000003d)
// CHECK-NEXT: ('r_sym', 0x0000000d)
-// CHECK-NEXT: ('r_type', 0x00000013)
+// CHECK-NEXT: ('r_type', 0x13)
// CHECK-NEXT: ),
// Relocation 11 (foo at DTPOFF) is of type R_386_TLS_LDO_32
// CHECK-NEXT: # Relocation 11
// CHECK-NEXT: (('r_offset', 0x00000043)
// CHECK-NEXT: ('r_sym', 0x0000000d)
-// CHECK-NEXT: ('r_type', 0x00000020)
+// CHECK-NEXT: ('r_type', 0x20)
// CHECK-NEXT: ),
// Relocation 12 (calll 4096) is of type R_386_PC32
// CHECK-NEXT: # Relocation 12
// CHECK-NEXT: (('r_offset', 0x00000048)
// CHECK-NEXT: ('r_sym', 0x00000000)
-// CHECK-NEXT: ('r_type', 0x00000002)
+// CHECK-NEXT: ('r_type', 0x02)
// CHECK-NEXT: ),
// Relocation 13 (zed at GOT) is of type R_386_GOT32 and uses the symbol
// CHECK-NEXT: # Relocation 13
// CHECK-NEXT: (('r_offset', 0x0000004e)
// CHECK-NEXT: ('r_sym', 0x00000004)
-// CHECK-NEXT: ('r_type', 0x00000003)
+// CHECK-NEXT: ('r_type', 0x03)
// CHECK-NEXT: ),
// Relocation 14 (zed at GOTOFF) is of type R_386_GOTOFF and uses the symbol
// CHECK-NEXT: # Relocation 14
// CHECK-NEXT: (('r_offset', 0x00000054)
// CHECK-NEXT: ('r_sym', 0x00000004)
-// CHECK-NEXT: ('r_type', 0x00000009)
+// CHECK-NEXT: ('r_type', 0x09)
// CHECK-NEXT: ),
// Relocation 15 (zed at INDNTPOFF) is of type R_386_TLS_IE and uses the symbol
// CHECK-NEXT: # Relocation 15
// CHECK-NEXT: (('r_offset', 0x0000005a)
// CHECK-NEXT: ('r_sym', 0x00000004)
-// CHECK-NEXT: ('r_type', 0x0000000f)
+// CHECK-NEXT: ('r_type', 0x0f)
// CHECK-NEXT: ),
// Relocation 16 (zed at NTPOFF) is of type R_386_TLS_LE and uses the symbol
// CHECK-NEXT: # Relocation 16
// CHECK-NEXT: (('r_offset', 0x00000060)
// CHECK-NEXT: ('r_sym', 0x00000004)
-// CHECK-NEXT: ('r_type', 0x00000011)
+// CHECK-NEXT: ('r_type', 0x11)
// CHECK-NEXT: ),
// Relocation 17 (zed at GOTNTPOFF) is of type R_386_TLS_GOTIE and uses the symbol
// CHECK-NEXT: # Relocation 17
// CHECK-NEXT: (('r_offset', 0x00000066)
// CHECK-NEXT: ('r_sym', 0x00000004)
-// CHECK-NEXT: ('r_type', 0x00000010)
+// CHECK-NEXT: ('r_type', 0x10)
// CHECK-NEXT: ),
// Relocation 18 (zed at PLT) is of type R_386_PLT32 and uses the symbol
// CHECK-NEXT: # Relocation 18
// CHECK-NEXT: (('r_offset', 0x0000006b)
// CHECK-NEXT: ('r_sym', 0x00000004)
-// CHECK-NEXT: ('r_type', 0x00000004)
+// CHECK-NEXT: ('r_type', 0x04)
// CHECK-NEXT: ),
// Relocation 19 (zed at TLSGD) is of type R_386_TLS_GD and uses the symbol
// CHECK-NEXT: # Relocation 19
// CHECK-NEXT: (('r_offset', 0x00000071)
// CHECK-NEXT: ('r_sym', 0x00000004)
-// CHECK-NEXT: ('r_type', 0x00000012)
+// CHECK-NEXT: ('r_type', 0x12)
// CHECK-NEXT: ),
// Relocation 20 (zed at TLSLDM) is of type R_386_TLS_LDM and uses the symbol
// CHECK-NEXT: # Relocation 20
// CHECK-NEXT: (('r_offset', 0x00000077)
// CHECK-NEXT: ('r_sym', 0x00000004)
-// CHECK-NEXT: ('r_type', 0x00000013)
+// CHECK-NEXT: ('r_type', 0x13)
// CHECK-NEXT: ),
// Relocation 21 (zed at TPOFF) is of type R_386_TLS_LE_32 and uses the symbol
// CHECK-NEXT:# Relocation 21
// CHECK-NEXT: (('r_offset', 0x0000007d)
// CHECK-NEXT: ('r_sym', 0x00000004)
-// CHECK-NEXT: ('r_type', 0x00000022)
+// CHECK-NEXT: ('r_type', 0x22)
// CHECK-NEXT: ),
// Relocation 22 (zed at DTPOFF) is of type R_386_TLS_LDO_32 and uses the symbol
// CHECK-NEXT: Relocation 22
// CHECK-NEXT: (('r_offset', 0x00000083)
// CHECK-NEXT: ('r_sym', 0x00000004)
-// CHECK-NEXT: ('r_type', 0x00000020)
+// CHECK-NEXT: ('r_type', 0x20)
// CHECK-NEXT: ),
// Relocation 23 ($bar) is of type R_386_32 and uses the section
// CHECK-NEXT: Relocation 23
// CHECK-NEXT: (('r_offset',
// CHECK-NEXT: ('r_sym',
-// CHECK-NEXT: ('r_type', 0x00000001)
+// CHECK-NEXT: ('r_type', 0x01)
// CHECK-NEXT: ),
// Relocation 24 (foo at GOTTPOFF(%edx)) is of type R_386_TLS_IE_32 and uses the
// symbol
// CHECK-NEXT: Relocation 24
// CHECK-NEXT: (('r_offset', 0x0000008e)
// CHECK-NEXT: ('r_sym', 0x0000000d)
-// CHECK-NEXT: ('r_type', 0x00000021)
+// CHECK-NEXT: ('r_type', 0x21)
// CHECK-NEXT: ),
// Section 4 is bss
Modified: llvm/trunk/test/Scripts/elf-dump
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Scripts/elf-dump?rev=136872&r1=136871&r2=136872&view=diff
==============================================================================
--- llvm/trunk/test/Scripts/elf-dump (original)
+++ llvm/trunk/test/Scripts/elf-dump Thu Aug 4 09:39:30 2011
@@ -122,11 +122,13 @@
print " (('r_offset', %s)" % common_dump.HexDump(f.readWord())
r_info = f.readWord()
if f.is64Bit:
- print " ('r_sym', %s)" % common_dump.HexDump((r_info >> 32))
- print " ('r_type', %s)" % common_dump.HexDump((r_info & 0xffffffff))
+ r_sym = (r_info >> 32, 32)
+ r_type = (r_info & 0xffffffff, 32)
else:
- print " ('r_sym', %s)" % common_dump.HexDump((r_info >> 8))
- print " ('r_type', %s)" % common_dump.HexDump((r_info & 0xff))
+ r_sym = (r_info >> 8, 24)
+ r_type = (r_info & 0xff, 8)
+ print " ('r_sym', %s)" % common_dump.HexDump(r_sym[0], 32)
+ print " ('r_type', %s)" % common_dump.HexDump(r_type[0], r_type[1])
if dumprela:
val = f.readWord()
if f.is64Bit:
More information about the llvm-commits
mailing list