ibphoenix/tomsfastmath
6
0
Fork 1
Code Issues Pull Requests Packages Releases Wiki Activity

TFM_ARM must be defined for other parts of the code

Browse Source
This commit is contained in:
Michael Mohr 2010-12-28 13:23:34 -08:00
parent e077338f6f
commit dcb23d1e42
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Android.mk
View File

@ -94,17 +94,19 @@ LOCAL_SRC_FILES := \
LOCAL_C_INCLUDES := $(LOCAL_PATH)/src/headers LOCAL_C_INCLUDES := $(LOCAL_PATH)/src/headers
LOCAL_CFLAGS += -DTFM_ARM
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
# Possible optimizations: # Possible optimizations:
# -ftree-vectorize: have GCC attempt to automatically vectorize loops # -ftree-vectorize: have GCC attempt to automatically vectorize loops
# -ftree-vectorizer-verbose=2: verbose output during compile # -ftree-vectorizer-verbose=2: verbose output during compile
# Note: not all V7a targets support NEON! # Note: not all V7-a targets support NEON!
# LOCAL_ARM_NEON := true LOCAL_ARM_NEON := true
LOCAL_CFLAGS += -DTFM_ARM_V7A LOCAL_CFLAGS += -DTFM_ARM_V7A -ftree-vectorize
else ifeq ($(TARGET_ARCH_ABI),armeabi) else ifeq ($(TARGET_ARCH_ABI),armeabi)
LOCAL_CFLAGS += -DTFM_ARM_V5TE LOCAL_CFLAGS += -DTFM_ARM_V5TE
else else
LOCAL_CFLAGS += -DTFM_ARM LOCAL_CFLAGS += -DTFM_ARM_V4M
endif endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

8
src/mont/fp_montgomery_reduce.c
View File

@ -283,10 +283,10 @@ asm( \
: "%eax", "%cc") : "%eax", "%cc")
/******************************************************************/ /******************************************************************/
#elif defined(TFM_ARM) #elif defined(TFM_ARM_V4M)
/* ARMv4 code */ /* generic ARMv4 or higher with M */
#define MONT_START #define MONT_START
#define MONT_FINI #define MONT_FINI
#define LOOP_END #define LOOP_END
#define LOOP_START \ #define LOOP_START \
@ -325,7 +325,7 @@ asm( \
asm( \ asm( \
" LDR r0,%1 \n\t" \ " LDR r0,%1 \n\t" \
" ADDS r0,r0,%0 \n\t" \ " ADDS r0,r0,%0 \n\t" \
" ITE CS \n\t" \ " ITE CS \n\t" \
" MOVCS %0,#1 \n\t" \ " MOVCS %0,#1 \n\t" \
" MOVCC %0,#0 \n\t" \ " MOVCC %0,#0 \n\t" \
" UMLAL r0,%0,%3,%4 \n\t" \ " UMLAL r0,%0,%3,%4 \n\t" \