Merge branch clean-exit-light

Author: Flyinghead

core/dispframe.cpp

@@ -4,7 +4,7 @@
 #include "rend/TexCache.h"
 
 extern cResetEvent rs;
-extern int rend_en;
+extern int renderer_enabled;
 extern cResetEvent frame_finished;
 extern TA_context* rqueue;
 
@@ -33,7 +33,7 @@ void dc_run()
 	double t1 = os_GetSeconds();
 	printf("Loaded context in %g ms\n", (t1- t0) * 1000);
 
-	while(rend_en)
+	while(renderer_enabled)
 	{
 		tad_context saved_tad = ctx->tad;
 		rend_context saved_rend = ctx->rend;

core/hw/pvr/Renderer_if.cpp

@@ -76,6 +76,7 @@ u32 VertexCount=0;
 u32 FrameCount=1;
 
 Renderer* renderer;
+bool renderer_enabled = true;	// Signals the renderer thread to exit
 
 #if !defined(TARGET_NO_THREADS)
 cResetEvent rs(false,true);
@@ -251,6 +252,9 @@ bool rend_single_frame()
 #if !defined(TARGET_NO_THREADS)
 		rs.Wait();
 #endif
+		if (!renderer_enabled)
+			return false;
+
 		_pvrrc = DequeueRender();
 	}
 	while (!_pvrrc);
@@ -266,8 +270,6 @@ bool rend_single_frame()
 	return do_swp;
 }
 
-int rend_en = true;
-
 void* rend_thread(void* p)
 {
 #if FEAT_HAS_NIXPROF
@@ -308,22 +310,14 @@ void* rend_thread(void* p)
 	//we don't know if this is true, so let's not speculate here
 	//renderer->Resize(640, 480);
 
-	while(rend_en)
+	while (renderer_enabled)
 	{
 		if (rend_single_frame())
 			renderer->Present();
 	}
 
-	return 0;
-}
-
-#if HOST_OS==OS_LINUX || HOST_OS==OS_DARWIN
-void rend_terminate()
-{
-	rend_en = false;
-	printf("rend_terminate called\n");
+	return NULL;
 }
-#endif
 
 #if !defined(TARGET_NO_THREADS)
 cThread rthd(rend_thread,0);
@@ -539,11 +533,20 @@ bool rend_init()
 
 void rend_term()
 {
+	renderer_enabled = false;
+#if !defined(TARGET_NO_THREADS)
+	rs.Set();
+#endif
+
 	if (fCheckFrames)
 		fclose(fCheckFrames);
 
 	if (fLogFrames)
 		fclose(fLogFrames);
+
+#if !defined(TARGET_NO_THREADS)
+	rthd.WaitToEnd();
+#endif
 }
 
 void rend_vblank()

core/linux-dist/evdev.cpp

@@ -16,6 +16,8 @@
 	libevdev_func1_t libevdev_event_code_from_name;
 	libevdev_func2_t libevdev_event_code_get_name;
 
+	void dc_stop(void);
+
 	void load_libevdev()
 	{
 		if (libevdev_tried)
@@ -355,8 +357,7 @@
 					} else if (ie.code == controller->mapping->Btn_Start) {
 						SET_FLAG(kcode[port], DC_BTN_START, ie.value);
 					} else if (ie.code == controller->mapping->Btn_Escape) {
-						if (ie.value == 0)
-							start_shutdown();
+						dc_stop();
 					} else if (ie.code == controller->mapping->Btn_DPad_Left) {
 						SET_FLAG(kcode[port], DC_DPAD_LEFT, ie.value);
 					} else if (ie.code == controller->mapping->Btn_DPad_Right) {

core/linux-dist/joystick.cpp

@@ -1,10 +1,11 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/types.h>
-#include <linux/joystick.h>
 #include "linux-dist/joystick.h"
 
 #if defined(USE_JOYSTICK)
+#include <linux/joystick.h>
+
 	const u32 joystick_map_btn_usb[JOYSTICK_MAP_SIZE]      = { DC_BTN_Y, DC_BTN_B, DC_BTN_A, DC_BTN_X, 0, 0, 0, 0, 0, DC_BTN_START };
 	const u32 joystick_map_axis_usb[JOYSTICK_MAP_SIZE]     = { DC_AXIS_X, DC_AXIS_Y, 0, 0, 0, 0, 0, 0, 0, 0 };
 

core/linux-dist/main.cpp

@@ -252,6 +252,7 @@ void os_CreateWindow()
 void common_linux_setup();
 int dc_init(int argc,wchar* argv[]);
 void dc_run();
+void dc_term();
 
 #ifdef TARGET_PANDORA
 	void gl_term();
@@ -426,23 +427,6 @@ std::vector<string> find_system_data_dirs()
 	return dirs;
 }
 
