From: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
To: <linux-mips@linux-mips.org>, <macro@linux-mips.org>,
<markos.chandras@imgtec.com>, <ralf@linux-mips.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH] MIPS64: R6: R2 emulation bugfix
Date: Tue, 28 Apr 2015 12:53:35 -0700 [thread overview]
Message-ID: <20150428195335.11229.4516.stgit@ubuntu-yegoshin> (raw)
Error recovery pointers for fixups was improperly set as ".word"
which is unsuitable for MIPS64.
Replaced by __stringify(PTR)
Signed-off-by: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
---
arch/mips/kernel/mips-r2-to-r6-emul.c | 104 +++++++++++++++++----------------
1 file changed, 52 insertions(+), 52 deletions(-)
diff --git a/arch/mips/kernel/mips-r2-to-r6-emul.c b/arch/mips/kernel/mips-r2-to-r6-emul.c
index f2977f00911b..c6f079f8f3dc 100644
--- a/arch/mips/kernel/mips-r2-to-r6-emul.c
+++ b/arch/mips/kernel/mips-r2-to-r6-emul.c
@@ -1250,10 +1250,10 @@ fpu_emul:
" j 10b\n"
" .previous\n"
" .section __ex_table,\"a\"\n"
- " .word 1b,8b\n"
- " .word 2b,8b\n"
- " .word 3b,8b\n"
- " .word 4b,8b\n"
+ __stringify(PTR) " 1b,8b\n"
+ __stringify(PTR) " 2b,8b\n"
+ __stringify(PTR) " 3b,8b\n"
+ __stringify(PTR) " 4b,8b\n"
" .previous\n"
" .set pop\n"
: "+&r"(rt), "=&r"(rs),
@@ -1325,10 +1325,10 @@ fpu_emul:
" j 10b\n"
" .previous\n"
" .section __ex_table,\"a\"\n"
- " .word 1b,8b\n"
- " .word 2b,8b\n"
- " .word 3b,8b\n"
- " .word 4b,8b\n"
+ __stringify(PTR) " 1b,8b\n"
+ __stringify(PTR) " 2b,8b\n"
+ __stringify(PTR) " 3b,8b\n"
+ __stringify(PTR) " 4b,8b\n"
" .previous\n"
" .set pop\n"
: "+&r"(rt), "=&r"(rs),
@@ -1396,10 +1396,10 @@ fpu_emul:
" j 9b\n"
" .previous\n"
" .section __ex_table,\"a\"\n"
- " .word 1b,8b\n"
- " .word 2b,8b\n"
- " .word 3b,8b\n"
- " .word 4b,8b\n"
+ __stringify(PTR) " 1b,8b\n"
+ __stringify(PTR) " 2b,8b\n"
+ __stringify(PTR) " 3b,8b\n"
+ __stringify(PTR) " 4b,8b\n"
" .previous\n"
" .set pop\n"
: "+&r"(rt), "=&r"(rs),
@@ -1466,10 +1466,10 @@ fpu_emul:
" j 9b\n"
" .previous\n"
" .section __ex_table,\"a\"\n"
- " .word 1b,8b\n"
- " .word 2b,8b\n"
- " .word 3b,8b\n"
- " .word 4b,8b\n"
+ __stringify(PTR) " 1b,8b\n"
+ __stringify(PTR) " 2b,8b\n"
+ __stringify(PTR) " 3b,8b\n"
+ __stringify(PTR) " 4b,8b\n"
" .previous\n"
" .set pop\n"
: "+&r"(rt), "=&r"(rs),
@@ -1581,14 +1581,14 @@ fpu_emul:
" j 9b\n"
" .previous\n"
" .section __ex_table,\"a\"\n"
- " .word 1b,8b\n"
- " .word 2b,8b\n"
- " .word 3b,8b\n"
- " .word 4b,8b\n"
- " .word 5b,8b\n"
- " .word 6b,8b\n"
- " .word 7b,8b\n"
- " .word 0b,8b\n"
+ __stringify(PTR) " 1b,8b\n"
+ __stringify(PTR) " 2b,8b\n"
+ __stringify(PTR) " 3b,8b\n"
+ __stringify(PTR) " 4b,8b\n"
+ __stringify(PTR) " 5b,8b\n"
+ __stringify(PTR) " 6b,8b\n"
+ __stringify(PTR) " 7b,8b\n"
+ __stringify(PTR) " 0b,8b\n"
" .previous\n"
" .set pop\n"
: "+&r"(rt), "=&r"(rs),
@@ -1700,14 +1700,14 @@ fpu_emul:
" j 9b\n"
" .previous\n"
" .section __ex_table,\"a\"\n"
- " .word 1b,8b\n"
- " .word 2b,8b\n"
- " .word 3b,8b\n"
- " .word 4b,8b\n"
- " .word 5b,8b\n"
- " .word 6b,8b\n"
- " .word 7b,8b\n"
- " .word 0b,8b\n"
+ __stringify(PTR) " 1b,8b\n"
+ __stringify(PTR) " 2b,8b\n"
+ __stringify(PTR) " 3b,8b\n"
+ __stringify(PTR) " 4b,8b\n"
+ __stringify(PTR) " 5b,8b\n"
+ __stringify(PTR) " 6b,8b\n"
+ __stringify(PTR) " 7b,8b\n"
+ __stringify(PTR) " 0b,8b\n"
" .previous\n"
" .set pop\n"
: "+&r"(rt), "=&r"(rs),
@@ -1819,14 +1819,14 @@ fpu_emul:
" j 9b\n"
" .previous\n"
" .section __ex_table,\"a\"\n"
- " .word 1b,8b\n"
- " .word 2b,8b\n"
- " .word 3b,8b\n"
- " .word 4b,8b\n"
- " .word 5b,8b\n"
- " .word 6b,8b\n"
- " .word 7b,8b\n"
- " .word 0b,8b\n"
+ __stringify(PTR) " 1b,8b\n"
+ __stringify(PTR) " 2b,8b\n"
+ __stringify(PTR) " 3b,8b\n"
+ __stringify(PTR) " 4b,8b\n"
+ __stringify(PTR) " 5b,8b\n"
+ __stringify(PTR) " 6b,8b\n"
+ __stringify(PTR) " 7b,8b\n"
+ __stringify(PTR) " 0b,8b\n"
" .previous\n"
" .set pop\n"
: "+&r"(rt), "=&r"(rs),
@@ -1937,14 +1937,14 @@ fpu_emul:
" j 9b\n"
" .previous\n"
" .section __ex_table,\"a\"\n"
- " .word 1b,8b\n"
- " .word 2b,8b\n"
- " .word 3b,8b\n"
- " .word 4b,8b\n"
- " .word 5b,8b\n"
- " .word 6b,8b\n"
- " .word 7b,8b\n"
- " .word 0b,8b\n"
+ __stringify(PTR) " 1b,8b\n"
+ __stringify(PTR) " 2b,8b\n"
+ __stringify(PTR) " 3b,8b\n"
+ __stringify(PTR) " 4b,8b\n"
+ __stringify(PTR) " 5b,8b\n"
+ __stringify(PTR) " 6b,8b\n"
+ __stringify(PTR) " 7b,8b\n"
+ __stringify(PTR) " 0b,8b\n"
" .previous\n"
" .set pop\n"
: "+&r"(rt), "=&r"(rs),
@@ -1999,7 +1999,7 @@ fpu_emul:
"j 2b\n"
".previous\n"
".section __ex_table,\"a\"\n"
- ".word 1b, 3b\n"
+ __stringify(PTR) " 1b,3b\n"
".previous\n"
: "=&r"(res), "+&r"(err)
: "r"(vaddr), "i"(SIGSEGV)
@@ -2057,7 +2057,7 @@ fpu_emul:
"j 2b\n"
".previous\n"
".section __ex_table,\"a\"\n"
- ".word 1b, 3b\n"
+ __stringify(PTR) " 1b,3b\n"
".previous\n"
: "+&r"(res), "+&r"(err)
: "r"(vaddr), "i"(SIGSEGV));
@@ -2118,7 +2118,7 @@ fpu_emul:
"j 2b\n"
".previous\n"
".section __ex_table,\"a\"\n"
- ".word 1b, 3b\n"
+ __stringify(PTR) " 1b,3b\n"
".previous\n"
: "=&r"(res), "+&r"(err)
: "r"(vaddr), "i"(SIGSEGV)
@@ -2181,7 +2181,7 @@ fpu_emul:
"j 2b\n"
".previous\n"
".section __ex_table,\"a\"\n"
- ".word 1b, 3b\n"
+ __stringify(PTR) " 1b,3b\n"
".previous\n"
: "+&r"(res), "+&r"(err)
: "r"(vaddr), "i"(SIGSEGV));
next reply other threads:[~2015-04-28 19:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-28 19:53 Leonid Yegoshin [this message]
2015-04-29 9:17 ` James Hogan
2015-04-29 9:49 ` Maciej W. Rozycki
2015-04-29 15:12 ` Markos Chandras
2015-04-29 15:36 ` James Hogan
2015-04-30 22:43 ` Leonid Yegoshin
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=20150428195335.11229.4516.stgit@ubuntu-yegoshin \
--to=leonid.yegoshin@imgtec.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=macro@linux-mips.org \
--cc=markos.chandras@imgtec.com \
--cc=ralf@linux-mips.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
all inboxes | Powered by JetHome®