00db10
commit 196f456b842ee96e1bf1e5ae6ed21ba427dee3f3
00db10
Author: Marcus Shawcroft <marcus.shawcroft@linaro.org>
00db10
Date:   Tue Jan 7 16:16:35 2014 +0000
00db10
00db10
    [AArch64] Fix FP_ROUNDMODE.
00db10
    
00db10
    [BZ #16387] Fix FP_ROUNDMODE to extract the correct bits from FPCR.
00db10
00db10
diff --git a/ports/sysdeps/aarch64/fpu/fpu_control.h b/ports/sysdeps/aarch64/fpu/fpu_control.h
00db10
index 79ab5fb..6a265e8 100644
00db10
--- a/ports/sysdeps/aarch64/fpu/fpu_control.h
00db10
+++ b/ports/sysdeps/aarch64/fpu/fpu_control.h
00db10
@@ -59,6 +59,9 @@
00db10
                    E E D D
00db10
                        E E
00db10
  */
00db10
+
00db10
+#define _FPU_FPCR_RM_MASK  0xc00000
00db10
+
00db10
 #define _FPU_FPCR_MASK_IXE 0x1000
00db10
 #define _FPU_FPCR_MASK_UFE 0x0800
00db10
 #define _FPU_FPCR_MASK_OFE 0x0400
00db10
diff --git a/ports/sysdeps/aarch64/soft-fp/sfp-machine.h b/ports/sysdeps/aarch64/soft-fp/sfp-machine.h
00db10
index d21d00a..9bb94e5 100644
00db10
--- a/ports/sysdeps/aarch64/soft-fp/sfp-machine.h
00db10
+++ b/ports/sysdeps/aarch64/soft-fp/sfp-machine.h
00db10
@@ -47,7 +47,7 @@
00db10
 
00db10
 #define _FP_DECL_EX		fpu_control_t _fcw
00db10
 
00db10
-#define FP_ROUNDMODE		(_fcw & 0x3)
00db10
+#define FP_ROUNDMODE		(_fcw & _FPU_FPCR_RM_MASK)
00db10
 
00db10
 #define FP_RND_NEAREST		FE_TONEAREST
00db10
 #define FP_RND_ZERO		FE_TOWARDZERO