From: "S, Pitchumani" <Pitchumani.S@atmel.com>
To: "binutils@sourceware.org" <binutils@sourceware.org>
Cc: "chertykov@gmail.com" <chertykov@gmail.com>
Subject: [patch,avr] device specific instruction support for avr devices
Date: Mon, 03 Mar 2014 05:50:00 -0000 [thread overview]
Message-ID: <CAC140656783604CABA6AE60C2A6D5A46ADED349@penmbx01> (raw)
[-- Attachment #1: Type: text/plain, Size: 1567 bytes --]
Hi,
Few AVR Xmega devices have specific instruction support than the architecture
it belongs to. For example atxmega128b1 device has RMW instructions (XCH,LAC,
LAS and LAT) support, but not all avrxmega6 devices have.
Now, avr-gcc passes architecture name to assembler instead of device name. So,
RMW instructions are not recognized (illegal opcode error) by assembler.
I have attached a patch to address this issue in assembler.
- It adds a option '-mrmw' to assembler.
- Based on -mrmw option device specific instructions are added to current
instruction set (mcu_types[i].isa | AVR_ISA_RMW)
Now assembler can recognize rmw instructions for respective devices.
It is necessary to update gcc to pass -mrmw option to assembler if the
selected device has rmw instructions. I'll send a patch for gcc as well.
Please review the attached patch and give your suggestions.
Thanks,
Pitchumani
gas/ChangeLog
2014-02-25 Pitchumani Sivanupandi <pitchumani.s@atmel.com>
* config/tc-avr.c: Add specified_mcu variable for selected mcu.
(enum options): add OPTION_RMW_ISA for -mrmw option.
(struct option md_longopts): Add mrmw option.
(md_show_usage): add -mrmw option description.
(md_parse_option): Update isa details if -mrmw option specified.
* doc/c-avr.texi: Add doc for new option -mrmw.
gas/testsuite/ChangeLog
2014-02-25 Pitchumani Sivanupandi <pitchumani.s@atmel.com>
* gas/avr/avr.exp: Run new tests.
* gas/avr/rmw.d: Add test for additional ISA support.
* gas/avr/rmw.s: Ditto.
[-- Attachment #2: device-specific-isa-avr-as.patch --]
[-- Type: application/octet-stream, Size: 5248 bytes --]
diff --git a/gas/config/tc-avr.c b/gas/config/tc-avr.c
index 332aa2d..bc57a31 100644
--- a/gas/config/tc-avr.c
+++ b/gas/config/tc-avr.c
@@ -283,8 +283,10 @@ static struct mcu_type_s mcu_types[] =
{NULL, 0, 0}
};
+
/* Current MCU type. */
static struct mcu_type_s default_mcu = {"avr2", AVR_ISA_AVR2, bfd_mach_avr2};
+static struct mcu_type_s specified_mcu;
static struct mcu_type_s * avr_mcu = & default_mcu;
/* AVR target-specific switches. */
@@ -355,7 +357,8 @@ enum options
{
OPTION_ALL_OPCODES = OPTION_MD_BASE + 1,
OPTION_NO_SKIP_BUG,
- OPTION_NO_WRAP
+ OPTION_NO_WRAP,
+ OPTION_RMW_ISA
};
struct option md_longopts[] =
@@ -364,6 +367,7 @@ struct option md_longopts[] =
{ "mall-opcodes", no_argument, NULL, OPTION_ALL_OPCODES },
{ "mno-skip-bug", no_argument, NULL, OPTION_NO_SKIP_BUG },
{ "mno-wrap", no_argument, NULL, OPTION_NO_WRAP },
+ { "mrmw", no_argument, NULL, OPTION_RMW_ISA },
{ NULL, no_argument, NULL, 0 }
};
@@ -468,7 +472,9 @@ md_show_usage (FILE *stream)
" -mno-skip-bug disable warnings for skipping two-word instructions\n"
" (default for avr4, avr5)\n"
" -mno-wrap reject rjmp/rcall instructions with 8K wrap-around\n"
- " (default for avr3, avr5)\n"));
+ " (default for avr3, avr5)\n"
+ " -mrmw accept RMW instructions\n"
+ ));
show_mcu_list (stream);
}
@@ -515,7 +521,12 @@ md_parse_option (int c, char *arg)
type - this for allows passing -mmcu=... via gcc ASM_SPEC as well
as .arch ... in the asm output at the same time. */
if (avr_mcu == &default_mcu || avr_mcu->mach == mcu_types[i].mach)
- avr_mcu = &mcu_types[i];
+ {
+ specified_mcu.name = mcu_types[i].name;
+ specified_mcu.isa |= mcu_types[i].isa;
+ specified_mcu.mach = mcu_types[i].mach;
+ avr_mcu = &specified_mcu;
+ }
else
as_fatal (_("redefinition of mcu type `%s' to `%s'"),
avr_mcu->name, mcu_types[i].name);
@@ -530,6 +541,9 @@ md_parse_option (int c, char *arg)
case OPTION_NO_WRAP:
avr_opt.no_wrap = 1;
return 1;
+ case OPTION_RMW_ISA:
+ specified_mcu.isa |= AVR_ISA_RMW;
+ return 1;
}
return 0;
diff --git a/gas/doc/c-avr.texi b/gas/doc/c-avr.texi
index 213e82c..603d755 100644
--- a/gas/doc/c-avr.texi
+++ b/gas/doc/c-avr.texi
@@ -125,6 +125,10 @@ This option disable warnings for skipping two-word instructions.
@item -mno-wrap
This option reject @code{rjmp/rcall} instructions with 8K wrap-around.
+@cindex @code{-mrmw} command line option, AVR
+@item -mrmw
+Accept RMW (@code{XCH,LAC,LAS,LAT}) instructions.
+
@end table
diff --git a/gas/testsuite/gas/avr/avr.exp b/gas/testsuite/gas/avr/avr.exp
new file mode 100644
index 0000000..fc90f9f
--- /dev/null
+++ b/gas/testsuite/gas/avr/avr.exp
@@ -0,0 +1,24 @@
+# Copyright 2014
+# Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+
+#
+# Some AVR tests
+#
+
+if {[istarget avr-*-*]} {
+ run_dump_tests [lsort [glob -nocomplain $srcdir/$subdir/*.d]]
+}
diff --git a/gas/testsuite/gas/avr/rmw.d b/gas/testsuite/gas/avr/rmw.d
new file mode 100644
index 0000000..48554e1
--- /dev/null
+++ b/gas/testsuite/gas/avr/rmw.d
@@ -0,0 +1,23 @@
+#name: AVR RMW instructions
+#as: -mmcu=avrxmega2 -mrmw
+#objdump: -dr --show-raw-insn
+#target: avr-*-*
+
+.*: +file format elf32-avr
+
+Disassembly of section .text:
+
+00000000 <main>:
+ 0: cf 93 push r28
+ 2: df 93 push r29
+ 4: cd b7 in r28, 0x3d ; 61
+ 6: de b7 in r29, 0x3e ; 62
+ 8: c4 92 xch Z, r12
+ a: c5 92 las Z, r12
+ c: c6 92 lac Z, r12
+ e: c7 92 lat Z, r12
+ 10: 80 e0 ldi r24, 0x00 ; 0
+ 12: 90 e0 ldi r25, 0x00 ; 0
+ 14: df 91 pop r29
+ 16: cf 91 pop r28
+ 18: 08 95 ret
diff --git a/gas/testsuite/gas/avr/rmw.s b/gas/testsuite/gas/avr/rmw.s
new file mode 100644
index 0000000..fca39c9
--- /dev/null
+++ b/gas/testsuite/gas/avr/rmw.s
@@ -0,0 +1,32 @@
+ .file "rmw.s"
+__SP_H__ = 0x3e
+__SP_L__ = 0x3d
+__SREG__ = 0x3f
+__CCP__ = 0x34
+__tmp_reg__ = 0
+__zero_reg__ = 1
+ .text
+.global main
+ .type main, @function
+main:
+ push r28
+ push r29
+ in r28,__SP_L__
+ in r29,__SP_H__
+/* prologue: function */
+/* frame size = 0 */
+/* stack size = 2 */
+.L__stack_usage = 2
+/* #APP */
+ xch Z, r12
+ las Z, r12
+ lac Z, r12
+ lat Z, r12
+/* #NOAPP */
+ ldi r24,0
+ ldi r25,0
+/* epilogue start */
+ pop r29
+ pop r28
+ ret
+ .size main, .-main
next reply other threads:[~2014-03-03 5:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-03 5:50 S, Pitchumani [this message]
2014-03-24 8:23 ` S, Pitchumani
2014-03-25 17:07 ` Denis Chertykov
2014-03-27 5:07 ` S, Pitchumani
2014-03-29 5:55 ` Denis Chertykov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAC140656783604CABA6AE60C2A6D5A46ADED349@penmbx01 \
--to=pitchumani.s@atmel.com \
--cc=binutils@sourceware.org \
--cc=chertykov@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).