Merge upstream

Author: Flyinghead

.gitignore

@@ -51,3 +51,10 @@ shell/linux/nosym-reicast.elf
 shell/linux/reicast.elf
 
 reicast-ios.xccheckout
+
+# Android Studio
+.gradle
+.idea
+*.iml
+.externalNativeBuild
+shell/android-studio/app/src/main/assets/build

.travis.yml

@@ -3,41 +3,55 @@ notifications:
 language: android
 android:
   components:
-    - platform-tools
-    - tools
-    - build-tools-22.0.0
-    - android-21
+  - platform-tools
+  - tools
+  - build-tools-27.0.3
+  - android-25
+  - extra-google-m2repository
+  - extra-android-m2repository
+  licenses:
+  - android-sdk-preview-license-.+
+  - android-sdk-license-.+
 sudo: false
+before_cache:
+- rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+cache:
+  directories:
+  - "$HOME/.gradle/caches/"
+  - "$HOME/.gradle/wrapper/"
+  - "$HOME/.android/build-cache"
 before_install:
-- test -z "$encrypted_c726d225a9d9_key" || openssl aes-256-cbc -K $encrypted_c726d225a9d9_key -iv $encrypted_c726d225a9d9_iv
-  -in debug.keystore.enc -out debug.keystore -d
+- test -z "$encrypted_c726d225a9d9_key" || openssl aes-256-cbc -K $encrypted_c726d225a9d9_key -iv $encrypted_c726d225a9d9_iv -in secure.tar.enc -out secure.tar -d
+- test -z "$encrypted_c726d225a9d9_key" || tar -xvf secure.tar
+- test -z "$encrypted_c726d225a9d9_key" || mv reicast-beta-cd.jks shell/android-studio/reicast-beta-cd.jks
+- test -z "$encrypted_c726d225a9d9_key" || mv reicast-beta-cd.p12 shell/android-studio/reicast-beta-cd.p12
 - GIT_HASH=`git log --pretty=format:'%h' -n 1`
 - GIT_BUILD=`git describe --all --always`-$GIT_HASH
+- mkdir "$ANDROID_HOME/licenses" || true
+- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
+- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
+- chmod +x shell/android-studio/gradlew
 install:
 - sudo apt-get -qq update
-- sudo apt-get install ant
-- wget http://dl.google.com/android/ndk/android-ndk-r10d-linux-x86_64.bin
-- chmod +x android-ndk-r10d-linux-x86_64.bin
-- ./android-ndk-r10d-linux-x86_64.bin -y | grep -v Extracting
-- mv android-ndk-r10d android-ndk
-- rm android-ndk-r10d-linux-x86_64.bin
-- export NDK=$(pwd)/android-ndk
-- export ANDROID_NDK=$(pwd)/android-ndk
+- touch ~/.android/repositories.cfg
+- echo y | sdkmanager 'ndk-bundle'
+- export NDK=ANDROID_NDK=ANDROID_NDK_HOME=$ANDROID_HOME/ndk-bundle
 - export PATH=${PATH}:$ANDROID_HOME/tools
 - export PATH=${PATH}:$ANDROID_HOME/platform-tools
 - export PATH=${PATH}:$NDK
 - mkdir -p ~/.android
 - test -z "$encrypted_c726d225a9d9_key" || mv debug.keystore ~/.android/debug.keystore
 before_script: 
 script:
-- cd shell/android
-- android update project -p . --target "android-21"
+- cd shell/android-studio
 - export NUMBER_OF_PROCESSORS=2
-- ant debug
+- "./gradlew build"
+- test -z "$encrypted_c726d225a9d9_key" || ./travis-release.sh
 before_deploy:
 - cd ../../
 - mkdir -p artifacts/$GIT_BUILD/
-- cp shell/android/bin/reicast-debug.apk  artifacts/$GIT_BUILD/reicast-android-debug-$GIT_HASH.apk
+- cp shell/android-studio/app/build/outputs/apk/debug/app-debug.apk artifacts/$GIT_BUILD/reicast-android-debug-$GIT_HASH.apk
 deploy:
   provider: s3
   access_key_id: AKIAJR5J3OHAQUP5BHHQ

README.md

@@ -4,7 +4,8 @@ reicast is a multi-platform Sega Dreamcast emulator.
 
 This is a developer-oriented resource, if you just want bins head over to http://reicast.com/
 
