notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix PCSX on big-endian systems
[pcsx_rearmed.git]
/
plugins
/
dfxvideo
/
gpulib_if.c
diff --git
a/plugins/dfxvideo/gpulib_if.c
b/plugins/dfxvideo/gpulib_if.c
index
d98520c
..
d7d69a7
100644
(file)
--- a/
plugins/dfxvideo/gpulib_if.c
+++ b/
plugins/dfxvideo/gpulib_if.c
@@
-40,7
+40,7
@@
#define SWAP16(x) ({ uint16_t y=(x); (((y)>>8 & 0xff) | ((y)<<8 & 0xff00)); })
#define SWAP32(x) ({ uint32_t y=(x); (((y)>>24 & 0xfful) | ((y)>>8 & 0xff00ul) | ((y)<<8 & 0xff0000ul) | ((y)<<24 & 0xff000000ul)); })
#define SWAP16(x) ({ uint16_t y=(x); (((y)>>8 & 0xff) | ((y)<<8 & 0xff00)); })
#define SWAP32(x) ({ uint32_t y=(x); (((y)>>24 & 0xfful) | ((y)>>8 & 0xff00ul) | ((y)<<8 & 0xff0000ul) | ((y)<<24 & 0xff000000ul)); })
-#if
def _
_BIG_ENDIAN__
+#if
__BYTE_ORDER__ == __ORDER
_BIG_ENDIAN__
// big endian config
#define HOST2LE32(x) SWAP32(x)
// big endian config
#define HOST2LE32(x) SWAP32(x)
@@
-219,18
+219,12
@@
extern int32_t drawH;
#define KEY_BADTEXTURES 128
#define KEY_CHECKTHISOUT 256
#define KEY_BADTEXTURES 128
#define KEY_CHECKTHISOUT 256
-#if !defined(__BIG_ENDIAN__) || defined(__x86_64__) || defined(__i386__)
-#ifndef __LITTLE_ENDIAN__
-#define __LITTLE_ENDIAN__
-#endif
-#endif
-
-#ifdef __LITTLE_ENDIAN__
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
#define RED(x) (x & 0xff)
#define BLUE(x) ((x>>16) & 0xff)
#define GREEN(x) ((x>>8) & 0xff)
#define COLOR(x) (x & 0xffffff)
#define RED(x) (x & 0xff)
#define BLUE(x) ((x>>16) & 0xff)
#define GREEN(x) ((x>>8) & 0xff)
#define COLOR(x) (x & 0xffffff)
-#el
if defined __BIG_ENDIAN__
+#el
se
#define RED(x) ((x>>24) & 0xff)
#define BLUE(x) ((x>>8) & 0xff)
#define GREEN(x) ((x>>16) & 0xff)
#define RED(x) ((x>>24) & 0xff)
#define BLUE(x) ((x>>8) & 0xff)
#define GREEN(x) ((x>>16) & 0xff)
@@
-260,6
+254,10
@@
unsigned short sSetMask = 0;
unsigned long lSetMask = 0;
long lLowerpart;
unsigned long lSetMask = 0;
long lLowerpart;
+#if defined(__GNUC__) && __GNUC__ >= 6
+#pragma GCC diagnostic ignored "-Wmisleading-indentation"
+#endif
+
#include "soft.c"
#include "prim.c"
#include "soft.c"
#include "prim.c"
@@
-342,7
+340,12
@@
int do_cmd_list(unsigned int *list, int list_len, int *last_cmd)
while(1)
{
while(1)
{
- if((*list_position & 0xf000f000) == 0x50005000 || list_position >= list_end)
+ if(list_position >= list_end) {
+ cmd = -1;
+ goto breakloop;
+ }
+
+ if((*list_position & 0xf000f000) == 0x50005000)
break;
list_position++;
break;
list_position++;
@@
-360,7
+363,12
@@
int do_cmd_list(unsigned int *list, int list_len, int *last_cmd)
while(1)
{
while(1)
{
- if((*list_position & 0xf000f000) == 0x50005000 || list_position >= list_end)
+ if(list_position >= list_end) {
+ cmd = -1;
+ goto breakloop;
+ }
+
+ if((*list_position & 0xf000f000) == 0x50005000)
break;
list_position += 2;
break;
list_position += 2;
@@
-386,6
+394,7
@@
int do_cmd_list(unsigned int *list, int list_len, int *last_cmd)
}
}
}
}
+breakloop:
gpu.ex_regs[1] &= ~0x1ff;
gpu.ex_regs[1] |= lGPUstatusRet & 0x1ff;
gpu.ex_regs[1] &= ~0x1ff;
gpu.ex_regs[1] |= lGPUstatusRet & 0x1ff;