Add SF2000 platform

Author: madcock

Makefile

@@ -322,6 +322,18 @@ else ifeq ($(platform), gcw0)
    DISABLE_ERROR_LOGGING := 1
    CFLAGS += -march=mips32 -mtune=mips32r2 -mhard-float
 
+# SF2000
+else ifeq ($(platform), sf2000)
+   TARGET := $(TARGET_NAME)_libretro_$(platform).a
+   MIPS:=/opt/mips32-mti-elf/2019.09-03-2/bin/mips-mti-elf-
+   CC = $(MIPS)gcc
+   AR = $(MIPS)ar
+   CFLAGS = -EL -march=mips32 -mtune=mips32 -msoft-float -ffast-math -fomit-frame-pointer
+   CFLAGS += -G0 -mno-abicalls -fno-pic 
+   CFLAGS += -ffunction-sections -fdata-sections
+   CFLAGS += -DSF2000 -DDISABLE_ERROR_LOGGING
+   STATIC_LINKING = 1
+
 # MIYOO
 else ifeq ($(platform), miyoo)
    TARGET := $(TARGET_NAME)_libretro.so

Makefile.common

@@ -1811,13 +1811,15 @@ SOURCES_C += $(CORE_DIR)/src/libretro/libretro.c \
 				 $(CORE_DIR)/src/libretro/shared.c
 
 ifeq ($(WANT_LIBCO), 1)
-	DEFS += -DWANT_LIBCO -I$(LIBRETRO_COMM_DIR)/include
-	SOURCES_C += $(LIBRETRO_COMM_DIR)/libco/libco.c
-else
-	SOURCES_C += $(LIBRETRO_COMM_DIR)/rthreads/rthreads.c
+	DEFS += -DWANT_LIBCO
 endif
 
 ifneq ($(STATIC_LINKING), 1)
+	ifeq ($(WANT_LIBCO), 1)
+		SOURCES_C += $(LIBRETRO_COMM_DIR)/libco/libco.c
+	else
+		SOURCES_C += $(LIBRETRO_COMM_DIR)/rthreads/rthreads.c
+	endif
 	SOURCES_C += $(LIBRETRO_COMM_DIR)/compat/compat_strl.c \
 		$(LIBRETRO_COMM_DIR)/compat/compat_strcasestr.c \
 		$(LIBRETRO_COMM_DIR)/file/file_path.c 

src/libretro/fileio.c

@@ -1448,8 +1448,9 @@ int osd_display_loading_rom_message (const char *name, int current, int total)
 		printf ("loading %-12s\n", name);
 	else
 		printf ("             \n");
+#if !defined(SF2000)
 	fflush (stdout);
-
+#endif
 	if( keyboard_pressed (KEYCODE_LCONTROL) && keyboard_pressed (KEYCODE_C) )
 		return 1;
 

src/libretro/libretro.c

@@ -89,7 +89,11 @@ void decompose_rom_sample_path(char *rompath, char *samplepath);
 void init_joy_list(void);
 
 extern UINT32 create_path_recursive(char *path);
-	
+
+#if defined(SF2000)
+static retro_log_printf_t log_cb;
+#endif
+
 #if defined(_3DS)
 void* linearMemAlign(size_t size, size_t alignment);
 void linearFree(void* mem);
@@ -98,11 +102,15 @@ void linearFree(void* mem);
 void CLIB_DECL logerror(const char *text,...)
 {
 #ifdef DISABLE_ERROR_LOGGING
+#if defined(SF2000)
+   //log_cb(RETRO_LOG_DEBUG, text);
+#else
    va_list arg;
    va_start(arg,text);
    vprintf(text,arg);
    va_end(arg);
 #endif
+#endif
 }
 
 int global_showinfo = 1;
