[llvm] e6c55fb - Fixup AVR tests to reflect changes in addend format in llvm-objdump

David Bozier via llvm-commits llvm-commits at lists.llvm.org
Tue Nov 19 07:33:16 PST 2019


Author: David Bozier
Date: 2019-11-19T15:32:58Z
New Revision: e6c55fbe0199f1e8db3ca00f5461a3f7dd66f178

URL: https://github.com/llvm/llvm-project/commit/e6c55fbe0199f1e8db3ca00f5461a3f7dd66f178
DIFF: https://github.com/llvm/llvm-project/commit/e6c55fbe0199f1e8db3ca00f5461a3f7dd66f178.diff

LOG: Fixup AVR tests to reflect changes in addend format in llvm-objdump

Summary: Changes to llvm-objdump made in D69997

Reviewers: thakis, jhenderson, grimar

Reviewed By: thakis

Subscribers: dylanmckay, Jim, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D70438

Added: 
    

Modified: 
    llvm/test/MC/AVR/out-of-range-fixups/adiw-pass.s
    llvm/test/MC/AVR/out-of-range-fixups/brbs-pass.s
    llvm/test/MC/AVR/out-of-range-fixups/call-pass.s
    llvm/test/MC/AVR/out-of-range-fixups/in-pass.s
    llvm/test/MC/AVR/out-of-range-fixups/lds-pass.s
    llvm/test/MC/AVR/out-of-range-fixups/rjmp-pass.s
    llvm/test/MC/AVR/out-of-range-fixups/sbi-pass.s
    llvm/test/MC/AVR/relocations.s

Removed: 
    


################################################################################
diff  --git a/llvm/test/MC/AVR/out-of-range-fixups/adiw-pass.s b/llvm/test/MC/AVR/out-of-range-fixups/adiw-pass.s
index 27bd351764d4..fbc105ec34c1 100644
--- a/llvm/test/MC/AVR/out-of-range-fixups/adiw-pass.s
+++ b/llvm/test/MC/AVR/out-of-range-fixups/adiw-pass.s
@@ -1,5 +1,5 @@
 ; RUN: llvm-mc -triple avr -mattr=avr6 -filetype=obj < %s | llvm-objdump -r - | FileCheck %s
 
-; CHECK: R_AVR_6_ADIW foo+63
+; CHECK: R_AVR_6_ADIW foo+0x3f
 adiw r24, foo+63
 

diff  --git a/llvm/test/MC/AVR/out-of-range-fixups/brbs-pass.s b/llvm/test/MC/AVR/out-of-range-fixups/brbs-pass.s
index 2a9e1554b9f0..86e5f9071f18 100644
--- a/llvm/test/MC/AVR/out-of-range-fixups/brbs-pass.s
+++ b/llvm/test/MC/AVR/out-of-range-fixups/brbs-pass.s
@@ -1,5 +1,5 @@
 ; RUN: llvm-mc -triple avr -mattr=avr6 -filetype=obj < %s | llvm-objdump -r - | FileCheck %s
 
-; CHECK: R_AVR_7_PCREL foo+127
+; CHECK: R_AVR_7_PCREL foo+0x7f
 brbs 1, foo+127
 

diff  --git a/llvm/test/MC/AVR/out-of-range-fixups/call-pass.s b/llvm/test/MC/AVR/out-of-range-fixups/call-pass.s
index 97c48b647679..f9aa6b40a8d3 100644
--- a/llvm/test/MC/AVR/out-of-range-fixups/call-pass.s
+++ b/llvm/test/MC/AVR/out-of-range-fixups/call-pass.s
@@ -1,5 +1,5 @@
 ; RUN: llvm-mc -triple avr -mattr=avr6 -filetype=obj < %s 2>&1 | llvm-objdump -r - | FileCheck %s
 
-; CHECK: R_AVR_CALL foo+8388607
+; CHECK: R_AVR_CALL foo+0x7fffff
 jmp foo+8388607
 

diff  --git a/llvm/test/MC/AVR/out-of-range-fixups/in-pass.s b/llvm/test/MC/AVR/out-of-range-fixups/in-pass.s
index 374bbd8e9c85..cc4b6f85cf51 100644
--- a/llvm/test/MC/AVR/out-of-range-fixups/in-pass.s
+++ b/llvm/test/MC/AVR/out-of-range-fixups/in-pass.s
@@ -1,5 +1,5 @@
 ; RUN: llvm-mc -triple avr -mattr=avr6 -filetype=obj < %s | llvm-objdump -r - | FileCheck %s
 
