public inbox for binutils@sourceware.org
 help / color / mirror / Atom feed
From: "Maciej W. Rozycki" <macro@linux-mips.org>
To: Alan Modra <amodra@bigpond.net.au>, binutils@sourceware.org
Subject: [PATCH] MIPS/gas: ERET test case failure fixes
Date: Sat, 12 Sep 2009 22:14:00 -0000	[thread overview]
Message-ID: <alpine.LFD.2.00.0909111141220.12448@eddie.linux-mips.org> (raw)

Hi,

 Here's a fix for the MIPS ERET test case failures observed by Alan:

> mips64-linux/log0:FAIL: MIPS eret-1 disassembly
> mips64-linux/log0:FAIL: MIPS eret-2 disassembly
> mips64-linux/log0:FAIL: MIPS eret-3 disassembly

These were caused by an incompatible 64-bit ABI used with the 24Kc 
processor.  And then by missing padding at the end to address alignment 
differences among MIPS targets (also seen with 32-bit MIPS/Linux targets).

 Fixed thus in line with other test cases.  This took longer than I 
expected, because I had to extract these bits from a larger patch, which I 
forgot that was the case; sorry about that.  I'll submit the rest 
separately, together with a couple of other patches.

2009-09-12  Maciej W. Rozycki  <macro@linux-mips.org>

	* gas/mips/eret-1.s: Add trailing padding.
	* gas/mips/eret-2.s: Likewise.
	* gas/mips/eret-3.s: Likewise.
	* gas/mips/eret-1.d: Adjust accordingly.  Force a 32-bit ABI.
	* gas/mips/eret-2.d: Likewise.
	* gas/mips/eret-3.d: Likewise.

 Regression tested for the mipsel-linux and mips64-linux targets.  OK to 
apply to the trunk?  As a testsuite fix I don't insist on propagating it 
to 2.20, although there will be no harm from doing so.

  Maciej

binutils-2.20.51-mips-gas-test-eret-fill.patch
Index: binutils-2.20.51-mipsel/gas/testsuite/gas/mips/eret-1.d
===================================================================
--- binutils-2.20.51-mipsel.orig/gas/testsuite/gas/mips/eret-1.d
+++ binutils-2.20.51-mipsel/gas/testsuite/gas/mips/eret-1.d
@@ -1,6 +1,6 @@
 #objdump: -d
 #name: MIPS eret-1 disassembly
-#as: -mfix-24k -march=24kc --no-warn
+#as: -mabi=32 -mfix-24k -march=24kc --no-warn
 
 .*\.o:     file format .*mips.*
 
@@ -39,3 +39,4 @@ Disassembly of section \.text:
   74:	240c0003 	li	t4,3
   78:	240c0003 	li	t4,3
   7c:	42000018 	eret
+	\.\.\.
Index: binutils-2.20.51-mipsel/gas/testsuite/gas/mips/eret-1.s
===================================================================
--- binutils-2.20.51-mipsel.orig/gas/testsuite/gas/mips/eret-1.s
+++ binutils-2.20.51-mipsel/gas/testsuite/gas/mips/eret-1.s
@@ -25,3 +25,6 @@
 	li $t4, 3
 1:	li $t4, 3
 	eret
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+        .space	8
Index: binutils-2.20.51-mipsel/gas/testsuite/gas/mips/eret-2.d
===================================================================
--- binutils-2.20.51-mipsel.orig/gas/testsuite/gas/mips/eret-2.d
+++ binutils-2.20.51-mipsel/gas/testsuite/gas/mips/eret-2.d
@@ -1,6 +1,6 @@
 #objdump: -d
 #name: MIPS eret-2 disassembly
-#as: -mfix-24k -march=24kc --no-warn
+#as: -mabi=32 -mfix-24k -march=24kc --no-warn
 
 .*\.o:     file format .*mips.*
 
@@ -14,3 +14,5 @@ Disassembly of section \.text:
   10:	42000018 	eret
   14:	00000000 	nop
   18:	1000fffd 	b	0x10
+  1c:	00000000 	nop
+	\.\.\.
Index: binutils-2.20.51-mipsel/gas/testsuite/gas/mips/eret-2.s
===================================================================
--- binutils-2.20.51-mipsel.orig/gas/testsuite/gas/mips/eret-2.s
+++ binutils-2.20.51-mipsel/gas/testsuite/gas/mips/eret-2.s
@@ -7,3 +7,6 @@
 	.set	noreorder
 	b	1b
 	.set	reorder
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+        .space	8
Index: binutils-2.20.51-mipsel/gas/testsuite/gas/mips/eret-3.d
===================================================================
--- binutils-2.20.51-mipsel.orig/gas/testsuite/gas/mips/eret-3.d
+++ binutils-2.20.51-mipsel/gas/testsuite/gas/mips/eret-3.d
@@ -1,6 +1,6 @@
 #objdump: -d
 #name: MIPS eret-3 disassembly
-#as: -mfix-24k -march=24kc --no-warn
+#as: -mabi=32 -mfix-24k -march=24kc --no-warn
 
 .*\.o:     file format .*mips.*
 
@@ -16,3 +16,4 @@ Disassembly of section \.text:
   10:	aca40000 	sw	a0,0\(a1\)
   14:	03e00008 	jr	ra
   18:	00000000 	nop
+	\.\.\.
Index: binutils-2.20.51-mipsel/gas/testsuite/gas/mips/eret-3.s
===================================================================
--- binutils-2.20.51-mipsel.orig/gas/testsuite/gas/mips/eret-3.s
+++ binutils-2.20.51-mipsel/gas/testsuite/gas/mips/eret-3.s
@@ -12,3 +12,6 @@ bar:
 1:
 	jr	$31
 	.end	bar
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+        .space	8

             reply	other threads:[~2009-09-12 22:14 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-09-12 22:14 Maciej W. Rozycki [this message]
2009-09-13 18:45 ` Richard Sandiford
2009-09-21 13:11   ` Maciej W. Rozycki

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=alpine.LFD.2.00.0909111141220.12448@eddie.linux-mips.org \
    --to=macro@linux-mips.org \
    --cc=amodra@bigpond.net.au \
    --cc=binutils@sourceware.org \
    /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).