generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix arm64 fenv warnings, and make warnings errors."

Browse Source 
am: 1ab8251030

* commit '1ab8251030407ec397009b46db025f8e9688abc8':
  Fix arm64 fenv warnings, and make warnings errors.
This commit is contained in:
Christopher Ferris 2015-10-24 16:06:17 +00:00 committed by android-build-merger
commit 25a7efa7e9
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libm/Android.mk
View File

@ -485,6 +485,7 @@ LOCAL_CFLAGS := \
-D__BIONIC_NO_MATH_INLINES \
-DFLT_EVAL_METHOD=0 \
-include $(LOCAL_PATH)/freebsd-compat.h \
-Werror \
-Wno-missing-braces \
-Wno-parentheses \
-Wno-sign-compare \

19
libm/arm64/fenv.c
View File

@ -26,6 +26,7 @@
* $FreeBSD: libm/aarch64/fenv.c $
*/
#include <stdint.h>
#include <fenv.h>
#define FPCR_EXCEPT_SHIFT 8
@ -38,10 +39,20 @@ const fenv_t __fe_dfl_env = { 0 /* control */, 0 /* status */};
typedef __uint32_t fpu_control_t; // FPCR, Floating-point Control Register.
typedef __uint32_t fpu_status_t; // FPSR, Floating-point Status Register.
#define __get_fpcr(__fpcr) __asm__ __volatile__("mrs %0,fpcr" : "=r" (__fpcr))
#define __get_fpsr(__fpsr) __asm__ __volatile__("mrs %0,fpsr" : "=r" (__fpsr))
#define __set_fpcr(__fpcr) __asm__ __volatile__("msr fpcr,%0" : :"ri" (__fpcr))
#define __set_fpsr(__fpsr) __asm__ __volatile__("msr fpsr,%0" : :"ri" (__fpsr))
#define __get(REGISTER, __value) { \
uint64_t __value64; \
__asm__ __volatile__("mrs %0," REGISTER : "=r" (__value64)); \
__value = (__uint32_t) __value64; \
}
#define __get_fpcr(__fpcr) __get("fpcr", __fpcr)
#define __get_fpsr(__fpsr) __get("fpsr", __fpsr)
#define __set(REGISTER, __value) { \
uint64_t __value64 = __value; \
__asm__ __volatile__("msr " REGISTER ",%0" : : "ri" (__value64)); \
}
#define __set_fpcr(__fpcr) __set("fpcr", __fpcr)
#define __set_fpsr(__fpsr) __set("fpsr", __fpsr)
int fegetenv(fenv_t* envp) {
__get_fpcr(envp->__control);