-; CHECK: R_AVR_PORT6 foo+63
+; CHECK: R_AVR_PORT6 foo+0x3f
 in r3, foo+63
 

diff  --git a/llvm/test/MC/AVR/out-of-range-fixups/lds-pass.s b/llvm/test/MC/AVR/out-of-range-fixups/lds-pass.s
index 6cbdb09bdebc..24fc99a10876 100644
--- a/llvm/test/MC/AVR/out-of-range-fixups/lds-pass.s
+++ b/llvm/test/MC/AVR/out-of-range-fixups/lds-pass.s
@@ -1,5 +1,5 @@
 ; RUN: llvm-mc -triple avr -mattr=avr6 -filetype=obj < %s | llvm-objdump -r - | FileCheck %s
 
-; CHECK: R_AVR_16 foo+65535
+; CHECK: R_AVR_16 foo+0xffff
 lds r2, foo+65535
 

diff  --git a/llvm/test/MC/AVR/out-of-range-fixups/rjmp-pass.s b/llvm/test/MC/AVR/out-of-range-fixups/rjmp-pass.s
index 1153d5123acb..125939cea8d7 100644
--- a/llvm/test/MC/AVR/out-of-range-fixups/rjmp-pass.s
+++ b/llvm/test/MC/AVR/out-of-range-fixups/rjmp-pass.s
@@ -1,5 +1,5 @@
 ; RUN: llvm-mc -triple avr -mattr=avr6 -filetype=obj < %s | llvm-objdump -r - | FileCheck %s
 
-; CHECK: R_AVR_13_PCREL foo+4095
+; CHECK: R_AVR_13_PCREL foo+0xfff
 rjmp foo+4095
 

diff  --git a/llvm/test/MC/AVR/out-of-range-fixups/sbi-pass.s b/llvm/test/MC/AVR/out-of-range-fixups/sbi-pass.s
index e4e91fe66a83..958239ca6de5 100644
--- a/llvm/test/MC/AVR/out-of-range-fixups/sbi-pass.s
+++ b/llvm/test/MC/AVR/out-of-range-fixups/sbi-pass.s
@@ -1,5 +1,5 @@
 ; RUN: llvm-mc -triple avr -mattr=avr6 -filetype=obj < %s | llvm-objdump -r - | FileCheck %s
 
-; CHECK: R_AVR_PORT5 foo+31
+; CHECK: R_AVR_PORT5 foo+0x1f
 sbi foo+31, 1
 

diff  --git a/llvm/test/MC/AVR/relocations.s b/llvm/test/MC/AVR/relocations.s
index ab08d248721d..3d22e5d0bad0 100644
--- a/llvm/test/MC/AVR/relocations.s
+++ b/llvm/test/MC/AVR/relocations.s
@@ -6,31 +6,31 @@
 bar:
   jmp bar
 
-; CHECK: R_AVR_LDI SYMBOL+3
+; CHECK: R_AVR_LDI SYMBOL+0x3
 ldi r21, SYMBOL+3
 
 ; CHECK-NEXT: R_AVR_6_ADIW FOO
 adiw r24, FOO
 
-; CHECK-NEXT: R_AVR_16 BAR+2
+; CHECK-NEXT: R_AVR_16 BAR+0x2
 lds r8, BAR+2
 
 ; CHECK-NEXT: R_AVR_PORT5 foo
 sbic foo, 1
 
-; CHECK-NEXT: R_AVR_PORT6 Bar+2
+; CHECK-NEXT: R_AVR_PORT6 Bar+0x2
 in r30, Bar+2
 
-; CHECK-NEXT: R_AVR_CALL foo+3
+; CHECK-NEXT: R_AVR_CALL foo+0x3
 call foo+3
 
-; CHECK-NEXT: R_AVR_13_PCREL foo-10
+; CHECK-NEXT: R_AVR_13_PCREL foo-0xa
 rjmp foo-10
 
-; CHECK-NEXT: R_AVR_7_PCREL foo+2
+; CHECK-NEXT: R_AVR_7_PCREL foo+0x2
 brcs foo+2
 
-; CHECK-NEXT: R_AVR_LO8_LDI bar+3
+; CHECK-NEXT: R_AVR_LO8_LDI bar+0x3
 ; CHECK-NEXT: R_AVR_LO8_LDI abc
 ; CHECK-NEXT: R_AVR_LO8_LDI abc
 ldi r24, lo8(bar+3)


        


More information about the llvm-commits mailing list