@@ -119,11 +127,22 @@ int attenuation = 0;
 
 void gp2x_printf(char* fmt, ...)
 {
-   va_list marker;
-	
-   va_start(marker, fmt);
-   vprintf(fmt, marker);
-   va_end(marker);
+#if defined(SF2000)
+	char buffer[500];
+
+	va_list args;
+	va_start(args, fmt);
+	vsnprintf(buffer, sizeof(buffer), fmt, args);
+	va_end(args);
+
+	if (log_cb)
+		log_cb(RETRO_LOG_INFO, buffer);
+#else
+    va_list marker;
+    va_start(marker, fmt);
+    vprintf(fmt, marker);
+    va_end(marker);
+#endif
 }
 
 void gp2x_set_video_mode(int bpp,int width,int height)
@@ -140,6 +159,9 @@ void gp2x_video_setpalette(void)
 unsigned long gp2x_joystick_read(int n)
 {
    (void)n;
+#if defined(SF2000)
+   return 0;
+#endif
 }
 
 int osd_init(void)
@@ -316,6 +338,14 @@ void retro_set_environment(retro_environment_t cb)
    environ_cb = cb;
 
    cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void*)vars);
+   
+#if defined(SF2000)
+   struct retro_log_callback log;
+   if (environ_cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &log))
+      log_cb = log.log;
+   else
+      log_cb = NULL;
+#endif
 }
 
 void retro_set_audio_sample(retro_audio_sample_t cb)
@@ -350,8 +380,13 @@ void retro_reset(void)
 
 static void update_input(void)
 {
+#if !defined(SF2000)
 #define RK(port,key)     input_state_cb(port, RETRO_DEVICE_KEYBOARD, 0,RETROK_##key)
 #define JS(port, button) joypad_bits & (1 << RETRO_DEVICE_ID_JOYPAD_##button)
+#else
+#define RK(port,key)     (input_state_cb(port, RETRO_DEVICE_KEYBOARD, 0,RETROK_##key))
+#define JS(port, button) (joypad_bits & (1 << RETRO_DEVICE_ID_JOYPAD_##button))
+#endif
 	int i, j, c = 0;
 	input_poll_cb();
 
@@ -388,7 +423,11 @@ static void update_input(void)
 		joy_pressed[c++] = JS(i, L);
 		joy_pressed[c++] = JS(i, R);
 
+#if defined(SF2000)
+		key[KEY_TAB] |= (JS(i, L) > 0) && (JS(i, START) > 0);
+#else
 		key[KEY_TAB] |= JS(i, R2);
+#endif
 	}
 
 	key[KEY_A] =RK(0, a);
@@ -515,8 +554,14 @@ void hook_video_done(void)
 void run_thread_proc(void)
 {
    run_game(game_index);
+#if !defined(SF2000)
    hook_audio_done();
    hook_video_done();
+#else
+   // never exit a co-thread
+   while (true)
+      co_switch(main_thread);
+#endif
 }
 #else
 static void hook_check(void)
@@ -548,6 +593,7 @@ void hook_video_done(void)
    slock_unlock(libretro_mutex);
 }
 
+#if !defined(SF2000)
 #ifdef WANT_LIBCO
 void *run_thread_proc(void *v)
 {
@@ -569,6 +615,15 @@ void run_thread_proc(void *v)
    hook_video_done();
 }
 #endif
+#else
+void run_thread_proc(void *v)
+{
+   run_game(game_index);
+   thread_done = 1;
+   hook_audio_done();
+   hook_video_done();
+}
+#endif
 
 static void lock_mame(void)
 {
@@ -716,6 +771,7 @@ void retro_run(void)
       }
    }
 
+#ifndef WANT_LIBCO
    audio_done = 0;
    video_done = 0;
 
@@ -804,7 +860,11 @@ bool retro_load_game(const struct retro_game_info *info)
    enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565;
    if (!environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt))
    {
+#if !defined(SF2000)
       fprintf(stderr, "[libretro]: RGB565 is not supported.\n");
+#else
+      logerror("[libretro]: RGB565 is not supported.\n");
+#endif
       return false;
    }
 
