zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Untabify a couple of headers

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7862 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-08-01 06:50:09 +00:00 committed by Christoph Oelckers
parent 24a53db8f5
commit 752cf77887
3 changed files with 60 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
source/build/include/pragmas_ppc.h
View file

@ -9,34 +9,34 @@
#define EDUKE32_SCALER_PRAGMA(x) \ #define EDUKE32_SCALER_PRAGMA(x) \
static inline int32_t mulscale##x(int32_t a, int32_t d) \ static inline int32_t mulscale##x(int32_t a, int32_t d) \
{ \ { \
int32_t mullo, mulhi; \ int32_t mullo, mulhi; \
__asm__ ( \ __asm__ ( \
" mullw %0, %2, %3\n" \ " mullw %0, %2, %3\n" \
" mulhw %1, %2, %3\n" \ " mulhw %1, %2, %3\n" \
" srwi %0, %0, %4\n" \ " srwi %0, %0, %4\n" \
" insrwi %0, %1, %4, 0\n" \ " insrwi %0, %1, %4, 0\n" \
: "=&r"(mullo), "=r"(mulhi) \ : "=&r"(mullo), "=r"(mulhi) \
: "r"(a), "r"(d), "i"(x) \ : "r"(a), "r"(d), "i"(x) \
); \ ); \
return mullo; \ return mullo; \
} \ } \
static inline int32_t dmulscale##x(int32_t a, int32_t d, int32_t S, int32_t D) \ static inline int32_t dmulscale##x(int32_t a, int32_t d, int32_t S, int32_t D) \
{ \ { \
int32_t mulhi, mullo, sumhi, sumlo; \ int32_t mulhi, mullo, sumhi, sumlo; \
__asm__ ( \ __asm__ ( \
" mullw %0, %4, %5\n" \ " mullw %0, %4, %5\n" \
" mulhw %1, %4, %5\n" \ " mulhw %1, %4, %5\n" \
" mullw %2, %6, %7\n" \ " mullw %2, %6, %7\n" \
" mulhw %3, %6, %7\n" \ " mulhw %3, %6, %7\n" \
" addc %0, %0, %2\n" \ " addc %0, %0, %2\n" \
" adde %1, %1, %3\n" \ " adde %1, %1, %3\n" \
" srwi %0, %0, %8\n" \ " srwi %0, %0, %8\n" \
" insrwi %0, %1, %8, 0\n" \ " insrwi %0, %1, %8, 0\n" \
: "=&r"(sumlo), "=&r"(sumhi), "=&r"(mullo), "=r"(mulhi) \ : "=&r"(sumlo), "=&r"(sumhi), "=&r"(mullo), "=r"(mulhi) \
: "r"(a), "r"(d), "r"(S), "r"(D), "i"(x) \ : "r"(a), "r"(d), "r"(S), "r"(D), "i"(x) \
: "xer" \ : "xer" \
); \ ); \
return sumlo; \ return sumlo; \
} \ } \
static inline int32_t tmulscale##x(int32_t a, int32_t d, int32_t b, int32_t c, int32_t S, int32_t D) \ static inline int32_t tmulscale##x(int32_t a, int32_t d, int32_t b, int32_t c, int32_t S, int32_t D) \
{ \ { \

52
source/build/include/pragmas_x86_msvc.h
View file

@ -23,38 +23,38 @@ static __inline int32_t mulscale(int32_t a, int32_t d, int32_t c)
#define EDUKE32_SCALER_PRAGMA(x) \ #define EDUKE32_SCALER_PRAGMA(x) \
static __inline int32_t mulscale##x (int32_t a, int32_t d) \ static __inline int32_t mulscale##x (int32_t a, int32_t d) \
{ \ { \
_asm mov eax, a \ _asm mov eax, a \
_asm imul d \ _asm imul d \
_asm shrd eax, edx, x \ _asm shrd eax, edx, x \
} \ } \
static __inline int32_t dmulscale##x (int32_t a, int32_t d, int32_t S, int32_t D) \ static __inline int32_t dmulscale##x (int32_t a, int32_t d, int32_t S, int32_t D) \
{ \ { \
_asm mov eax, a \ _asm mov eax, a \
_asm imul d \ _asm imul d \
_asm mov ebx, eax \ _asm mov ebx, eax \
_asm mov eax, S \ _asm mov eax, S \
_asm mov esi, edx \ _asm mov esi, edx \
_asm imul D \ _asm imul D \
_asm add eax, ebx \ _asm add eax, ebx \
_asm adc edx, esi \ _asm adc edx, esi \
_asm shrd eax, edx, x \ _asm shrd eax, edx, x \
} \ } \
static __inline int32_t tmulscale##x (int32_t a, int32_t d, int32_t b, int32_t c, int32_t S, int32_t D) \ static __inline int32_t tmulscale##x (int32_t a, int32_t d, int32_t b, int32_t c, int32_t S, int32_t D) \
{ \ { \
_asm mov eax, a \ _asm mov eax, a \
_asm mov ebx, b \ _asm mov ebx, b \
_asm imul d \ _asm imul d \
_asm xchg eax, ebx \ _asm xchg eax, ebx \
_asm mov ecx, c \ _asm mov ecx, c \
_asm xchg edx, ecx \ _asm xchg edx, ecx \
_asm imul edx \ _asm imul edx \
_asm add ebx, eax \ _asm add ebx, eax \
_asm adc ecx, edx \ _asm adc ecx, edx \
_asm mov eax, S \ _asm mov eax, S \
_asm imul D \ _asm imul D \
_asm add eax, ebx \ _asm add eax, ebx \
_asm adc edx, ecx \ _asm adc edx, ecx \
_asm shrd eax, edx, x \ _asm shrd eax, edx, x \
} \ } \
EDUKE32_GENERATE_PRAGMAS EDUKE32_GENERATE_PRAGMAS

18
source/duke3d/src/mapster32.h
View file

@ -33,9 +33,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
char default_buildkeys[NUMBUILDKEYS] = char default_buildkeys[NUMBUILDKEYS] =
{ {
0xc8,0xd0,0xcb,0xcd,0x2a,0x9d,0x1d,0x39, 0xc8,0xd0,0xcb,0xcd,0x2a,0x9d,0x1d,0x39,
0x1e,0x2c,0xd1,0xc9,0x47,0x49, 0x1e,0x2c,0xd1,0xc9,0x47,0x49,
0x9c,0x1c,0xd,0xc,0xf,0x29 0x9c,0x1c,0xd,0xc,0xf,0x29
}; };
extern char changechar(char dachar, int32_t dadir, char smooshyalign, char boundcheck); extern char changechar(char dachar, int32_t dadir, char smooshyalign, char boundcheck);
@ -87,7 +87,7 @@ static int32_t updownunits=1024;
#define FUCKING_GOOD_EYESIGHT 16 #define FUCKING_GOOD_EYESIGHT 16
static const int32_t ZoomToThumbSize[] = static const int32_t ZoomToThumbSize[] =
{ {
FUCKING_GOOD_EYESIGHT, 32, 64, 128, 192, 256, 384, 512 FUCKING_GOOD_EYESIGHT, 32, 64, 128, 192, 256, 384, 512
}; };
#define NUM_ZOOMS ARRAY_SIZE(ZoomToThumbSize) #define NUM_ZOOMS ARRAY_SIZE(ZoomToThumbSize)
@ -95,11 +95,11 @@ static const int32_t ZoomToThumbSize[] =
typedef struct typedef struct
{ {
int32_t *pIds; // ptr to list of tile Ids int32_t *pIds; // ptr to list of tile Ids
int32_t nIds; // num of tile ids int32_t nIds; // num of tile ids
char *szText; // description to present to user. char *szText; // description to present to user.
char key1; // key1 and key2 are two alternative keypresses used to char key1; // key1 and key2 are two alternative keypresses used to
char key2; // select tile set. Bodge to do eary upper/lower case handling char key2; // select tile set. Bodge to do eary upper/lower case handling
char color1; // 2d sprite color 1 char color1; // 2d sprite color 1
char color2; // 2d sprite color 2 char color2; // 2d sprite color 2
} TileGroup; } TileGroup;