* [PATCH] MIPS: Use correct encoding of jr for MIPS R6
@ 2015-08-28 12:54 Andrew Bennett
0 siblings, 0 replies; only message in thread
From: Andrew Bennett @ 2015-08-28 12:54 UTC (permalink / raw)
To: libffi-discuss
Hi,
The trampoline code in the ffi_prep_closure_loc function in src/mips/ffi.c
uses the wrong encoding of the jr instruction for MIPS R6. This patch fixes
the issue by adding (via an #if) the MIPS R6 encoding.
The ChangeLog and patch are below.
Regards,
Andrew
* src/mips/ffi.c (ffi_prep_closure_loc): Add correct encoding of
jr for MIPS R6.
diff --git a/src/mips/ffi.c b/src/mips/ffi.c
index 5d0dd70..8574a3a 100644
--- a/src/mips/ffi.c
+++ b/src/mips/ffi.c
@@ -698,7 +698,11 @@ ffi_prep_closure_loc (ffi_closure *closure,
/* lui $12,high(codeloc) */
tramp[2] = 0x3c0c0000 | ((unsigned)codeloc >> 16);
/* jr $25 */
+#if __mips_isa_rev < 6
tramp[3] = 0x03200008;
+#else
+ tramp[3] = 0x03200009;
+#endif
/* ori $12,low(codeloc) */
tramp[4] = 0x358c0000 | ((unsigned)codeloc & 0xffff);
#else
@@ -726,7 +730,11 @@ ffi_prep_closure_loc (ffi_closure *closure,
/* ori $25,low(fn) */
tramp[10] = 0x37390000 | ((unsigned long)fn & 0xffff);
/* jr $25 */
+#if __mips_isa_rev < 6
tramp[11] = 0x03200008;
+#else
+ tramp[11] = 0x03200009;
+#endif
/* ori $12,low(codeloc) */
tramp[12] = 0x358c0000 | ((unsigned long)codeloc & 0xffff);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-08-28 12:54 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-28 12:54 [PATCH] MIPS: Use correct encoding of jr for MIPS R6 Andrew Bennett
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).