-#if HOST_OS==OS_LINUX
-#if defined(SUPPORT_X11)
-void x11_gl_context_destroy();
-void x11_window_destroy();
-#endif
-void dc_term();
-void rend_terminate();
-void ngen_terminate();
-
-void start_shutdown(void)
-{
-    printf("start_shutdown called\n");
-    rend_terminate();
-    ngen_terminate();
-}
-#endif
-
 int main(int argc, wchar* argv[])
 {
 	#ifdef TARGET_PANDORA
@@ -491,31 +475,25 @@ int main(int argc, wchar* argv[])
 		emscripten_set_main_loop(&dc_run, 100, false);
 	#endif
 
-
 	#ifdef TARGET_PANDORA
 		clean_exit(0);
 	#endif
 
-#if HOST_OS==OS_LINUX
 	dc_term();
-#if defined(USE_EVDEV)
-	printf("closing any open controllers\n");
 
-	for (int port = 0; port < 4 ; port++)
-	{
-		if(evdev_controllers[port].fd >= 0)
+	#if defined(USE_EVDEV)
+		for (int port = 0; port < 4 ; port++)
 		{
-			close(evdev_controllers[port].fd);
+			if(evdev_controllers[port].fd >= 0)
+			{
+				close(evdev_controllers[port].fd);
+			}
 		}
-	}
-#endif
-#if defined(SUPPORT_X11)
-	/* Close the GL context */
-	x11_gl_context_destroy();
-	/* Destroy the window */
-	x11_window_destroy();
-#endif
-#endif
+	#endif
+
+	#if defined(SUPPORT_X11)
+		x11_window_destroy();
+	#endif
 
 	return 0;
 }

core/linux-dist/x11.cpp

@@ -35,14 +35,16 @@ int x11_width;
 int x11_height;
 
 int ndcid = 0;
-void* x11_glc;
+void* x11_glc = NULL;
 bool x11_fullscreen = false;
+Atom wmDeleteMessage;
 
 void* x11_vis;
-Atom wmDeleteMessage;
 
 extern bool dump_frame_switch;
 
+void dc_stop(void);
+
 enum
 {
 	_NET_WM_STATE_REMOVE =0,
@@ -67,19 +69,17 @@ void x11_window_set_fullscreen(bool fullscreen)
 		XSendEvent((Display*)x11_disp, DefaultRootWindow((Display*)x11_disp), False, SubstructureNotifyMask, &xev);
 }
 
-void start_shutdown(void);
-
 void event_x11_handle()
 {
 	XEvent event;
 
-	while(XPending((Display *)x11_disp)) {
+	while(XPending((Display *)x11_disp))
+	{
 		XNextEvent((Display *)x11_disp, &event);
 
 		if (event.type == ClientMessage &&
-				event.xclient.data.l[0] == wmDeleteMessage) {
-			start_shutdown();
-		}
+				event.xclient.data.l[0] == wmDeleteMessage)
+			dc_stop();
 	}
 }
 
