This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[patch] RX alignment nops
- From: DJ Delorie <dj at redhat dot com>
- To: binutils at sourceware dot org
- Date: Fri, 2 Jul 2010 16:40:38 -0400
- Subject: [patch] RX alignment nops
Self-explanatory. Applied.
* config/tc-rx.h (md_do_align): New.
(MAX_MEM_FOR_RS_ALIGN_CODE): New.
* config/tc-rx.c (nops): New.
(rx_handle_align): Use various sized nops to align code.
Index: config/tc-rx.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-rx.c,v
retrieving revision 1.3
diff -p -U3 -r1.3 config/tc-rx.c
--- config/tc-rx.c 2 Jul 2010 20:24:23 -0000 1.3
+++ config/tc-rx.c 2 Jul 2010 20:39:45 -0000
@@ -1119,11 +1119,51 @@ md_section_align (segT segment, valueT s
return ((size + (1 << align) - 1) & (-1 << align));
}
+ /* NOP - 1 cycle */
+static unsigned char nop_1[] = { 0x03};
+ /* MOV.L R0,R0 - 1 cycle */
+static unsigned char nop_2[] = { 0xef, 0x00};
+ /* MAX R0,R0 - 1 cycle */
+static unsigned char nop_3[] = { 0xfc, 0x13, 0x00 };
+ /* MUL #1,R0 - 1 cycle */
+static unsigned char nop_4[] = { 0x76, 0x10, 0x01, 0x00 };
+ /* MUL #1,R0 - 1 cycle */
+static unsigned char nop_5[] = { 0x77, 0x10, 0x01, 0x00, 0x00 };
+ /* MUL #1,R0 - 1 cycle */
+static unsigned char nop_6[] = { 0x74, 0x10, 0x01, 0x00, 0x00, 0x00 };
+ /* BRA.S .+7 - 1 cycle */
+static unsigned char nop_7[] = { 0x0F, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03 };
+
+static unsigned char *nops[] = { NULL, nop_1, nop_2, nop_3, nop_4, nop_5, nop_6, nop_7 };
+#define BIGGEST_NOP 7
+
/* When relaxing, we need to output a reloc for any .align directive
so that we can retain this alignment as we adjust opcode sizes. */
void
rx_handle_align (fragS * frag)
{
+ if ((frag->fr_type == rs_align
+ || frag->fr_type == rs_align_code)
+ && subseg_text_p (now_seg))
+ {
+ int count = (frag->fr_next->fr_address
+ - frag->fr_address
+ - frag->fr_fix);
+ unsigned char *base = (unsigned char *)frag->fr_literal + frag->fr_fix;
+
+ if (count > BIGGEST_NOP)
+ {
+ base[0] = 0x2e;
+ base[1] = count;
+ frag->fr_var = 2;
+ }
+ else if (count > 0)
+ {
+ memcpy (base, nops[count], count);
+ frag->fr_var = count;
+ }
+ }
+
if (linkrelax
&& (frag->fr_type == rs_align
|| frag->fr_type == rs_align_code)
Index: config/tc-rx.h
===================================================================
RCS file: /cvs/src/src/gas/config/tc-rx.h,v
retrieving revision 1.1
diff -p -U3 -r1.1 config/tc-rx.h
--- config/tc-rx.h 29 Sep 2009 14:17:08 -0000 1.1
+++ config/tc-rx.h 2 Jul 2010 20:39:45 -0000
@@ -75,6 +75,18 @@ extern void rx_cons_fix_new (fragS *, in
#define tc_fix_adjustable(x) 0
+#define md_do_align(n, fill, len, max, around) \
+ if ((n) \
+ && !need_pass_2 \
+ && (!(fill) \
+ || ((char)*(fill) == (char)0x03 && (len) == 1)) \
+ && subseg_text_p (now_seg)) \
+ { \
+ frag_align_code ((n), (max)); \
+ goto around; \
+ }
+
+#define MAX_MEM_FOR_RS_ALIGN_CODE 8
#define HANDLE_ALIGN(FRAG) rx_handle_align (FRAG)
extern void rx_handle_align (fragS *);