Merge pull request #35 from negativeExponent/update

Sync to upstream 1.24.0 and add misc features

.gitignore

@@ -3,4 +3,5 @@
 *.dll
 *.dylib
 /old
-
+.vscode
+.clang-format

Makefile

@@ -1,5 +1,6 @@
 DEBUG = 0
 FRONTEND_SUPPORTS_RGB565 = 1
+HAVE_NO_LANGEXTRA = 0
 
 CORE_DIR := .
 
@@ -583,7 +584,7 @@ LDFLAGS += $(fpic) $(SHARED)
 FLAGS   += $(fpic) $(NEW_GCC_FLAGS)
 FLAGS   += $(INCFLAGS) $(INCFLAGS_PLATFORM)
 
-FLAGS += $(ENDIANNESS_DEFINES) -DSIZEOF_DOUBLE=8 $(WARNINGS) -DMEDNAFEN_VERSION=\"0.9.47\" -DPACKAGE=\"mednafen\" -DMEDNAFEN_VERSION_NUMERIC=947 -DPSS_STYLE=1 -DMPC_FIXED_POINT $(CORE_DEFINE) -DSTDC_HEADERS -D__STDC_LIMIT_MACROS -D__LIBRETRO__ -D_LOW_ACCURACY_ $(EXTRA_INCLUDES) $(SOUND_DEFINE)
+FLAGS += $(ENDIANNESS_DEFINES) -DSIZEOF_DOUBLE=8 $(WARNINGS) -DMEDNAFEN_VERSION=\"1.24.0\" -DPACKAGE=\"mednafen\" -DMEDNAFEN_VERSION_NUMERIC=1240 -DPSS_STYLE=1 -DMPC_FIXED_POINT $(CORE_DEFINE) -DSTDC_HEADERS -D__STDC_LIMIT_MACROS -D__LIBRETRO__ -D_LOW_ACCURACY_ $(EXTRA_INCLUDES) $(SOUND_DEFINE)
 
 ifneq ($(SANITIZER),)
    CFLAGS += -fsanitize=$(SANITIZER)

Makefile.common

@@ -19,7 +19,8 @@ SOURCES_CXX += \
 	$(CORE_EMU_DIR)/mikie.cpp \
 	$(CORE_EMU_DIR)/ram.cpp \
 	$(CORE_EMU_DIR)/rom.cpp \
-	$(CORE_EMU_DIR)/susie.cpp
+	$(CORE_EMU_DIR)/susie.cpp \
+	$(CORE_EMU_DIR)/system.cpp
 endif
 
 ifeq ($(NEED_BLIP), 1)
@@ -72,6 +73,10 @@ ifeq ($(FRONTEND_SUPPORTS_RGB565), 1)
 FLAGS += -DFRONTEND_SUPPORTS_RGB565
 endif
 
+ifneq ($(HAVE_NO_LANGEXTRA), 1)
+FLAGS += -DHAVE_NO_LANGEXTRA
+endif
+
 ifneq ($(HAVE_GRIFFIN), 1)
 SOURCES_CXX += \
 	$(MEDNAFEN_DIR)/mednafen.cpp \

libretro-common/compat/compat_snprintf.c

@@ -23,10 +23,7 @@
 /* THIS FILE HAS NOT BEEN VALIDATED ON PLATFORMS BESIDES MSVC */
 #ifdef _MSC_VER
 
-#include <retro_common.h>
-#if _MSC_VER >= 1800
-#include <stdio.h> /* added for _vsnprintf_s and _vscprintf on VS2015 and VS2017 */
-#endif
+#include <stdio.h>
 #include <stdarg.h>
 
 #if _MSC_VER < 1800
