Support no-FPU ColdFire in sysdeps/m68k/dl-trampoline.S and refactor code.

This commit is contained in:
Joseph Myers 2013-06-30 21:36:59 +00:00
parent 8145005c31
commit c53e2f0a56
2 changed files with 27 additions and 24 deletions

View File

@ -1,3 +1,11 @@
2013-06-30 Joseph Myers <joseph@codesourcery.com>
* sysdeps/m68k/dl-trampoline.S (FMOVE): Define conditional on
[__mcoldfire__] and [__mcffpu__].
(FPSPACE): Likewise.
(_dl_runtime_profile): Save and restore %fp0 with FMOVE, only if
[FMOVE]. Use FPSPACE in stack offsets.
2013-06-28 Joseph Myers <joseph@codesourcery.com> 2013-06-28 Joseph Myers <joseph@codesourcery.com>
* sysdeps/m68k/fpu_control.h: Fix preprocessor indentation. * sysdeps/m68k/fpu_control.h: Fix preprocessor indentation.

View File

@ -18,6 +18,16 @@
#include <sysdep.h> #include <sysdep.h>
#if !defined (__mcoldfire__)
# define FMOVE fmove.x
# define FPSPACE 12
#elif defined (__mcffpu__)
# define FMOVE fmove.d
# define FPSPACE 8
#else
# define FPSPACE 0
#endif
.text .text
.globl _dl_runtime_resolve .globl _dl_runtime_resolve
.type _dl_runtime_resolve, @function .type _dl_runtime_resolve, @function
@ -174,12 +184,9 @@ _dl_runtime_profile:
+4 %a1 +4 %a1
%sp %a0 %sp %a0
*/ */
#ifdef __mcoldfire__ #ifdef FMOVE
fmove.d %fp0, -(%sp) FMOVE %fp0, -(%sp)
cfi_adjust_cfa_offset (8) cfi_adjust_cfa_offset (FPSPACE)
#else
fmove.x %fp0, -(%sp)
cfi_adjust_cfa_offset (12)
#endif #endif
move.l %a0, -(%sp) move.l %a0, -(%sp)
cfi_adjust_cfa_offset (4) cfi_adjust_cfa_offset (4)
@ -189,21 +196,12 @@ _dl_runtime_profile:
cfi_adjust_cfa_offset (4) cfi_adjust_cfa_offset (4)
pea (%sp) pea (%sp)
cfi_adjust_cfa_offset (4) cfi_adjust_cfa_offset (4)
#ifdef __mcoldfire__ pea (16+FPSPACE)(%sp)
pea 24(%sp)
cfi_adjust_cfa_offset (4) cfi_adjust_cfa_offset (4)
move.l 40(%sp), -(%sp) move.l (32+FPSPACE)(%sp), -(%sp)
cfi_adjust_cfa_offset (4) cfi_adjust_cfa_offset (4)
move.l 40(%sp), -(%sp) move.l (32+FPSPACE)(%sp), -(%sp)
cfi_adjust_cfa_offset (4) cfi_adjust_cfa_offset (4)
#else
pea 28(%sp)
cfi_adjust_cfa_offset (4)
move.l 44(%sp), -(%sp)
cfi_adjust_cfa_offset (4)
move.l 44(%sp), -(%sp)
cfi_adjust_cfa_offset (4)
#endif
jbsr _dl_call_pltexit jbsr _dl_call_pltexit
lea 16(%sp), %sp lea 16(%sp), %sp
cfi_adjust_cfa_offset (-16) cfi_adjust_cfa_offset (-16)
@ -213,12 +211,9 @@ _dl_runtime_profile:
cfi_adjust_cfa_offset (-4) cfi_adjust_cfa_offset (-4)
move.l (%sp)+, %a0 move.l (%sp)+, %a0
cfi_adjust_cfa_offset (-4) cfi_adjust_cfa_offset (-4)
#ifdef __mcoldfire__ #ifdef FMOVE
fmove.d (%sp)+, %fp0 FMOVE (%sp)+, %fp0
cfi_adjust_cfa_offset (-8) cfi_adjust_cfa_offset (-FPSPACE)
#else
fmove.x (%sp)+, %fp0
cfi_adjust_cfa_offset (-12)
#endif #endif
lea 20(%sp), %sp lea 20(%sp), %sp
cfi_adjust_cfa_offset (-20) cfi_adjust_cfa_offset (-20)