Merge pull request #1528 from reicast/fh/android-wipeout

Removing most of the java code and various bug fixes

Author: skmp

core/build.h

@@ -286,10 +286,6 @@
 	#define FEAT_HAS_SOFTREND BUILD_COMPILER == COMPILER_VC	//GCC wants us to enable sse4 globaly to enable intrins
 #endif
 
-#define RAM_SIZE_MAX (32*1024*1024)
-#define VRAM_SIZE_MAX (16*1024*1024)
-#define ARAM_SIZE_MAX (8*1024*1024)
-
 //Depricated build configs
 #ifdef HOST_NO_REC
 #error Dont use HOST_NO_REC
@@ -298,3 +294,108 @@
 #ifdef HOST_NO_AREC
 #error Dont use HOST_NO_AREC
 #endif
+
+// TARGET PLATFORM
+
+#define RAM_SIZE_MAX (32*1024*1024)
+#define VRAM_SIZE_MAX (16*1024*1024)
+#define ARAM_SIZE_MAX (8*1024*1024)
+
+#if (DC_PLATFORM==DC_PLATFORM_DREAMCAST)
+
+	#define BUILD_DREAMCAST 1
+
+	//DC : 16 mb ram, 8 mb vram, 2 mb aram, 2 mb bios, 128k flash
+	#define RAM_SIZE (16*1024*1024)
+	#define VRAM_SIZE (8*1024*1024)
+	#define ARAM_SIZE (2*1024*1024)
+	#define BIOS_SIZE (2*1024*1024)
+	#define FLASH_SIZE (128*1024)
+
+	#define ROM_PREFIX "dc_"
+	#define ROM_NAMES
+	#define NVR_OPTIONAL 0
+
+#elif  (DC_PLATFORM==DC_PLATFORM_DEV_UNIT)
+
+	#define BUILD_DEV_UNIT 1
+
+	//Devkit : 32 mb ram, 8? mb vram, 2? mb aram, 2? mb bios, ? flash
+	#define RAM_SIZE (32*1024*1024)
+	#define VRAM_SIZE (8*1024*1024)
+	#define ARAM_SIZE (2*1024*1024)
+	#define BIOS_SIZE (2*1024*1024)
+	#define FLASH_SIZE (128*1024)
+
+	#define ROM_PREFIX "hkt_"
+	#define ROM_NAMES
+	#define NVR_OPTIONAL 0
+
+#elif  (DC_PLATFORM==DC_PLATFORM_NAOMI)
+
+	//Naomi : 32 mb ram, 16 mb vram, 8 mb aram, 2 mb bios, ? flash
+	#define RAM_SIZE (32*1024*1024)
+	#define VRAM_SIZE (16*1024*1024)
+	#define ARAM_SIZE (8*1024*1024)
+	#define BIOS_SIZE (2*1024*1024)
+	#define BBSRAM_SIZE (32*1024)
+
+	#define ROM_PREFIX "naomi_"
+	#define ROM_NAMES ";epr-21576d.bin"
+	#define NVR_OPTIONAL 1
+
+#elif  (DC_PLATFORM==DC_PLATFORM_NAOMI2)
+
+	//Naomi2 : 32 mb ram, 16 mb vram, 8 mb aram, 2 mb bios, ? flash
+	#define RAM_SIZE (32*1024*1024)
+	#define VRAM_SIZE (16*1024*1024)
+	#define ARAM_SIZE (8*1024*1024)
+	#define BIOS_SIZE (2*1024*1024)
+	#define BBSRAM_SIZE (32*1024)
+
+	#define ROM_PREFIX "n2_"
+	#define ROM_NAMES
+	#define NVR_OPTIONAL 1
+
+#elif  (DC_PLATFORM==DC_PLATFORM_ATOMISWAVE)
+
+	#define BUILD_ATOMISWAVE 1
+
+	//Atomiswave : 16 mb ram, 8 mb vram, 8 mb aram, 128kb bios on flash, 128kb battery-backed ram
+	#define RAM_SIZE (16*1024*1024)
+	#define VRAM_SIZE (8*1024*1024)
+	#define ARAM_SIZE (8*1024*1024)
+	#define BIOS_SIZE (128*1024)
+	#define BBSRAM_SIZE (128*1024)
+
+	#define ROM_PREFIX "aw_"
+	#define ROM_NAMES ";bios.ic23_l"
+	#define NVR_OPTIONAL 1
+
+#else
+	#error invalid build config
+#endif
+
+#define RAM_MASK	(RAM_SIZE-1)
+#define VRAM_MASK	(VRAM_SIZE-1)
+#define ARAM_MASK	(ARAM_SIZE-1)
+#define BIOS_MASK	(BIOS_SIZE-1)
+
+#ifdef FLASH_SIZE
+#define FLASH_MASK	(FLASH_SIZE-1)
+#endif
+
+#ifdef BBSRAM_SIZE
+#define BBSRAM_MASK	(BBSRAM_SIZE-1)
+#endif
+
+#define GD_CLOCK 33868800				//GDROM XTAL -- 768fs
+
+#define AICA_CORE_CLOCK (GD_CLOCK*4/3)		//[45158400]  GD->PLL 3:4 -> AICA CORE	 -- 1024fs
+#define ADAC_CLOCK (AICA_CORE_CLOCK/2)		//[11289600]  44100*256, AICA CORE -> PLL 4:1 -> ADAC -- 256fs
+#define AICA_ARM_CLOCK (AICA_CORE_CLOCK/2)	//[22579200]  AICA CORE -> PLL 2:1 -> ARM
+#define AICA_SDRAM_CLOCK (GD_CLOCK*2)		//[67737600]  GD-> PLL 2 -> SDRAM
+#define SH4_MAIN_CLOCK (200*1000*1000)		//[200000000] XTal(13.5) -> PLL (33.3) -> PLL 1:6 (200)
+#define SH4_RAM_CLOCK (100*1000*1000)		//[100000000] XTal(13.5) -> PLL (33.3) -> PLL 1:3 (100)	, also suplied to HOLLY chip
+#define G2_BUS_CLOCK (25*1000*1000)			//[25000000]  from Holly, from SH4_RAM_CLOCK w/ 2 2:1 plls
+