@@ -834,8 +894,14 @@ bool retro_load_game(const struct retro_game_info *info)
   }
    printf("SAVE_DIRECTORY: %s\n", retro_save_directory);
 
+#if !defined(SF2000)
    sprintf(core_sys_directory,"%s%cmame2000\0",retro_system_directory,slash);
    sprintf(core_save_directory,"%s%cmame2000\0",retro_save_directory,slash);
+#else
+   sprintf(core_sys_directory,"%s%cmame2000",retro_system_directory,slash);
+   sprintf(core_save_directory,"%s%cmame2000",retro_save_directory,slash);
+#endif
+
    printf("MAME2000_SYS_DIRECTORY: %s\n", core_sys_directory);
    printf("MAME2000_SAVE_DIRECTORY: %s\n", core_save_directory);
 
@@ -857,6 +923,9 @@ bool retro_load_game(const struct retro_game_info *info)
    strcat(IMAMESAMPLEPATH, "/samples");
 
    /* do we have a driver for this? */
+#if defined(SF2000)
+   game_index = -1;
+#endif
    for (i = 0; drivers[i] && (game_index == -1); i++)
    {
 	   if (strcasecmp(baseName,drivers[i]->name) == 0)
@@ -871,6 +940,9 @@ bool retro_load_game(const struct retro_game_info *info)
 	   printf("Game \"%s\" not supported\n", baseName);
 	   return false;
    }
+#if defined(SF2000)
+   printf("game_index=%d driver_name=%s\n", game_index, drivers[game_index]->name);
+#endif
 
    /* parse generic (os-independent) options */
    //parse_cmdline (argc, argv, game_index);
@@ -912,6 +984,10 @@ bool retro_load_game(const struct retro_game_info *info)
    options.samplerate = sample_rate;
    usestereo = stereo_enabled;
 
+#if defined(SF2000)
+   printf("sample_rate=%d\n", sample_rate);
+#endif
+
    /* This is needed so emulated YM3526/YM3812 chips are used instead on physical ones. */
    options.use_emulated_ym3812 = 1;
 
@@ -1037,13 +1113,23 @@ bool retro_load_game(const struct retro_game_info *info)
 
    decompose_rom_sample_path(IMAMEBASEPATH, IMAMESAMPLEPATH);
 
+#if !defined(SF2000)
    mame_sleep = 1;
+#endif
 
 #ifdef WANT_LIBCO
    main_thread = co_active();
    core_thread = co_create(0x10000, run_thread_proc);
    co_switch(core_thread);
+#if defined(SF2000)
+   extern int bailing;
+   if (bailing)
+       return false;
+#endif   
 #else
+#if defined(SF2000)
+   mame_sleep = 1;
+#endif   
    run_thread = sthread_create(run_thread_proc, NULL);
 #endif
 

src/tilemap.c

@@ -474,6 +474,11 @@ struct tilemap *tilemap_create(
 			first_tilemap = tilemap;
 			return tilemap;
 		}
+#if defined(SF2000)
+		else
+			printf("error creating tilemap\n");
+
+#endif
 		tilemap_dispose( tilemap );
 	}
 	return 0;
@@ -484,9 +489,17 @@ void tilemap_dispose( struct tilemap *tilemap ){
 		first_tilemap = tilemap->next;
 	}
 	else {
+#if !defined(SF2000)
 		struct tilemap *prev = first_tilemap;
 		while( prev->next != tilemap ) prev = prev->next;
 		prev->next =tilemap->next;
+#else
+		if (first_tilemap) {
+			struct tilemap *prev = first_tilemap;
+			while( prev->next != tilemap ) prev = prev->next;
+			prev->next =tilemap->next;
+		}
+#endif
 	}
 
 	free( tilemap->cached_tile_info );

