Updates

libretro · Jul 6, 2017 · 4d61bfc · 4d61bfc
1 parent e791dbf
commit 4d61bfc
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 29 deletions.
diff --git a/Makefile b/Makefile
@@ -310,6 +310,12 @@ FLAGS   += $(INCFLAGS) $(INCFLAGS_PLATFORM)
 
 FLAGS += $(ENDIANNESS_DEFINES) -DSIZEOF_DOUBLE=8 $(WARNINGS) -DMEDNAFEN_VERSION=\"0.9.31\" -DPACKAGE=\"mednafen\" -DMEDNAFEN_VERSION_NUMERIC=931 -DPSS_STYLE=1 -DMPC_FIXED_POINT -DSTDC_HEADERS -D__STDC_LIMIT_MACROS -D__LIBRETRO__ -D_LOW_ACCURACY_ $(EXTRA_INCLUDES)
 
+ifneq (,$(findstring msvc,$(platform)))
+FLAGS += -DINLINE="_inline"
+else
+FLAGS += -DINLINE="inline"
+endif
+
 CXXFLAGS += $(FLAGS)
 CFLAGS += $(FLAGS)
 

diff --git a/jni/Android.mk b/jni/Android.mk
@@ -49,7 +49,7 @@ endif
 LDFLAGS += $(fpic) $(SHARED)
 FLAGS += $(fpic) $(NEW_GCC_FLAGS) $(INCFLAGS)
 
-FLAGS += $(ENDIANNESS_DEFINES) -DSIZEOF_DOUBLE=8 $(WARNINGS) -DMEDNAFEN_VERSION=\"0.9.26\" -DPACKAGE=\"mednafen\" -DMEDNAFEN_VERSION_NUMERIC=926 -DPSS_STYLE=1 -DMPC_FIXED_POINT -DSTDC_HEADERS -D__STDC_LIMIT_MACROS -D__LIBRETRO__ -DNDEBUG -D_LOW_ACCURACY_
+FLAGS += $(ENDIANNESS_DEFINES) -DSIZEOF_DOUBLE=8 $(WARNINGS) -DMEDNAFEN_VERSION=\"0.9.26\" -DPACKAGE=\"mednafen\" -DMEDNAFEN_VERSION_NUMERIC=926 -DPSS_STYLE=1 -DMPC_FIXED_POINT -DSTDC_HEADERS -D__STDC_LIMIT_MACROS -D__LIBRETRO__ -DNDEBUG -D_LOW_ACCURACY_ -DINLINE="inline"
 
 LOCAL_CFLAGS =  $(FLAGS) 
 LOCAL_CXXFLAGS += $(FLAGS) -fexceptions

diff --git a/mednafen/hw_cpu/v810/fpu-new/mednafen-gcc.h b/mednafen/hw_cpu/v810/fpu-new/mednafen-gcc.h
@@ -59,11 +59,3 @@ typedef int64_t sbits64;
 *----------------------------------------------------------------------------*/
 #define LIT64( a ) a##LL
 #endif
-
-/*----------------------------------------------------------------------------
-| The macro `INLINE' can be used before functions that should be inlined.  If
-| a compiler does not support explicit inlining, this macro should be defined
-| to be `static'.
-*----------------------------------------------------------------------------*/
-//#define INLINE extern inline
-#define INLINE static inline
diff --git a/mednafen/hw_cpu/v810/fpu-new/softfloat-macros b/mednafen/hw_cpu/v810/fpu-new/softfloat-macros
@@ -39,7 +39,7 @@ these four paragraphs for those parts of this code that are retained.
 | The result is stored in the location pointed to by `zPtr'.
 *----------------------------------------------------------------------------*/
 
-INLINE void shift32RightJamming( bits32 a, int16 count, bits32 *zPtr )
+static INLINE void shift32RightJamming( bits32 a, int16 count, bits32 *zPtr )
 {
     bits32 z;
 
@@ -64,7 +64,7 @@ INLINE void shift32RightJamming( bits32 a, int16 count, bits32 *zPtr )
 | which are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
 *----------------------------------------------------------------------------*/
 
-INLINE void
+static INLINE void
  shift64Right(
      bits32 a0, bits32 a1, int16 count, bits32 *z0Ptr, bits32 *z1Ptr )
 {
@@ -99,7 +99,7 @@ INLINE void
 | the locations pointed to by `z0Ptr' and `z1Ptr'.
 *----------------------------------------------------------------------------*/
 
