Commit c1cc13cd authored by Shivraj Patil's avatar Shivraj Patil Committed by Michael Niedermayer

avutil/mips/generic_macros_msa: rename macro variable which causes segfault for mips r6

Signed-off-by: 's avatarShivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent db4c1bee
...@@ -85,12 +85,12 @@ ...@@ -85,12 +85,12 @@
#else // !(__mips == 64) #else // !(__mips == 64)
#define LD(psrc) \ #define LD(psrc) \
( { \ ( { \
uint8_t *psrc_m = (uint8_t *) (psrc); \ uint8_t *psrc_ld_m = (uint8_t *) (psrc); \
uint32_t val0_m, val1_m; \ uint32_t val0_m, val1_m; \
uint64_t val_m = 0; \ uint64_t val_m = 0; \
\ \
val0_m = LW(psrc_m); \ val0_m = LW(psrc_ld_m); \
val1_m = LW(psrc_m + 4); \ val1_m = LW(psrc_ld_m + 4); \
\ \
val_m = (uint64_t) (val1_m); \ val_m = (uint64_t) (val1_m); \
val_m = (uint64_t) ((val_m << 32) & 0xFFFFFFFF00000000); \ val_m = (uint64_t) ((val_m << 32) & 0xFFFFFFFF00000000); \
...@@ -172,12 +172,12 @@ ...@@ -172,12 +172,12 @@
#else // !(__mips == 64) #else // !(__mips == 64)
#define LD(psrc) \ #define LD(psrc) \
( { \ ( { \
uint8_t *psrc_m1 = (uint8_t *) (psrc); \ uint8_t *psrc_ld_m = (uint8_t *) (psrc); \
uint32_t val0_m, val1_m; \ uint32_t val0_m, val1_m; \
uint64_t val_m = 0; \ uint64_t val_m = 0; \
\ \
val0_m = LW(psrc_m1); \ val0_m = LW(psrc_ld_m); \
val1_m = LW(psrc_m1 + 4); \ val1_m = LW(psrc_ld_m + 4); \
\ \
val_m = (uint64_t) (val1_m); \ val_m = (uint64_t) (val1_m); \
val_m = (uint64_t) ((val_m << 32) & 0xFFFFFFFF00000000); \ val_m = (uint64_t) ((val_m << 32) & 0xFFFFFFFF00000000); \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment