ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PowerPC: Fix overflow in LOAD/STORE_64LE (fixes #1089)

This commit is contained in:
Vicki Pfau 2018-05-26 13:09:13 -07:00
parent 7f41dd3541
commit c353e1254a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/mgba-util/common.h
View File

@ -136,12 +136,13 @@ typedef intptr_t ssize_t;
uint32_t lo; \ uint32_t lo; \
}; \ }; \
uint64_t b64; \ uint64_t b64; \
} *bswap = (void*) &DEST; \ } bswap; \
const void* _ptr = (ARR); \ const void* _ptr = (ARR); \
__asm__( \ __asm__( \
"lwbrx %0, %2, %3 \n" \ "lwbrx %0, %2, %3 \n" \
"lwbrx %1, %2, %4 \n" \ "lwbrx %1, %2, %4 \n" \
: "=&r"(bswap->lo), "=&r"(bswap->hi) : "b"(_ptr), "r"(_addr), "r"(_addr + 4)) ; \ : "=&r"(bswap.lo), "=&r"(bswap.hi) : "b"(_ptr), "r"(_addr), "r"(_addr + 4)) ; \
DEST = bswap.b64; \
} }
#define STORE_64LE(SRC, ADDR, ARR) { \ #define STORE_64LE(SRC, ADDR, ARR) { \
@ -152,12 +153,12 @@ typedef intptr_t ssize_t;
uint32_t lo; \ uint32_t lo; \
}; \ }; \
uint64_t b64; \ uint64_t b64; \
} *bswap = (void*) &SRC; \ } bswap = { .b64 = SRC }; \
const void* _ptr = (ARR); \ const void* _ptr = (ARR); \
__asm__( \ __asm__( \
"stwbrx %0, %2, %3 \n" \ "stwbrx %0, %2, %3 \n" \
"stwbrx %1, %2, %4 \n" \ "stwbrx %1, %2, %4 \n" \
: : "r"(bswap->hi), "r"(bswap->lo), "b"(_ptr), "r"(_addr), "r"(_addr + 4) : "memory"); \ : : "r"(bswap.hi), "r"(bswap.lo), "b"(_ptr), "r"(_addr), "r"(_addr + 4) : "memory"); \
} }
#elif defined(__llvm__) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8) #elif defined(__llvm__) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)