@@ -98,7 +98,7 @@ void input_x11_handle()
 				case KeyRelease:
 					if (e.type == KeyRelease && e.xkey.keycode == KEY_ESC)
 					{
-						start_shutdown();
+						dc_stop();
 					}
 #ifndef RELEASE
 					else if (e.xkey.keycode == KEY_F10)
@@ -269,7 +269,7 @@ void x11_window_create()
 
 			// Get a visual
 			XVisualInfo *vi = glXGetVisualFromFBConfig(x11Display, bestFbc);
-			printf("Chosen visual ID = 0x%x\n", vi->visualid);
+			printf("Chosen visual ID = 0x%lx\n", vi->visualid);
 
 
 			depth = vi->depth;
@@ -308,6 +308,7 @@ void x11_window_create()
 		x11Window = XCreateWindow(x11Display, RootWindow(x11Display, x11Screen), (ndcid%3)*640, (ndcid/3)*480, x11_width, x11_height,
 			0, depth, InputOutput, x11Visual->visual, ui32Mask, &sWA);
 
+		// Capture the close window event
 		wmDeleteMessage = XInternAtom(x11Display, "WM_DELETE_WINDOW", False);
 		XSetWMProtocols(x11Display, x11Window, &wmDeleteMessage, 1);
 
@@ -390,12 +391,18 @@ void x11_window_destroy()
 	if (x11_win)
 	{
 		XDestroyWindow((Display*)x11_disp, (Window)x11_win);
-		x11_win = 0;
+		x11_win = NULL;
 	}
 	if (x11_disp)
 	{
+		if (x11_glc)
+		{
+			glXMakeCurrent((Display*)x11_disp, None, NULL);
+			glXDestroyContext((Display*)x11_disp, (GLXContext)x11_glc);
+			x11_glc = NULL;
+		}
 		XCloseDisplay((Display*)x11_disp);
-		x11_disp = 0;
+		x11_disp = NULL;
 	}
 }
 #endif

core/linux-dist/x11.h

@@ -4,8 +4,10 @@ extern void* x11_glc;
 extern void input_x11_init();
 extern void event_x11_handle();
 extern void input_x11_handle();
+extern void event_x11_handle();
 extern void x11_window_create();
 extern void x11_window_set_text(const char* text);
+extern void x11_window_destroy();
 
 // numbers
 const int KEY_1		=  10;

core/linux/common.cpp

@@ -18,7 +18,7 @@
 #include <sys/param.h>
 #include <sys/mman.h>
 #include <sys/time.h>
-#if !defined(_ANDROID) && !defined(TARGET_IPHONE) && !defined(TARGET_NACL32) && !defined(TARGET_EMSCRIPTEN) && !defined(TARGET_OSX) && !defined(TARGET_OSX_X64)
+#if !defined(TARGET_BSD) && !defined(_ANDROID) && !defined(TARGET_IPHONE) && !defined(TARGET_NACL32) && !defined(TARGET_EMSCRIPTEN) && !defined(TARGET_OSX) && !defined(TARGET_OSX_X64)
   #include <sys/personality.h>
   #include <dlfcn.h>
 #endif
