Fix for m68000 systems

This commit is contained in:
Anthony Green
2013-03-16 08:01:19 -04:00
parent 215763d012
commit 8a286f570c
3 changed files with 18 additions and 0 deletions

View File

@@ -1,3 +1,8 @@
2013-03-16 Alan Hourihane <alanh@fairlite.co.uk>
* src/m68k/sysv.S (epilogue): Don't user extb instruction on
m680000 machines.
2013-03-16 Alex Gaynor <alex.gaynor@gmail.com> 2013-03-16 Alex Gaynor <alex.gaynor@gmail.com>
* src/x86/ffi.c (ffi_prep_cif_machdep): Always align stack. * src/x86/ffi.c (ffi_prep_cif_machdep): Always align stack.

1
README
View File

@@ -168,6 +168,7 @@ See the ChangeLog files for details.
Add Meta support. Add Meta support.
Add missing Moxie bits. Add missing Moxie bits.
Fix stack alignment bug on 32-bit x86. Fix stack alignment bug on 32-bit x86.
Build fix for m68000 targets.
3.0.12 Feb-11-13 3.0.12 Feb-11-13
Add Moxie support. Add Moxie support.

View File

@@ -176,7 +176,13 @@ retstruct2:
retsint8: retsint8:
btst #8,%d2 btst #8,%d2
jbeq retsint16 jbeq retsint16
| NOTE: On the mc68000, extb is not supported. 8->16, then 16->32.
#if !defined(__mc68020__) && !defined(__mc68030__) && !defined(__mc68040__) && !defined(__mc68060__) && !defined(__mcoldfire__)
ext.w %d0
ext.l %d0
#else
extb.l %d0 extb.l %d0
#endif
move.l %d0,(%a1) move.l %d0,(%a1)
jbra epilogue jbra epilogue
@@ -279,7 +285,13 @@ CALLFUNC(ffi_closure_SYSV):
jra .Lcls_epilogue jra .Lcls_epilogue
.Lcls_ret_sint8: .Lcls_ret_sint8:
move.l (%a0),%d0 move.l (%a0),%d0
| NOTE: On the mc68000, extb is not supported. 8->16, then 16->32.
#if !defined(__mc68020__) && !defined(__mc68030__) && !defined(__mc68040__) && !defined(__mc68060__) && !defined(__mcoldfire__)
ext.w %d0
ext.l %d0
#else
extb.l %d0 extb.l %d0
#endif
jra .Lcls_epilogue jra .Lcls_epilogue
1: 1:
| CIF_FLAGS_SINT16 | CIF_FLAGS_SINT16