Merge branch 'master' into 'test'

# Conflicts:
#   fx_s2308_longlong.h

div_perf.c

@@ -9,7 +9,7 @@ typedef long fixed32;
 #define DOUBLE_TO_FX(a) (((int)(a*(256.0))))
 
 #define FX_DIV(a,b) DOUBLE_TO_FX(FX_TO_DOUBLE(a)/FX_TO_DOUBLE(b))
-#define fx_s2308_l_div1(a,b) (int)((long long)(a)/(b))
+#define fx_s2308_l_div1(a,b) (int)(((long long)(a)/(b))<<8)
 #define fx_s2308_l_div2(a,b) (int)((a<<8)/(b))
 
 long long div_sum_double_test()

fx_s2308_longlong.h

@@ -7,6 +7,7 @@
 #define fx_s2308_l_mul3(a,b) (int)(((a)*(b)) >> 8) 
 #define fx_s2308_l_mul4(a,b) (int)(((a>>4)*(b>>4))) 
 
+
 #define fx_s2308_l_div1(a,b) (int)(((long long)(a)/(b))<<8) 
 #define fx_s2308_l_div2(a,b) (int)((a<<8)/(b))