@@ -292,15 +292,15 @@ void enable_runfast()
 }
 
 void linux_fix_personality() {
-        #if HOST_OS == OS_LINUX && !defined(_ANDROID) && !defined(TARGET_OS_IPHONE) && !defined(TARGET_NACL32) && !defined(TARGET_EMSCRIPTEN)
+        #if !defined(TARGET_BSD) && !defined(_ANDROID) && !defined(TARGET_OS_IPHONE) && !defined(TARGET_NACL32) && !defined(TARGET_EMSCRIPTEN)
           printf("Personality: %08X\n", personality(0xFFFFFFFF));
           personality(~READ_IMPLIES_EXEC & personality(0xFFFFFFFF));
           printf("Updated personality: %08X\n", personality(0xFFFFFFFF));
         #endif
 }
 
 void linux_rpi2_init() {
-#if (HOST_OS == OS_LINUX) && !defined(_ANDROID) && !defined(TARGET_NACL32) && !defined(TARGET_EMSCRIPTEN) && defined(TARGET_VIDEOCORE)
+#if !defined(TARGET_BSD) && !defined(_ANDROID) && !defined(TARGET_NACL32) && !defined(TARGET_EMSCRIPTEN) && defined(TARGET_VIDEOCORE)
 	void* handle;
 	void (*rpi_bcm_init)(void);
 

core/linux/context.cpp

@@ -31,7 +31,12 @@ void context_segfault(rei_host_context_t* reictx, void* segfault_ctx, bool to_se
 
 #if !defined(TARGET_NO_EXCEPTIONS)
 #if HOST_CPU == CPU_ARM
-	#if HOST_OS == OS_LINUX
+	#if defined(__FreeBSD__)
+		bicopy(reictx->pc, MCTX(.__gregs[_REG_PC]), to_segfault);
+
+		for (int i = 0; i < 15; i++)
+			bicopy(reictx->r[i], MCTX(.__gregs[i]), to_segfault);
+	#elif HOST_OS == OS_LINUX
 		bicopy(reictx->pc, MCTX(.arm_pc), to_segfault);
 		u32* r =(u32*) &MCTX(.arm_r0);
 
@@ -47,7 +52,12 @@ void context_segfault(rei_host_context_t* reictx, void* segfault_ctx, bool to_se
 		#error HOST_OS
 	#endif
 #elif HOST_CPU == CPU_X86
-	#if HOST_OS == OS_LINUX
+	#if defined(__FreeBSD__)
+		bicopy(reictx->pc, MCTX(.mc_eip), to_segfault);
+		bicopy(reictx->esp, MCTX(.mc_esp), to_segfault);
+		bicopy(reictx->eax, MCTX(.mc_eax), to_segfault);
+		bicopy(reictx->ecx, MCTX(.mc_ecx), to_segfault);
+	#elif HOST_OS == OS_LINUX
 		bicopy(reictx->pc, MCTX(.gregs[REG_EIP]), to_segfault);
 		bicopy(reictx->esp, MCTX(.gregs[REG_ESP]), to_segfault);
 		bicopy(reictx->eax, MCTX(.gregs[REG_EAX]), to_segfault);
@@ -61,11 +71,15 @@ void context_segfault(rei_host_context_t* reictx, void* segfault_ctx, bool to_se
 		#error HOST_OS
 	#endif
 #elif HOST_CPU == CPU_X64
-    #if HOST_OS == OS_LINUX
-        bicopy(reictx->pc, MCTX(.gregs[REG_RIP]), to_segfault);
-    #elif HOST_OS == OS_DARWIN
-        bicopy(reictx->pc, MCTX(->__ss.__rip), to_segfault);
-    #endif
+	#if defined(__FreeBSD__) || defined(__DragonFly__)
+		bicopy(reictx->pc, MCTX(.mc_rip), to_segfault);
+	#elif defined(__NetBSD__)
+		bicopy(reictx->pc, MCTX(.__gregs[_REG_RIP]), to_segfault);
+	#elif HOST_OS == OS_LINUX
+		bicopy(reictx->pc, MCTX(.gregs[REG_RIP]), to_segfault);
+	#else
+		#error HOST_OS
+	#endif
 #elif HOST_CPU == CPU_MIPS
 	bicopy(reictx->pc, MCTX(.pc), to_segfault);
 #elif HOST_CPU == CPU_GENERIC

core/nullDC.cpp

@@ -255,6 +255,13 @@ void dc_term()
 	SaveSettings();
 #endif
 	SaveRomFiles(get_writable_data_path("/data/"));
+    
+    TermAudio();
+}
+
+void dc_stop()
+{
+	sh4_cpu.Stop();
 }
 
 void LoadSettings()