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

Removing XEINLINE*.

This commit is contained in:
Ben Vanik 2014-08-16 18:19:35 -07:00
parent f2a9fa3bf9
commit 27bc4ba405
4 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/alloy/vec128.h
View File

@ -42,7 +42,7 @@ typedef struct XECACHEALIGN vec128_s {
return low == b.low && high == b.high; return low == b.low && high == b.high;
} }
} vec128_t; } vec128_t;
XEFORCEINLINE vec128_t vec128i(uint32_t x, uint32_t y, uint32_t z, uint32_t w) { static inline vec128_t vec128i(uint32_t x, uint32_t y, uint32_t z, uint32_t w) {
vec128_t v; vec128_t v;
v.i4[0] = x; v.i4[0] = x;
v.i4[1] = y; v.i4[1] = y;
@ -50,7 +50,7 @@ XEFORCEINLINE vec128_t vec128i(uint32_t x, uint32_t y, uint32_t z, uint32_t w) {
v.i4[3] = w; v.i4[3] = w;
return v; return v;
} }
XEFORCEINLINE vec128_t vec128f(float x, float y, float z, float w) { static inline vec128_t vec128f(float x, float y, float z, float w) {
vec128_t v; vec128_t v;
v.f4[0] = x; v.f4[0] = x;
v.f4[1] = y; v.f4[1] = y;
@ -58,7 +58,7 @@ XEFORCEINLINE vec128_t vec128f(float x, float y, float z, float w) {
v.f4[3] = w; v.f4[3] = w;
return v; return v;
} }
XEFORCEINLINE vec128_t vec128b(uint8_t x0, uint8_t x1, uint8_t x2, uint8_t x3, static inline vec128_t vec128b(uint8_t x0, uint8_t x1, uint8_t x2, uint8_t x3,
uint8_t y0, uint8_t y1, uint8_t y2, uint8_t y3, uint8_t y0, uint8_t y1, uint8_t y2, uint8_t y3,
uint8_t z0, uint8_t z1, uint8_t z2, uint8_t z3, uint8_t z0, uint8_t z1, uint8_t z2, uint8_t z3,
uint8_t w0, uint8_t w1, uint8_t w2, uint8_t w3) { uint8_t w0, uint8_t w1, uint8_t w2, uint8_t w3) {

4
src/xenia/core/hash.cc
View File

@ -63,11 +63,11 @@ inline uint64_t Hash128to64(const uint128_t &x) {
return b; return b;
} }
XEFORCEINLINE uint64_t UNALIGNED_LOAD64(const char *p) { inline uint64_t UNALIGNED_LOAD64(const char *p) {
const uint64_t *p64 = (const uint64_t *)p; const uint64_t *p64 = (const uint64_t *)p;
return *p64; return *p64;
} }
XEFORCEINLINE uint32_t UNALIGNED_LOAD32(const char *p) { inline uint32_t UNALIGNED_LOAD32(const char *p) {
const uint32_t *p32 = (const uint32_t *)p; const uint32_t *p32 = (const uint32_t *)p;
return *p32; return *p32;
} }

6
src/xenia/gpu/xenos/xenos.h
View File

@ -73,7 +73,7 @@ typedef enum {
XE_GPU_SWIZZLE_R000 = XE_GPU_MAKE_SWIZZLE(R, 0, 0, 0), XE_GPU_SWIZZLE_R000 = XE_GPU_MAKE_SWIZZLE(R, 0, 0, 0),
} XE_GPU_SWIZZLE; } XE_GPU_SWIZZLE;
XEFORCEINLINE uint32_t GpuSwap(uint32_t value, XE_GPU_ENDIAN endianness) { inline uint32_t GpuSwap(uint32_t value, XE_GPU_ENDIAN endianness) {
switch (endianness) { switch (endianness) {
default: default:
case XE_GPU_ENDIAN_NONE: // No swap. case XE_GPU_ENDIAN_NONE: // No swap.
@ -89,11 +89,11 @@ XEFORCEINLINE uint32_t GpuSwap(uint32_t value, XE_GPU_ENDIAN endianness) {
} }
} }
XEFORCEINLINE uint32_t GpuToCpu(uint32_t p) { inline uint32_t GpuToCpu(uint32_t p) {
return p; return p;
} }
XEFORCEINLINE uint32_t GpuToCpu(uint32_t base, uint32_t p) { inline uint32_t GpuToCpu(uint32_t base, uint32_t p) {
uint32_t upper = base & 0xFF000000; uint32_t upper = base & 0xFF000000;
uint32_t lower = p & 0x00FFFFFF; uint32_t lower = p & 0x00FFFFFF;
return upper + lower;// -(((base >> 20) + 0x200) & 0x1000); return upper + lower;// -(((base >> 20) + 0x200) & 0x1000);

17
src/xenia/types.h
View File

@ -33,23 +33,6 @@
class name; \ class name; \
} } } } } } } }
#if XE_COMPILER_MSVC
// http://msdn.microsoft.com/en-us/library/z8y1yy88.aspx
#define XEFORCEINLINE static __forceinline
#define XENOINLINE __declspec(noinline)
#elif XE_COMPILER_GNUC
// http://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html
#if (__GNUC__ >= 4)
#define XEFORCEINLINE static __inline__ __attribute__((always_inline))
#else
#define XEFORCEINLINE static __inline__
#endif
#define XENOINLINE
#else
#define XEFORCEINLINE
#define XENOINLINE
#endif // MSVC
#if XE_COMPILER_MSVC #if XE_COMPILER_MSVC
#define XEPACKEDSTRUCT(name, value) \ #define XEPACKEDSTRUCT(name, value) \
__pragma(pack(push, 1)) struct name##_s value __pragma(pack(pop)); \ __pragma(pack(push, 1)) struct name##_s value __pragma(pack(pop)); \