@@ -54,11 +51,14 @@ int c99_vsnprintf_retro__(char *outBuf, size_t size, const char *format, va_list
    int count = -1;
 
    if (size != 0)
+   {
 #if (_MSC_VER <= 1310)
-       count = _vsnprintf(outBuf, size - 1, format, ap);
+      count = _vsnprintf(outBuf, size - 1, format, ap);
 #else
-       count = _vsnprintf_s(outBuf, size, size - 1, format, ap);
+      count = _vsnprintf_s(outBuf, size, size - 1, format, ap);
 #endif
+   }
+
    if (count == -1)
        count = _vscprintf(format, ap);
 

libretro-common/compat/fopen_utf8.c

@@ -36,9 +36,7 @@
 
 void *fopen_utf8(const char * filename, const char * mode)
 {
-#if defined(_XBOX)
-   return fopen(filename, mode);
-#elif defined(LEGACY_WIN32)
+#if defined(LEGACY_WIN32)
    FILE             *ret = NULL;
    char * filename_local = utf8_to_local_string_alloc(filename);
 

libretro-common/encodings/encoding_utf.c

@@ -211,10 +211,7 @@ size_t utf8len(const char *string)
    return ret;
 }
 
-static uint8_t utf8_walkbyte(const char **string)
-{
-   return *((*string)++);
-}
+#define utf8_walkbyte(string) (*((*(string))++))
 
 /* Does not validate the input, returns garbage if it's not UTF-8. */
 uint32_t utf8_walk(const char **string)
@@ -227,14 +224,16 @@ uint32_t utf8_walk(const char **string)
 
    ret    = (ret << 6) | (utf8_walkbyte(string) & 0x3F);
    if (first >= 0xE0)
+   {
       ret = (ret << 6) | (utf8_walkbyte(string) & 0x3F);
-   if (first >= 0xF0)
-      ret = (ret << 6) | (utf8_walkbyte(string) & 0x3F);
-
-   if (first >= 0xF0)
-      return ret | (first & 7) << 18;
-   if (first >= 0xE0)
+      if (first >= 0xF0)
+      {
+         ret = (ret << 6) | (utf8_walkbyte(string) & 0x3F);
+         return ret | (first & 7) << 18;
+      }
       return ret | (first & 15) << 12;
+   }
+
    return ret | (first & 31) << 6;
 }
 
@@ -273,37 +272,25 @@ bool utf16_to_char_string(const uint16_t *in, char *s, size_t len)
    return ret;
 }
 
+#if defined(_WIN32) && !defined(_XBOX) && !defined(UNICODE)
 /* Returned pointer MUST be freed by the caller if non-NULL. */
