This is the mail archive of the
libffi-discuss@sourceware.org
mailing list for the libffi project.
[PATCH] MIPS: Use correct encoding of jr for MIPS R6
- From: Andrew Bennett <Andrew dot Bennett at imgtec dot com>
- To: "libffi-discuss at sourceware dot org" <libffi-discuss at sourceware dot org>
- Date: Fri, 28 Aug 2015 12:54:27 +0000
- Subject: [PATCH] MIPS: Use correct encoding of jr for MIPS R6
- Authentication-results: sourceware.org; auth=none
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);