diff options
| author | 2015-08-20 03:17:06 -0400 | |
|---|---|---|
| committer | 2015-08-20 04:45:22 -0400 | |
| commit | 0609b89f74b85eef69beb49447e60629b5c18106 (patch) | |
| tree | 0efa5d1acf7b1db8dcd90acffcb7cb41541fcdc4 /src/common | |
| parent | Merge pull request #1035 from darkf/mingw-fix (diff) | |
| download | yuzu-0609b89f74b85eef69beb49447e60629b5c18106.tar.gz yuzu-0609b89f74b85eef69beb49447e60629b5c18106.tar.xz yuzu-0609b89f74b85eef69beb49447e60629b5c18106.zip | |
emitter: Remove unnecessary inline specifiers
Functions implemented in a class definition are already implicitly inline.
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/x64/emitter.h | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/src/common/x64/emitter.h b/src/common/x64/emitter.h index e9c924126..0c35af907 100644 --- a/src/common/x64/emitter.h +++ b/src/common/x64/emitter.h | |||
| @@ -361,10 +361,10 @@ private: | |||
| 361 | void ABI_CalculateFrameSize(u32 mask, size_t rsp_alignment, size_t needed_frame_size, size_t* shadowp, size_t* subtractionp, size_t* xmm_offsetp); | 361 | void ABI_CalculateFrameSize(u32 mask, size_t rsp_alignment, size_t needed_frame_size, size_t* shadowp, size_t* subtractionp, size_t* xmm_offsetp); |
| 362 | 362 | ||
| 363 | protected: | 363 | protected: |
| 364 | inline void Write8(u8 value) {*code++ = value;} | 364 | void Write8(u8 value) {*code++ = value;} |
| 365 | inline void Write16(u16 value) {*(u16*)code = (value); code += 2;} | 365 | void Write16(u16 value) {*(u16*)code = (value); code += 2;} |
| 366 | inline void Write32(u32 value) {*(u32*)code = (value); code += 4;} | 366 | void Write32(u32 value) {*(u32*)code = (value); code += 4;} |
| 367 | inline void Write64(u64 value) {*(u64*)code = (value); code += 8;} | 367 | void Write64(u64 value) {*(u64*)code = (value); code += 8;} |
| 368 | 368 | ||
| 369 | public: | 369 | public: |
| 370 | XEmitter() { code = nullptr; flags_locked = false; } | 370 | XEmitter() { code = nullptr; flags_locked = false; } |
| @@ -496,11 +496,11 @@ public: | |||
| 496 | 496 | ||
| 497 | // Extend EAX into EDX in various ways | 497 | // Extend EAX into EDX in various ways |
| 498 | void CWD(int bits = 16); | 498 | void CWD(int bits = 16); |
| 499 | inline void CDQ() {CWD(32);} | 499 | void CDQ() {CWD(32);} |
| 500 | inline void CQO() {CWD(64);} | 500 | void CQO() {CWD(64);} |
| 501 | void CBW(int bits = 8); | 501 | void CBW(int bits = 8); |
| 502 | inline void CWDE() {CBW(16);} | 502 | void CWDE() {CBW(16);} |
| 503 | inline void CDQE() {CBW(32);} | 503 | void CDQE() {CBW(32);} |
| 504 | 504 | ||
| 505 | // Load effective address | 505 | // Load effective address |
| 506 | void LEA(int bits, X64Reg dest, OpArg src); | 506 | void LEA(int bits, X64Reg dest, OpArg src); |
| @@ -596,13 +596,13 @@ public: | |||
| 596 | void CMPSS(X64Reg regOp, OpArg arg, u8 compare); | 596 | void CMPSS(X64Reg regOp, OpArg arg, u8 compare); |
| 597 | void CMPSD(X64Reg regOp, OpArg arg, u8 compare); | 597 | void CMPSD(X64Reg regOp, OpArg arg, u8 compare); |
| 598 | 598 | ||
| 599 | inline void CMPEQSS(X64Reg regOp, OpArg arg) { CMPSS(regOp, arg, CMP_EQ); } | 599 | void CMPEQSS(X64Reg regOp, OpArg arg) { CMPSS(regOp, arg, CMP_EQ); } |
| 600 | inline void CMPLTSS(X64Reg regOp, OpArg arg) { CMPSS(regOp, arg, CMP_LT); } | 600 | void CMPLTSS(X64Reg regOp, OpArg arg) { CMPSS(regOp, arg, CMP_LT); } |
| 601 | inline void CMPLESS(X64Reg regOp, OpArg arg) { CMPSS(regOp, arg, CMP_LE); } | 601 | void CMPLESS(X64Reg regOp, OpArg arg) { CMPSS(regOp, arg, CMP_LE); } |
| 602 | inline void CMPUNORDSS(X64Reg regOp, OpArg arg) { CMPSS(regOp, arg, CMP_UNORD); } | 602 | void CMPUNORDSS(X64Reg regOp, OpArg arg) { CMPSS(regOp, arg, CMP_UNORD); } |
| 603 | inline void CMPNEQSS(X64Reg regOp, OpArg arg) { CMPSS(regOp, arg, CMP_NEQ); } | 603 | void CMPNEQSS(X64Reg regOp, OpArg arg) { CMPSS(regOp, arg, CMP_NEQ); } |
| 604 | inline void CMPNLTSS(X64Reg regOp, OpArg arg) { CMPSS(regOp, arg, CMP_NLT); } | 604 | void CMPNLTSS(X64Reg regOp, OpArg arg) { CMPSS(regOp, arg, CMP_NLT); } |
| 605 | inline void CMPORDSS(X64Reg regOp, OpArg arg) { CMPSS(regOp, arg, CMP_ORD); } | 605 | void CMPORDSS(X64Reg regOp, OpArg arg) { CMPSS(regOp, arg, CMP_ORD); } |
| 606 | 606 | ||
| 607 | // SSE/SSE2: Floating point packed arithmetic (x4 for float, x2 for double) | 607 | // SSE/SSE2: Floating point packed arithmetic (x4 for float, x2 for double) |
| 608 | void ADDPS(X64Reg regOp, OpArg arg); | 608 | void ADDPS(X64Reg regOp, OpArg arg); |
| @@ -859,25 +859,25 @@ public: | |||
| 859 | void ROUNDPS(X64Reg dest, OpArg arg, u8 mode); | 859 | void ROUNDPS(X64Reg dest, OpArg arg, u8 mode); |
| 860 | void ROUNDPD(X64Reg dest, OpArg arg, u8 mode); | 860 | void ROUNDPD(X64Reg dest, OpArg arg, u8 mode); |
| 861 | 861 | ||
| 862 | inline void ROUNDNEARSS(X64Reg dest, OpArg arg) { ROUNDSS(dest, arg, FROUND_NEAREST); } | 862 | void ROUNDNEARSS(X64Reg dest, OpArg arg) { ROUNDSS(dest, arg, FROUND_NEAREST); } |
| 863 | inline void ROUNDFLOORSS(X64Reg dest, OpArg arg) { ROUNDSS(dest, arg, FROUND_FLOOR); } | 863 | void ROUNDFLOORSS(X64Reg dest, OpArg arg) { ROUNDSS(dest, arg, FROUND_FLOOR); } |
| 864 | inline void ROUNDCEILSS(X64Reg dest, OpArg arg) { ROUNDSS(dest, arg, FROUND_CEIL); } | 864 | void ROUNDCEILSS(X64Reg dest, OpArg arg) { ROUNDSS(dest, arg, FROUND_CEIL); } |
| 865 | inline void ROUNDZEROSS(X64Reg dest, OpArg arg) { ROUNDSS(dest, arg, FROUND_ZERO); } | 865 | void ROUNDZEROSS(X64Reg dest, OpArg arg) { ROUNDSS(dest, arg, FROUND_ZERO); } |
| 866 | 866 | ||
| 867 | inline void ROUNDNEARSD(X64Reg dest, OpArg arg) { ROUNDSD(dest, arg, FROUND_NEAREST); } | 867 | void ROUNDNEARSD(X64Reg dest, OpArg arg) { ROUNDSD(dest, arg, FROUND_NEAREST); } |
| 868 | inline void ROUNDFLOORSD(X64Reg dest, OpArg arg) { ROUNDSD(dest, arg, FROUND_FLOOR); } | 868 | void ROUNDFLOORSD(X64Reg dest, OpArg arg) { ROUNDSD(dest, arg, FROUND_FLOOR); } |
| 869 | inline void ROUNDCEILSD(X64Reg dest, OpArg arg) { ROUNDSD(dest, arg, FROUND_CEIL); } | 869 | void ROUNDCEILSD(X64Reg dest, OpArg arg) { ROUNDSD(dest, arg, FROUND_CEIL); } |
| 870 | inline void ROUNDZEROSD(X64Reg dest, OpArg arg) { ROUNDSD(dest, arg, FROUND_ZERO); } | 870 | void ROUNDZEROSD(X64Reg dest, OpArg arg) { ROUNDSD(dest, arg, FROUND_ZERO); } |
| 871 | 871 | ||
| 872 | inline void ROUNDNEARPS(X64Reg dest, OpArg arg) { ROUNDPS(dest, arg, FROUND_NEAREST); } | 872 | void ROUNDNEARPS(X64Reg dest, OpArg arg) { ROUNDPS(dest, arg, FROUND_NEAREST); } |
| 873 | inline void ROUNDFLOORPS(X64Reg dest, OpArg arg) { ROUNDPS(dest, arg, FROUND_FLOOR); } | 873 | void ROUNDFLOORPS(X64Reg dest, OpArg arg) { ROUNDPS(dest, arg, FROUND_FLOOR); } |
| 874 | inline void ROUNDCEILPS(X64Reg dest, OpArg arg) { ROUNDPS(dest, arg, FROUND_CEIL); } | 874 | void ROUNDCEILPS(X64Reg dest, OpArg arg) { ROUNDPS(dest, arg, FROUND_CEIL); } |
| 875 | inline void ROUNDZEROPS(X64Reg dest, OpArg arg) { ROUNDPS(dest, arg, FROUND_ZERO); } | 875 | void ROUNDZEROPS(X64Reg dest, OpArg arg) { ROUNDPS(dest, arg, FROUND_ZERO); } |
| 876 | 876 | ||
| 877 | inline void ROUNDNEARPD(X64Reg dest, OpArg arg) { ROUNDPD(dest, arg, FROUND_NEAREST); } | 877 | void ROUNDNEARPD(X64Reg dest, OpArg arg) { ROUNDPD(dest, arg, FROUND_NEAREST); } |
| 878 | inline void ROUNDFLOORPD(X64Reg dest, OpArg arg) { ROUNDPD(dest, arg, FROUND_FLOOR); } | 878 | void ROUNDFLOORPD(X64Reg dest, OpArg arg) { ROUNDPD(dest, arg, FROUND_FLOOR); } |
| 879 | inline void ROUNDCEILPD(X64Reg dest, OpArg arg) { ROUNDPD(dest, arg, FROUND_CEIL); } | 879 | void ROUNDCEILPD(X64Reg dest, OpArg arg) { ROUNDPD(dest, arg, FROUND_CEIL); } |
| 880 | inline void ROUNDZEROPD(X64Reg dest, OpArg arg) { ROUNDPD(dest, arg, FROUND_ZERO); } | 880 | void ROUNDZEROPD(X64Reg dest, OpArg arg) { ROUNDPD(dest, arg, FROUND_ZERO); } |
| 881 | 881 | ||
| 882 | // AVX | 882 | // AVX |
| 883 | void VADDSD(X64Reg regOp1, X64Reg regOp2, OpArg arg); | 883 | void VADDSD(X64Reg regOp1, X64Reg regOp2, OpArg arg); |
| @@ -1048,9 +1048,9 @@ public: | |||
| 1048 | void ABI_EmitEpilogue(int maxCallParams); | 1048 | void ABI_EmitEpilogue(int maxCallParams); |
| 1049 | 1049 | ||
| 1050 | #ifdef _M_IX86 | 1050 | #ifdef _M_IX86 |
| 1051 | inline int ABI_GetNumXMMRegs() { return 8; } | 1051 | static int ABI_GetNumXMMRegs() { return 8; } |
| 1052 | #else | 1052 | #else |
| 1053 | inline int ABI_GetNumXMMRegs() { return 16; } | 1053 | static int ABI_GetNumXMMRegs() { return 16; } |
| 1054 | #endif | 1054 | #endif |
| 1055 | }; // class XEmitter | 1055 | }; // class XEmitter |
| 1056 | 1056 | ||