-static char* mb_to_mb_string_alloc(const char *str,
+static char *mb_to_mb_string_alloc(const char *str,
       enum CodePage cp_in, enum CodePage cp_out)
 {
    char *path_buf         = NULL;
    wchar_t *path_buf_wide = NULL;
    int path_buf_len       = 0;
-   int path_buf_wide_len  = 0;
-
-   if (!str || !*str)
-      return NULL;
-
-   (void)path_buf;
-   (void)path_buf_wide;
-   (void)path_buf_len;
-   (void)path_buf_wide_len;
-
-#if !defined(_WIN32) || defined(_XBOX)
-   /* assume string needs no modification if not on Windows */
-   return strdup(str);
-#else
-#ifdef UNICODE
-   /* TODO/FIXME: Not implemented. */
-   return strdup(str);
-#else
-
-   /* Windows 95 will return 0 from these functions with a UTF8 codepage set without MSLU. From an unknown MSDN version (others omit this info):
-    *   - CP_UTF8 Windows 98/Me, Windows NT 4.0 and later: Translate using UTF-8. When this is set, dwFlags must be zero.
-    *   - Windows 95: Under the Microsoft Layer for Unicode, MultiByteToWideChar also supports CP_UTF7 and CP_UTF8.
+   int path_buf_wide_len  = MultiByteToWideChar(cp_in, 0, str, -1, NULL, 0);
+
+   /* Windows 95 will return 0 from these functions with 
+    * a UTF8 codepage set without MSLU.
+    *
+    * From an unknown MSDN version (others omit this info):
+    *   - CP_UTF8 Windows 98/Me, Windows NT 4.0 and later: 
+    *   Translate using UTF-8. When this is set, dwFlags must be zero.
+    *   - Windows 95: Under the Microsoft Layer for Unicode, 
+    *   MultiByteToWideChar also supports CP_UTF7 and CP_UTF8.
     */
-   path_buf_wide_len = MultiByteToWideChar(cp_in, 0, str, -1, NULL, 0);
 
    if (path_buf_wide_len)
    {
@@ -355,20 +342,37 @@ static char* mb_to_mb_string_alloc(const char *str,
       free(path_buf_wide);
 
    return NULL;
-#endif
-#endif
 }
+#endif
 
 /* Returned pointer MUST be freed by the caller if non-NULL. */
 char* utf8_to_local_string_alloc(const char *str)
 {
-   return mb_to_mb_string_alloc(str, CODEPAGE_UTF8, CODEPAGE_LOCAL);
+   if (str && *str)
+   {
+#if defined(_WIN32) && !defined(_XBOX) && !defined(UNICODE)
+      return mb_to_mb_string_alloc(str, CODEPAGE_UTF8, CODEPAGE_LOCAL);
+#else
+      /* assume string needs no modification if not on Windows */
+      return strdup(str);
+#endif
+   }
+   return NULL;
 }
 
 /* Returned pointer MUST be freed by the caller if non-NULL. */
 char* local_to_utf8_string_alloc(const char *str)
 {
-   return mb_to_mb_string_alloc(str, CODEPAGE_LOCAL, CODEPAGE_UTF8);
+   if (str && *str)
+   {
+#if defined(_WIN32) && !defined(_XBOX) && !defined(UNICODE)
+      return mb_to_mb_string_alloc(str, CODEPAGE_LOCAL, CODEPAGE_UTF8);
+#else
+      /* assume string needs no modification if not on Windows */
+      return strdup(str);
+#endif
+   }
+   return NULL;
 }
 
 /* Returned pointer MUST be freed by the caller if non-NULL. */
@@ -447,52 +451,44 @@ wchar_t* utf8_to_utf16_string_alloc(const char *str)
 char* utf16_to_utf8_string_alloc(const wchar_t *str)
 {
 #ifdef _WIN32
-   int len = 0;
-   int out_len = 0;
+   int len        = 0;
 #else
-   size_t len = 0;
-   size_t out_len = 0;
+   size_t len     = 0;
 #endif
-   char *buf = NULL;
+   char *buf      = NULL;
 
    if (!str || !*str)
       return NULL;
 
 #ifdef _WIN32
-   len = WideCharToMultiByte(CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL);
-
-   if (len)
    {
+      UINT code_page = CP_UTF8;
+      len            = WideCharToMultiByte(code_page,
+            0, str, -1, NULL, 0, NULL, NULL);
+
+      /* fallback to ANSI codepage instead */
+      if (!len)
+      {
+         code_page   = CP_ACP;
+         len         = WideCharToMultiByte(code_page,
+               0, str, -1, NULL, 0, NULL, NULL);
+      }
+
       buf = (char*)calloc(len, sizeof(char));
 
       if (!buf)
          return NULL;
 
-      out_len = WideCharToMultiByte(CP_UTF8, 0, str, -1, buf, len, NULL, NULL);
-   }
-   else
-   {
-      /* fallback to ANSI codepage instead */
-      len = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL);
-
-      if (len)
+      if (WideCharToMultiByte(code_page,
+            0, str, -1, buf, len, NULL, NULL) < 0)
       {
-         buf = (char*)calloc(len, sizeof(char));
-
-         if (!buf)
-            return NULL;
-
-         out_len = WideCharToMultiByte(CP_ACP, 0, str, -1, buf, len, NULL, NULL);
+         free(buf);
+         return NULL;
       }
    }
-
-   if (out_len < 0)
-   {
-      free(buf);
-      return NULL;
-   }
 #else
-   /* NOTE: For now, assume non-Windows platforms' locale is already UTF-8. */
+   /* NOTE: For now, assume non-Windows platforms' 
+    * locale is already UTF-8. */
    len = wcstombs(NULL, str, 0) + 1;
 
    if (len)
@@ -502,13 +498,11 @@ char* utf16_to_utf8_string_alloc(const wchar_t *str)
       if (!buf)
          return NULL;
 
-      out_len = wcstombs(buf, str, len);
-   }
-
-   if (out_len == (size_t)-1)
-   {
-      free(buf);
-      return NULL;
+      if (wcstombs(buf, str, len) == (size_t)-1)
+      {
+         free(buf);
+         return NULL;
+      }
    }
 #endif