-For development discussion, [join #reicast in freenode](https://webchat.freenode.net/?channels=reicast)
+For development discussion, join [#reicast in freenode](https://webchat.freenode.net/?channels=reicast)
+ or stop by the [reicast Discord server](http://discord.gg/Hc6CF72)
 
 Caution
 -------
@@ -16,6 +17,15 @@ If you are interested into further porting/adapting/whatever, *please* don't for
 
 Let's try to keep everything under a single project :)
 
+Submitting Issues
+----------------
+Please take a moment to search the open issues for one similar to yours and add your info to it.  
+If you cannot find a similar issue, click the 'New Issue' button and make sure to fill out the form.
+
+*Please Note:*  
+Duplicate issues may be closed with a link to the existing issue.  
+Bugs that do not include a form may be closed until it is filled out.
+
 Contributing
 ------------
 For small/one-off fixes a PR from a github fork is alright. For longer term collaboration we prefer to use namespaced branches in the form of `<username>/<whatever>` in the main repo. 

core/arm_emitter/E_DataOp.h

@@ -153,18 +153,21 @@ ADD.SP.REG	0x008D0000
 			for (int i=0;i<=30;i+=2)
 			{
 				u32 immv=(imm32<<i) | (imm32>>(32-i));
+				if (i == 0)
+					immv = imm32;
 				if (immv<256)
 				{
 					return ((i/2)<<8) | immv;
 				}
 			}
-			
+
 			return -1;
 		}
 
 		static u32 ARMImmid8r4(u32 imm8r4)
 		{
 			u32 rv = ARMImmid8r4_enc(imm8r4);
+
 			verify(rv!=-1);
 			return rv;
 		}

core/core.mk

@@ -104,7 +104,7 @@ ifdef NO_REC
 endif
 
 ifdef USE_GLES
-  RZDCY_CFLAGS += -DGLES
+  RZDCY_CFLAGS += -DGLES -fPIC
 endif
 
 ifdef HAS_SOFTREND

core/deps/libwebsocket/context.c

@@ -25,6 +25,10 @@
 #define LWS_BUILD_HASH "unknown-build-hash"
 #endif
 
+#ifdef WIN32
+#define getdtablesize() 30000
+#endif
+
 static const char *library_version = LWS_LIBRARY_VERSION " " LWS_BUILD_HASH;
 
 /**
@@ -122,7 +126,11 @@ libwebsocket_create_context(struct lws_context_creation_info *info)
 	context->options = info->options;
 	context->iface = info->iface;
 	/* to reduce this allocation, */
-	context->max_fds = getdtablesize();
+#ifdef WIN32
+	context->max_fds = getdtablesize ();
+#else
+	context->max_fds = sysconf(_SC_OPEN_MAX);
+#endif
 	lwsl_notice(" static allocation: %u + (%u x %u fds) = %u bytes\n",
 		sizeof(struct libwebsocket_context),
 		sizeof(struct libwebsocket_pollfd) +

core/emitter/x86_emitter.h

@@ -228,6 +228,22 @@ struct /*__declspec(dllexport)*/  x86_ptr_imm
 	{
 		this->ptr=ptr;
 	}
+
+#if HOST_CPU != CPU_X64
+#ifndef WIN32
+	template<typename Rv, typename ...Args>
+	x86_ptr_imm(Rv(* ptr)(Args...))
+	{
+		this->ptr= reinterpret_cast<void*>(ptr);
+	}
+#endif
+
+    template<typename Rv, typename ...Args>
+    x86_ptr_imm(Rv(DYNACALL * ptr)(Args...))
+    {
+        this->ptr= reinterpret_cast<void*>(ptr);
+    }
+#endif
 };
 
 enum x86_mrm_mod

core/hw/arm7/arm7.cpp

@@ -790,7 +790,7 @@ void armv_prof(OpType opt,u32 op,u32 flg);
 
 extern "C" void arm_dispatch();
 extern "C" void arm_exit();
-extern "C" void DYNACALL arm_mainloop(u32 cycl);
+extern "C" void DYNACALL arm_mainloop(u32 cycl, void* regs, void* entrypoints);
 extern "C" void DYNACALL arm_compilecode();
 
 template <bool L, bool B>
@@ -1470,7 +1470,7 @@ naked void DYNACALL arm_compilecode()
 	}
 }
 
-naked void DYNACALL arm_mainloop(u32 cycl)
+naked void DYNACALL arm_mainloop(u32 cycl, void* regs, void* entrypoints)
 {
 	__asm
 	{
@@ -1590,8 +1590,13 @@ void armv_end(void* codestart, u32 cycl)
 		SUB(r5,r5,cycl,true);
 	else
 	{
-		SUB(r5,r5,256);
-		SUB(r5,r5,cycl-256,true);
+		u32 togo = cycl;
+		while(ARMImmid8r4_enc(togo) == -1)
+		{
+			SUB(r5,r5,256);
+			togo -= 256;
+		}
+		SUB(r5,r5,togo,true);
 	}
 	JUMP((u32)&arm_exit,CC_MI);	//statically predicted as not taken
 	JUMP((u32)&arm_dispatch);
@@ -1620,7 +1625,7 @@ void arm_Run(u32 CycleCount)
 
 	for (int i=0;i<32;i++)
 	{
-		arm_mainloop(CycleCount/32);
+		arm_mainloop(CycleCount/32, arm_Reg, EntryPoints);
 		libAICA_TimeStep();
 	}
 

core/hw/pvr/ta_ctx.cpp

@@ -15,6 +15,28 @@ tad_context ta_tad;
 TA_context*  vd_ctx;
 rend_context vd_rc;
 
+#if ANDROID
+#include <errno.h>
+#include <malloc.h>
+
+int posix_memalign(void** memptr, size_t alignment, size_t size) {
+  if ((alignment & (alignment - 1)) != 0 || alignment == 0) {
+    return EINVAL;
+  }
+
+  if (alignment % sizeof(void*) != 0) {
+    return EINVAL;
+  }
+
+  *memptr = memalign(alignment, size);
+  if (*memptr == NULL) {
+    return errno;
+  }
+
+  return 0;
+}
+#endif
+
 // helper for 32 byte aligned memory allocation
 void* OS_aligned_malloc(size_t align, size_t size)
 {

core/linux-dist/evdev.cpp

@@ -471,6 +471,7 @@
 					break;
 			}
 		}
+		return true;
 	}
 
 	void input_evdev_rumble(EvdevController* controller, u16 pow_strong, u16 pow_weak)