X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfxvideo%2Fgpu.h;h=9ee5f3e6f7a4769e8cbdf70c0f49e9ad2db98dca;hp=7b5aaef009143cbe07b9f97d93786bf3be6b8107;hb=HEAD;hpb=ae097dfb64926c50902b08b681cbf805b98e3751

diff --git a/plugins/dfxvideo/gpu.h b/plugins/dfxvideo/gpu.h
index 7b5aaef0..224bc654 100644
--- a/plugins/dfxvideo/gpu.h
+++ b/plugins/dfxvideo/gpu.h
@@ -64,6 +64,7 @@
 #include <math.h>
 #include <stdint.h>
 #include <unistd.h>
+#include "../../include/arm_features.h"
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -100,16 +101,15 @@
 
 #endif
 
-#define GETLEs16(X) ((int16_t)GETLE16((uint16_t *)X))
-#define GETLEs32(X) ((int16_t)GETLE32((uint16_t *)X))
+#define GETLEs16(X) ((int16_t)GETLE16((uint16_t *)(X)))
 
-#define GETLE16(X) LE2HOST16(*(uint16_t *)X)
-#define GETLE32_(X) LE2HOST32(*(uint32_t *)X)
-#define GETLE16D(X) ({uint32_t val = GETLE32(X); (val<<16 | val >> 16);})
-#define PUTLE16(X, Y) do{*((uint16_t *)X)=HOST2LE16((uint16_t)Y);}while(0)
-#define PUTLE32_(X, Y) do{*((uint32_t *)X)=HOST2LE32((uint32_t)Y);}while(0)
-#ifdef __arm__
-#define GETLE32(X) (*(uint16_t *)(X)|(((uint16_t *)(X))[1]<<16))
+#define GETLE16(X) LE2HOST16(*(uint16_t *)(X))
+#define GETLE32_(X) LE2HOST32(*(uint32_t *)(X))
+#define PUTLE16(X, Y) do{*((uint16_t *)(X))=HOST2LE16((uint16_t)(Y));}while(0)
+#define PUTLE32_(X, Y) do{*((uint32_t *)(X))=HOST2LE32((uint32_t)(Y));}while(0)
+#if defined(__arm__) && !defined(HAVE_ARMV6)
+// for (very) old ARMs with no unaligned loads?
+#define GETLE32(X) (*(uint16_t *)(X)|((uint32_t)((uint16_t *)(X))[1]<<16))
 #define PUTLE32(X, Y) do{uint16_t *p_=(uint16_t *)(X);uint32_t y_=Y;p_[0]=y_;p_[1]=y_>>16;}while(0)
 #else
 #define GETLE32 GETLE32_
@@ -277,11 +277,7 @@ extern BOOL           bSkipNextFrame;
 extern long           lGPUstatusRet;
 extern unsigned char  * psxVSecure;
 extern unsigned char  * psxVub;
-extern signed char    * psxVsb;
 extern unsigned short * psxVuw;
-extern signed short   * psxVsw;
-extern uint32_t  * psxVul;
-extern int32_t    * psxVsl;
 extern unsigned short * psxVuw_eom;
 extern BOOL           bChangeWinMode;
 extern long           lSelectedSlot;