-INLINE void
+static INLINE void
  shift64RightJamming(
      bits32 a0, bits32 a1, int16 count, bits32 *z0Ptr, bits32 *z1Ptr )
 {
@@ -150,7 +150,7 @@ INLINE void
 | `z2Ptr'.)
 *----------------------------------------------------------------------------*/
 
-INLINE void
+static INLINE void
  shift64ExtraRightJamming(
      bits32 a0,
      bits32 a1,
@@ -208,7 +208,7 @@ INLINE void
 | pieces which are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
 *----------------------------------------------------------------------------*/
 
-INLINE void
+static INLINE void
  shortShift64Left(
      bits32 a0, bits32 a1, int16 count, bits32 *z0Ptr, bits32 *z1Ptr )
 {
@@ -227,7 +227,7 @@ INLINE void
 | `z1Ptr', and `z2Ptr'.
 *----------------------------------------------------------------------------*/
 
-INLINE void
+static INLINE void
  shortShift96Left(
      bits32 a0,
      bits32 a1,
@@ -262,7 +262,7 @@ INLINE void
 | are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
 *----------------------------------------------------------------------------*/
 
-INLINE void
+static INLINE void
  add64(
      bits32 a0, bits32 a1, bits32 b0, bits32 b1, bits32 *z0Ptr, bits32 *z1Ptr )
 {
@@ -282,7 +282,7 @@ INLINE void
 | `z1Ptr', and `z2Ptr'.
 *----------------------------------------------------------------------------*/
 
-INLINE void
+static INLINE void
  add96(
      bits32 a0,
      bits32 a1,
@@ -320,7 +320,7 @@ INLINE void
 | `z1Ptr'.
 *----------------------------------------------------------------------------*/
 
-INLINE void
+static INLINE void
  sub64(
      bits32 a0, bits32 a1, bits32 b0, bits32 b1, bits32 *z0Ptr, bits32 *z1Ptr )
 {
@@ -338,7 +338,7 @@ INLINE void
 | `z0Ptr', `z1Ptr', and `z2Ptr'.
 *----------------------------------------------------------------------------*/
 
-INLINE void
+static INLINE void
  sub96(
      bits32 a0,
      bits32 a1,
@@ -374,7 +374,7 @@ INLINE void
 | `z0Ptr' and `z1Ptr'.
 *----------------------------------------------------------------------------*/
 
-INLINE void mul32To64( bits32 a, bits32 b, bits32 *z0Ptr, bits32 *z1Ptr )
+static INLINE void mul32To64( bits32 a, bits32 b, bits32 *z0Ptr, bits32 *z1Ptr )
 {
     bits16 aHigh, aLow, bHigh, bLow;
     bits32 z0, zMiddleA, zMiddleB, z1;
@@ -404,7 +404,7 @@ INLINE void mul32To64( bits32 a, bits32 b, bits32 *z0Ptr, bits32 *z1Ptr )
 | `z2Ptr'.
 *----------------------------------------------------------------------------*/
 
-INLINE void
+static INLINE void
  mul64By32To96(
      bits32 a0,
      bits32 a1,
@@ -432,7 +432,7 @@ INLINE void
 | the locations pointed to by `z0Ptr', `z1Ptr', `z2Ptr', and `z3Ptr'.
 *----------------------------------------------------------------------------*/
 
-INLINE void
+static INLINE void
  mul64To128(
      bits32 a0,
      bits32 a1,
@@ -579,7 +579,7 @@ static int8 countLeadingZeros32( bits32 a )
 | returns 0.
 *----------------------------------------------------------------------------*/
 
-INLINE flag eq64( bits32 a0, bits32 a1, bits32 b0, bits32 b1 )
+static INLINE flag eq64( bits32 a0, bits32 a1, bits32 b0, bits32 b1 )
 {
 
     return ( a0 == b0 ) && ( a1 == b1 );
@@ -592,7 +592,7 @@ INLINE flag eq64( bits32 a0, bits32 a1, bits32 b0, bits32 b1 )
 | Otherwise, returns 0.
 *----------------------------------------------------------------------------*/
 
-INLINE flag le64( bits32 a0, bits32 a1, bits32 b0, bits32 b1 )
+static INLINE flag le64( bits32 a0, bits32 a1, bits32 b0, bits32 b1 )
 {
 
     return ( a0 < b0 ) || ( ( a0 == b0 ) && ( a1 <= b1 ) );
@@ -605,7 +605,7 @@ INLINE flag le64( bits32 a0, bits32 a1, bits32 b0, bits32 b1 )
 | returns 0.
 *----------------------------------------------------------------------------*/
 
-INLINE flag lt64( bits32 a0, bits32 a1, bits32 b0, bits32 b1 )
+static INLINE flag lt64( bits32 a0, bits32 a1, bits32 b0, bits32 b1 )
 {
 
     return ( a0 < b0 ) || ( ( a0 == b0 ) && ( a1 < b1 ) );
@@ -618,7 +618,7 @@ INLINE flag lt64( bits32 a0, bits32 a1, bits32 b0, bits32 b1 )
 | returns 0.
 *----------------------------------------------------------------------------*/
 
-INLINE flag ne64( bits32 a0, bits32 a1, bits32 b0, bits32 b1 )
+static INLINE flag ne64( bits32 a0, bits32 a1, bits32 b0, bits32 b1 )
 {
 
     return ( a0 != b0 ) || ( a1 != b1 );

diff --git a/mednafen/mednafen-types.h b/mednafen/mednafen-types.h
@@ -18,7 +18,6 @@ typedef uint64_t uint64;
 #define MDFN_UNLIKELY(n) __builtin_expect((n) != 0, 0)
 #define MDFN_LIKELY(n) __builtin_expect((n) != 0, 1)
 
-  #define INLINE inline __attribute__((always_inline))
   #define NO_INLINE __attribute__((noinline))
 
   #if defined(__386__) || defined(__i386__) || defined(__i386) || defined(_M_IX86) || defined(_M_I386)
@@ -34,7 +33,6 @@ typedef uint64_t uint64;
 
 #elif defined(_MSC_VER)
 #define roundf(in) (in >= 0.0f ? floorf(in + 0.5f) : ceilf(in - 0.5f))
-  #define INLINE inline
   #define NO_INLINE
 #define MDFN_LIKELY(n) ((n) != 0)
 #define MDFN_UNLIKELY(n) ((n) != 0)
@@ -50,7 +48,6 @@ typedef uint64_t uint64;
 
 #else
   #error "Not compiling with GCC nor MSVC"
-  #define INLINE inline
   #define NO_INLINE
 
   #define MDFN_FASTCALL