core/hw/arm7/arm64.cpp

@@ -499,8 +499,13 @@ __asm__ (
 		".hidden arm_dispatch				\n"
 	"arm_dispatch:							\n\t"
 		"ldp w0, w1, [x28, #184]			\n\t"	// load Next PC, interrupt
-
-		"ubfx w2, w0, #2, #21				\n\t"	// w2 = pc >> 2. Note: assuming address space <= 8 MB (23 bits)
+#if ARAM_SIZE == 2*1024*1024
+		"ubfx w2, w0, #2, #19				\n\t"	// w2 = pc >> 2. Note: assuming address space == 2 MB (21 bits)
+#elif ARAM_SIZE == 8*1024*1024
+		"ubfx w2, w0, #2, #21				\n\t"	// w2 = pc >> 2. Note: assuming address space == 8 MB (23 bits)
+#else
+#error Unsupported AICA RAM size
+#endif
 		"cbnz w1, arm_dofiq					\n\t"	// if interrupt pending, handle it
 
 		"add x2, x26, x2, lsl #3			\n\t"	// x2 = EntryPoints + pc << 1

core/hw/gdrom/gdromv3.cpp

@@ -256,6 +256,7 @@ void gd_set_state(gd_states state)
 
 void gd_setdisc()
 {
+	cdda.playing = false;
 	DiscType newd = (DiscType)libGDR_GetDiscType();
 
 	switch(newd)

core/imgread/gdi.cpp

@@ -3,10 +3,22 @@
 #include <sstream>
 #include <algorithm>
 
+// On windows, transform / to \\
+
+string normalize_path_separator(string path)
+{
+#if HOST_OS == OS_WINDOWS
+	std::replace(path.begin(), path.end(), '/', '\\');
+#endif
+
+	return path;
+}
+
 // given file/name.ext or file\name.ext returns file/ or file\, depending on the platform
 // given name.ext returns ./ or .\, depending on the platform
 string OS_dirname(string file)
 {
+	file = normalize_path_separator(file);
 	#if HOST_OS == OS_WINDOWS
 		const char sep = '\\';
 	#else
@@ -25,19 +37,6 @@ string OS_dirname(string file)
 	return file.substr(0, last_slash + 1);
 }
 
-// On windows, transform / to \\
-// On linux, transform \\ to /
-string normalize_path_separator(string path)
-{
-	#if HOST_OS == OS_WINDOWS
-		std::replace( path.begin(), path.end(), '/', '\\');
-	#else
-		std::replace( path.begin(), path.end(), '\\', '/');
-	#endif
-
-	return path;
-}
-
 #if 0 // TODO: Move this to some tests, make it platform agnostic
 namespace {
 	struct OS_dirname_Test {

core/input/gamepad.h

@@ -53,8 +53,8 @@ enum DreamcastKey
 
 	// System axes
 	EMU_AXIS_NONE    = 0x00000,
-	EMU_AXIS_DPAD1_X = 0x00001,
-	EMU_AXIS_DPAD1_Y = 0x00002,
-	EMU_AXIS_DPAD2_X = 0x00003,
-	EMU_AXIS_DPAD2_Y = 0x00004,
+	EMU_AXIS_DPAD1_X = DC_DPAD_LEFT,
+	EMU_AXIS_DPAD1_Y = DC_DPAD_UP,
+	EMU_AXIS_DPAD2_X = DC_DPAD2_LEFT,
+	EMU_AXIS_DPAD2_Y = DC_DPAD2_RIGHT,
 };

core/input/gamepad_device.cpp

@@ -20,6 +20,7 @@
 #include <limits.h>
 #include "gamepad_device.h"
 #include "rend/gui.h"
+#include "oslib/oslib.h"
 
 extern void dc_exit();
 
@@ -32,7 +33,8 @@ std::mutex GamepadDevice::_gamepads_mutex;
 
 bool GamepadDevice::gamepad_btn_input(u32 code, bool pressed)
 {
-	if (_input_detected != NULL && _detecting_button && pressed)
+	if (_input_detected != NULL && _detecting_button 
+			&& os_GetSeconds() >= _detection_start_time && pressed)
 	{
 		_input_detected(code);
 		_input_detected = NULL;
@@ -84,7 +86,8 @@ bool GamepadDevice::gamepad_axis_input(u32 code, int value)
 		v = (get_axis_min_value(code) + get_axis_range(code) - value) * 255 / get_axis_range(code) - 128;
 	else
 		v = (value - get_axis_min_value(code)) * 255 / get_axis_range(code) - 128; //-128 ... + 127 range
-	if (_input_detected != NULL && !_detecting_button && (v >= 64 || v <= -64))
+	if (_input_detected != NULL && !_detecting_button 
+			&& os_GetSeconds() >= _detection_start_time && (v >= 64 || v <= -64))
 	{
 		_input_detected(code);
 		_input_detected = NULL;
@@ -235,3 +238,18 @@ void UpdateVibration(u32 port, float power, float inclination, u32 duration_ms)
 			gamepad->rumble(power, inclination, duration_ms);
 	}
 }
+
+void GamepadDevice::detect_btn_input(input_detected_cb button_pressed)
+{
+	_input_detected = button_pressed;
+	_detecting_button = true;
+	_detection_start_time = os_GetSeconds() + 0.2;
+}
+
+void GamepadDevice::detect_axis_input(input_detected_cb axis_moved)
+{
+	_input_detected = axis_moved;
+	_detecting_button = false;
+	_detection_start_time = os_GetSeconds() + 0.2;
+}
+

core/input/gamepad_device.h

@@ -35,16 +35,8 @@ class GamepadDevice
 	bool gamepad_axis_input(u32 code, int value);
 	virtual ~GamepadDevice() {}
 
-	void detect_btn_input(input_detected_cb button_pressed)
-	{
-		_input_detected = button_pressed;
-		_detecting_button = true;
-	}
-	void detect_axis_input(input_detected_cb axis_moved)
-	{
-		_input_detected = axis_moved;
-		_detecting_button = false;
-	}
+	void detect_btn_input(input_detected_cb button_pressed);
+	void detect_axis_input(input_detected_cb axis_moved);
 	void cancel_detect_input()
 	{
 		_input_detected = NULL;
@@ -104,6 +96,7 @@ class GamepadDevice
 	std::string _api_name;
 	int _maple_port;
 	bool _detecting_button = false;
+	double _detection_start_time;
 	input_detected_cb _input_detected;
 	bool _remappable;
 	float _dead_zone = 0.1f;

core/rec-ARM/ngen_arm.S

@@ -58,6 +58,7 @@ bkpt #0
 bkpt
 #endif
 ubfx r0,r3,#5,#19		@ get vram offset
+						@ should be only 18 bits for 8MB VRAM but it wraps around on dc
 add r3,r1,#0x04000000	@ get vram ptr from r1, part 1
 add r3,#512				@ get ram ptr from r1, part 2
 add r3,r0,lsl #5		@ ram + offset
@@ -180,6 +181,7 @@ CSYM(no_update):              @ next_pc _MUST_ be on r4 *R4 NOT R0 anymore*
 #if RAM_SIZE_MAX == 33554432
 	sub r2,r8,#0x4100000
 	ubfx r1,r4,#1,#24			@ 24+1 bits: 32 MB
+								@ RAM wraps around so if actual RAM size is 16MB, we won't overflow
 #elif RAM_SIZE_MAX == 16777216
 	sub r2,r8,#0x2100000
 	ubfx r1,r4,#1,#23			@ 23+1 bits: 16 MB
@@ -241,7 +243,13 @@ HIDDEN(arm_dispatch)
 CSYM(arm_dispatch):
 	ldrd r0,r1,[r8,#184]		@load: Next PC, interrupt
 
+#if ARAM_SIZE == 2*1024*1024
+	ubfx r2,r0,#2,#19		@ assuming 2 MB address space max (21 bits)
+#elif ARAM_SIZE == 8*1024*1024
 	ubfx r2,r0,#2,#21		@ assuming 8 MB address space max (23 bits)
+#else
+#error Unsupported AICA RAM size
+#endif
 	cmp r1,#0
 	bne arm_dofiq
 

core/rec-ARM64/rec_arm64.cpp

@@ -617,31 +617,25 @@ class Arm64Assembler : public MacroAssembler
 				break;
 
 			case shop_pref:
-				Mov(w0, regalloc.MapRegister(op.rs1));
-				if (op.flags != 0x1337)
 				{
 					Lsr(w1, regalloc.MapRegister(op.rs1), 26);
 					Cmp(w1, 0x38);
-				}
+					Label not_sqw;
+					B(&not_sqw, ne);
+					Mov(w0, regalloc.MapRegister(op.rs1));
 
-				if (CCN_MMUCR.AT)
-				{
-					Ldr(x9, reinterpret_cast<uintptr_t>(&do_sqw_mmu));
-				}
-				else
-				{
-					Sub(x9, x28, offsetof(Sh4RCB, cntx) - offsetof(Sh4RCB, do_sqw_nommu));
-					Ldr(x9, MemOperand(x9));
-					Sub(x1, x28, offsetof(Sh4RCB, cntx) - offsetof(Sh4RCB, sq_buffer));
-				}
-				if (op.flags == 0x1337)
-					Blr(x9);
-				else
-				{
-					Label no_branch;
-					B(&no_branch, ne);
+					if (CCN_MMUCR.AT)
+					{
+						Ldr(x9, reinterpret_cast<uintptr_t>(&do_sqw_mmu));
+					}
+					else
+					{
+						Sub(x9, x28, offsetof(Sh4RCB, cntx) - offsetof(Sh4RCB, do_sqw_nommu));
+						Ldr(x9, MemOperand(x9));
+						Sub(x1, x28, offsetof(Sh4RCB, cntx) - offsetof(Sh4RCB, sq_buffer));
+					}
 					Blr(x9);
-					Bind(&no_branch);
+					Bind(&not_sqw);
 				}
 				break;
 

core/rend/gui.cpp

@@ -1488,3 +1488,10 @@ int msgboxf(const wchar* text, unsigned int type, ...) {
     return 1;
 }
 
+extern bool subfolders_read;
+
+void gui_refresh_files()
+{
+	game_list_done = false;
+	subfolders_read = false;
+}