try to fix reset in HLE mode

[pcsx_rearmed.git] / frontend / cspace.c

diff --git a/frontend/cspace.c b/frontend/cspace.c
index 5f3075b..06167a9 100644 (file)
--- a/frontend/cspace.c
+++ b/frontend/cspace.c
@@ -8,6 +8,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include <stdint.h>
 #include "cspace.h"
 
 /*
@@ -30,7 +31,6 @@
         || (defined(__GNUC__) && __GNUC__ >= 5)) \
        && __BYTE_ORDER__ != __ORDER_BIG_ENDIAN__
 
-#include <stdint.h>
 #include <assert.h>
 
 #if defined(__ARM_NEON) || defined(__ARM_NEON__)
@@ -93,7 +93,8 @@ void bgr555_to_rgb565(void * __restrict__ dst_, const void *  __restrict__ src_,
 
 void bgr555_to_rgb565(void *dst_, const void *src_, int bytes)
 {
-    const unsigned int *src = src_;
+    // source can be misaligned, but it's very rare, so just force
+    const unsigned int *src = (const void *)((intptr_t)src_ & ~3);
     unsigned int *dst = dst_;
     unsigned int x, p, r, g, b;
 
@@ -135,9 +136,6 @@ void bgr888_to_rgb565(void *dst_, const void *src_, int bytes)
     }
 }
 
-#endif
-
-#ifndef __ARM_NEON__
 // TODO?
 void rgb888_to_rgb565(void *dst, const void *src, int bytes) {}
 void bgr888_to_rgb888(void *dst, const void *src, int bytes) {}