Skip to content
Snippets Groups Projects
Commit d7e56b08 authored by YunQiang Su's avatar YunQiang Su Committed by YunQiang Su
Browse files

libffi: Fix MIPS r6 support

for some instructions, MIPS r6 uses different encoding other than
the previous releases.

1. mips/n32.S disable .set mips4: since it casuses old insn encoding
   is used.
   https://github.com/libffi/libffi/pull/396 has been accepted as:
     94c102aa69b04337f63498e0e6551fcdce549ae5
2. mips/ffi.c: the encoding for JR is hardcoded: we need to use
   different value for r6 and pre-r6.
   https://github.com/libffi/libffi/pull/401 has been accpeted as:
     746dbe3a6a79a41931c03b51df2972be4d5e5028

libffi/
	PR libffi/83636
	* src/mips/n32.S: disable .set mips4
	* src/mips/ffi.c: use different JR encoding for r6.
parent 7218c2ec
No related branches found
No related tags found
No related merge requests found
...@@ -698,7 +698,11 @@ ffi_prep_closure_loc (ffi_closure *closure, ...@@ -698,7 +698,11 @@ ffi_prep_closure_loc (ffi_closure *closure,
/* lui $12,high(codeloc) */ /* lui $12,high(codeloc) */
tramp[2] = 0x3c0c0000 | ((unsigned)codeloc >> 16); tramp[2] = 0x3c0c0000 | ((unsigned)codeloc >> 16);
/* jr $25 */ /* jr $25 */
#if !defined(__mips_isa_rev) || (__mips_isa_rev<6)
tramp[3] = 0x03200008; tramp[3] = 0x03200008;
#else
tramp[3] = 0x03200009;
#endif
/* ori $12,low(codeloc) */ /* ori $12,low(codeloc) */
tramp[4] = 0x358c0000 | ((unsigned)codeloc & 0xffff); tramp[4] = 0x358c0000 | ((unsigned)codeloc & 0xffff);
#else #else
...@@ -726,7 +730,11 @@ ffi_prep_closure_loc (ffi_closure *closure, ...@@ -726,7 +730,11 @@ ffi_prep_closure_loc (ffi_closure *closure,
/* ori $25,low(fn) */ /* ori $25,low(fn) */
tramp[10] = 0x37390000 | ((unsigned long)fn & 0xffff); tramp[10] = 0x37390000 | ((unsigned long)fn & 0xffff);
/* jr $25 */ /* jr $25 */
#if !defined(__mips_isa_rev) || (__mips_isa_rev<6)
tramp[11] = 0x03200008; tramp[11] = 0x03200008;
#else
tramp[11] = 0x03200009;
#endif
/* ori $12,low(codeloc) */ /* ori $12,low(codeloc) */
tramp[12] = 0x358c0000 | ((unsigned long)codeloc & 0xffff); tramp[12] = 0x358c0000 | ((unsigned long)codeloc & 0xffff);
......
...@@ -43,7 +43,9 @@ ...@@ -43,7 +43,9 @@
#ifdef __GNUC__ #ifdef __GNUC__
.abicalls .abicalls
#endif #endif
#if !defined(__mips_isa_rev) || (__mips_isa_rev<6)
.set mips4 .set mips4
#endif
.text .text
.align 2 .align 2
.globl ffi_call_N32 .globl ffi_call_N32
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment