diff options
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/testsuite/ld-avr/lds-mega.d | 23 | ||||
| -rw-r--r-- | ld/testsuite/ld-avr/lds-mega.s | 20 | ||||
| -rw-r--r-- | ld/testsuite/ld-avr/lds-tiny.d | 18 | ||||
| -rw-r--r-- | ld/testsuite/ld-avr/lds-tiny.s | 14 | ||||
| -rw-r--r-- | opcodes/ChangeLog | 5 | ||||
| -rw-r--r-- | opcodes/avr-dis.c | 14 |
7 files changed, 96 insertions, 4 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 1e28252cb62..cbb98e3dee4 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2016-06-09 Pitchumani Sivanupandi <pitchumani.s@atmel.com> + * testsuite/ld-avr/lds-mega.d: New test. + * testsuite/ld-avr/lds-mega.s: New test source. + * testsuite/ld-avr/lds-tiny.d: New test. + * testsuite/ld-avr/lds-tiny.s: New test source. + 2016-06-08 H.J. Lu <hongjiu.lu@intel.com> * testsuite/ld-x86-64/tls.exp (run_cc_link_tests): Update test diff --git a/ld/testsuite/ld-avr/lds-mega.d b/ld/testsuite/ld-avr/lds-mega.d new file mode 100644 index 00000000000..078bf73807a --- /dev/null +++ b/ld/testsuite/ld-avr/lds-mega.d @@ -0,0 +1,23 @@ +#name: AVR (avr51) check disassembly if symbolic name present +#as: -mavr51 +#ld: -mavr51 +#source: lds-mega.s +#objdump: -d +#target: avr-*-* + +.*: file format elf32-avr + + +Disassembly of section .text: + +00000000 <main>: + 0: 80 91 00 01 lds r24, 0x0100 ; 0x800100 <_edata> + 4: 08 2e mov r0, r24 + 6: 00 0c add r0, r0 + 8: 99 0b sbc r25, r25 + a: 90 93 03 01 sts 0x0103, r25 ; 0x800103 <myvar2\+0x1> + e: 80 93 02 01 sts 0x0102, r24 ; 0x800102 <myvar2> + 12: 80 e0 ldi r24, 0x00 ; 0 + 14: 90 e0 ldi r25, 0x00 ; 0 + 16: 08 95 ret + diff --git a/ld/testsuite/ld-avr/lds-mega.s b/ld/testsuite/ld-avr/lds-mega.s new file mode 100644 index 00000000000..6f6e0df8f82 --- /dev/null +++ b/ld/testsuite/ld-avr/lds-mega.s @@ -0,0 +1,20 @@ + .file "lds-mega.s" +__tmp_reg__ = 0 + .text +.global main + .type main, @function +main: +.L__stack_usage = 0 + lds r24,256 + mov __tmp_reg__,r24 + lsl r0 + sbc r25,r25 + sts myvar2+1,r25 + sts myvar2,r24 + ldi r24,0 + ldi r25,0 + ret + .size main, .-main + .comm myvar2,2,1 + .comm myvar1,2,1 + diff --git a/ld/testsuite/ld-avr/lds-tiny.d b/ld/testsuite/ld-avr/lds-tiny.d new file mode 100644 index 00000000000..405546ad0a7 --- /dev/null +++ b/ld/testsuite/ld-avr/lds-tiny.d @@ -0,0 +1,18 @@ +#name: AVR (avrtiny) check disassembly if symbolic name present +#as: -mavrtiny +#ld: -mavrtiny +#objdump: -d +#source: lds-tiny.s +#target: avr-*-* + +.*: file format elf32-avr + + +Disassembly of section .text: + +00000000 <main>: + 0: 20 a1 lds r18, 0x40 ; 0x800040 <_edata> + 2: 42 a1 lds r20, 0x42 ; 0x800042 <myvar2\+0x1> + 4: 53 a1 lds r21, 0x43 ; 0x800043 <_end> + 6: 08 95 ret + diff --git a/ld/testsuite/ld-avr/lds-tiny.s b/ld/testsuite/ld-avr/lds-tiny.s new file mode 100644 index 00000000000..5e341416845 --- /dev/null +++ b/ld/testsuite/ld-avr/lds-tiny.s @@ -0,0 +1,14 @@ + .file "lds-tiny.s" + .text +.global main + .type main, @function +main: +.L__stack_usage = 0 + lds r18, 0x40 + lds r20, 0x42 + lds r21, 0x43 + ret + .size main, .-main + .comm myvar1,1,1 + .comm myvar2,2,1 + diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 13d35e0c9b6..f218365606d 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2016-06-03 Pitchumani Sivanupandi <pitchumani.s@atmel.com> + + * avr-dis.c (avr_operand): Add default data address space origin (0x800000) + to the address and set as symbol address for LDS/ STS immediate operands. + 2016-06-07 Alan Modra <amodra@gmail.com> * ppc-dis.c (ppc_opts): Delete extraneous parentheses. Default diff --git a/opcodes/avr-dis.c b/opcodes/avr-dis.c index 3b783fb8e4f..748cb2dbb6e 100644 --- a/opcodes/avr-dis.c +++ b/opcodes/avr-dis.c @@ -184,17 +184,23 @@ avr_operand (unsigned int insn, unsigned int insn2, unsigned int pc, int constra break; case 'i': - sprintf (buf, "0x%04X", insn2); + { + unsigned int val = insn2 | 0x800000; + *sym = 1; + *sym_addr = val; + sprintf (buf, "0x%04X", insn2); + strcpy (comment, comment_start); + } break; case 'j': { unsigned int val = ((insn & 0xf) | ((insn & 0x600) >> 5) | ((insn & 0x100) >> 2)); - if (val > 0 && !(insn & 0x100)) - val |= 0x80; + *sym = 1; + *sym_addr = val | 0x800000; sprintf (buf, "0x%02x", val); - sprintf (buf, "%d", val); + strcpy (comment, comment_start); } break; |