src/vidhrdw/sf1.c

@@ -7,6 +7,10 @@ int sf1_active = 0;
 
 static struct tilemap *bgb_tilemap, *bgm_tilemap, *char_tilemap;
 
+#if defined(SF2000)
+static data16_t bgscroll, fgscroll;
+static int bgprev = 0, fgprev = 0;
+#endif
 
 /***************************************************************************
 
@@ -16,7 +20,11 @@ static struct tilemap *bgb_tilemap, *bgm_tilemap, *char_tilemap;
 
 static void get_bgb_tile_info(int tile_index)
 {
+#if !defined(SF2000)
 	unsigned char *base = memory_region(REGION_GFX5) + 2*tile_index;
+#else
+	unsigned char *base = memory_region(REGION_GFX5) + ((bgscroll >> 4) << 5) + 2*tile_index;
+#endif
 	int attr = base[0x10000];
 	int color = base[0];
 	int code = (base[0x10000+1]<<8) | base[1];
@@ -26,7 +34,11 @@ static void get_bgb_tile_info(int tile_index)
 
 static void get_bgm_tile_info(int tile_index)
 {
+#if !defined(SF2000)
 	unsigned char *base = memory_region(REGION_GFX5) + 0x20000 + 2*tile_index;
+#else
+	unsigned char *base = memory_region(REGION_GFX5) + ((fgscroll >> 4) << 5) + 0x20000 + 2*tile_index;
+#endif
 	int attr = base[0x10000];
 	int color = base[0];
 	int code = (base[0x10000+1]<<8) | base[1];
@@ -53,8 +65,13 @@ int sf1_vh_start(void)
 {
 	int i;
 
+#if !defined(SF2000)
 	bgb_tilemap =  tilemap_create(get_bgb_tile_info, tilemap_scan_cols,TILEMAP_OPAQUE,     16,16,2048,16);
 	bgm_tilemap =  tilemap_create(get_bgm_tile_info, tilemap_scan_cols,TILEMAP_TRANSPARENT,16,16,2048,16);
+#else
+	bgb_tilemap =  tilemap_create(get_bgb_tile_info, tilemap_scan_cols,TILEMAP_OPAQUE,     16,16,(512/16)+1,16);
+	bgm_tilemap =  tilemap_create(get_bgm_tile_info, tilemap_scan_cols,TILEMAP_TRANSPARENT,16,16,(512/16)+1,16);
+#endif
 	char_tilemap = tilemap_create(get_char_tile_info,tilemap_scan_rows,TILEMAP_TRANSPARENT, 8, 8,  64,32);
 
 	if (!bgb_tilemap || !bgm_tilemap || !char_tilemap)
@@ -90,12 +107,28 @@ WRITE_HANDLER( sf1_videoram_w )
 
 WRITE_HANDLER( sf1_deltaxb_w )
 {
+#if !defined(SF2000)
 	tilemap_set_scrollx(bgb_tilemap, 0, data);
+#else
+	bgscroll = COMBINE_WORD(bgscroll, data);
+	tilemap_set_scrollx(bgb_tilemap,0,bgscroll & 0x0f);
+
+	if ((bgscroll >> 4) != bgprev) tilemap_mark_all_tiles_dirty( bgb_tilemap );
+	bgprev = bgscroll >> 4;
+#endif
 }
 
 WRITE_HANDLER( sf1_deltaxm_w )
 {
+#if !defined(SF2000)
 	tilemap_set_scrollx(bgm_tilemap, 0, data);
+#else
+	fgscroll = COMBINE_WORD(fgscroll, data);
+	tilemap_set_scrollx(bgm_tilemap,0,fgscroll & 0x0f);
+
+	if ((fgscroll >> 4) != fgprev) tilemap_mark_all_tiles_dirty( bgm_tilemap );
+	fgprev = fgscroll >> 4;
+#endif
 }
 
 void sf1_active_w(int data)