Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/vfp move inlines into FPU_VFP



details:   https://anonhg.NetBSD.org/src/rev/02bb42e8520e
branches:  trunk
changeset: 783180:02bb42e8520e
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Dec 10 01:35:28 2012 +0000

description:
move inlines into FPU_VFP

diffstat:

 sys/arch/arm/vfp/vfp_init.c |  15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diffs (56 lines):

diff -r a3854e7a03a9 -r 02bb42e8520e sys/arch/arm/vfp/vfp_init.c
--- a/sys/arch/arm/vfp/vfp_init.c       Mon Dec 10 01:11:13 2012 +0000
+++ b/sys/arch/arm/vfp/vfp_init.c       Mon Dec 10 01:35:28 2012 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: vfp_init.c,v 1.10 2012/12/08 06:49:00 matt Exp $ */
+/*      $NetBSD: vfp_init.c,v 1.11 2012/12/10 01:35:28 matt Exp $ */
 
 /*
  * Copyright (c) 2008 ARM Ltd
@@ -102,8 +102,11 @@
 /* FMXR <X>, fpinst2 */
 #define write_fpinst2(X) __asm __volatile("mcr p10, 7, %0, c10, c0, 0" : \
                            : "r" (X))
+
+#ifdef FPU_VFP
+
 /* FLDMD <X>, {d0-d15} */
-static void
+static inline void
 load_vfpregs_lo(uint64_t *p)
 {
        /* vldmia rN, {d0-d15} */
@@ -111,7 +114,7 @@
 }
 
 /* FSTMD <X>, {d0-d15} */
-static void
+static inline void
 save_vfpregs_lo(uint64_t *p)
 {
        __asm __volatile("stc\tp11, c0, [%0], {32}" :: "r" (p) : "memory");
@@ -119,22 +122,20 @@
 
 #ifdef CPU_CORTEX
 /* FLDMD <X>, {d16-d31} */
-static void
+static inline void
 load_vfpregs_hi(uint64_t *p)
 {
        __asm __volatile("ldcl\tp11, c0, [%0], {32}" :: "r" (&p[16]) : "memory");
 }
 
 /* FLDMD <X>, {d16-d31} */
-static void
+static inline void
 save_vfpregs_hi(uint64_t *p)
 {
        __asm __volatile("stcl\tp11, c0, [%0], {32}" :: "r" (&p[16]) : "memory");
 }
 #endif
 
-#ifdef FPU_VFP
-
 /* The real handler for VFP bounces.  */
 static int vfp_handler(u_int, u_int, trapframe_t *, int);
 static int vfp_handler(u_int, u_int, trapframe_t *, int);



Home | Main Index | Thread Index | Old Index