diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-02-17 08:55:19 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-02-17 08:55:19 +0100 |
| commit | 73691a8587e5f09ef138384d2ff97e4059ba9380 (patch) | |
| tree | 1b5509192851cdd3e6c09251c0051b33d8d3ca15 /Source | |
| parent | a8ca2c6cc2ed6177bd26b6c022b919179a8ce37a (diff) | |
| parent | 3fd87a7636ff434118a5d7f7334550be8db55c0b (diff) | |
Merge pull request #86 from lioncash/vertical-alignments2-electric-boogaloo
Second and final pass of clearing out tabs.
Diffstat (limited to 'Source')
242 files changed, 1716 insertions, 1712 deletions
diff --git a/Source/Core/AudioCommon/OpenALStream.h b/Source/Core/AudioCommon/OpenALStream.h index 2667f90ac1..6653e33684 100644 --- a/Source/Core/AudioCommon/OpenALStream.h +++ b/Source/Core/AudioCommon/OpenALStream.h @@ -28,16 +28,16 @@ #include <soundtouch/STTypes.h> // 16 bit Stereo -#define SFX_MAX_SOURCE 1 -#define OAL_MAX_BUFFERS 32 -#define OAL_MAX_SAMPLES 256 -#define STEREO_CHANNELS 2 -#define SURROUND_CHANNELS 6 // number of channels in surround mode -#define SIZE_SHORT 2 -#define SIZE_FLOAT 4 // size of a float in bytes -#define FRAME_STEREO_SHORT STEREO_CHANNELS * SIZE_SHORT -#define FRAME_STEREO_FLOAT STEREO_CHANNELS * SIZE_FLOAT -#define FRAME_SURROUND_FLOAT SURROUND_CHANNELS * SIZE_FLOAT +#define SFX_MAX_SOURCE 1 +#define OAL_MAX_BUFFERS 32 +#define OAL_MAX_SAMPLES 256 +#define STEREO_CHANNELS 2 +#define SURROUND_CHANNELS 6 // number of channels in surround mode +#define SIZE_SHORT 2 +#define SIZE_FLOAT 4 // size of a float in bytes +#define FRAME_STEREO_SHORT STEREO_CHANNELS * SIZE_SHORT +#define FRAME_STEREO_FLOAT STEREO_CHANNELS * SIZE_FLOAT +#define FRAME_SURROUND_FLOAT SURROUND_CHANNELS * SIZE_FLOAT #endif class OpenALStream: public SoundStream diff --git a/Source/Core/AudioCommon/OpenSLESStream.cpp b/Source/Core/AudioCommon/OpenSLESStream.cpp index 67e77a4d86..ad6b3edece 100644 --- a/Source/Core/AudioCommon/OpenSLESStream.cpp +++ b/Source/Core/AudioCommon/OpenSLESStream.cpp @@ -44,7 +44,7 @@ static void bqPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void *context) { _assert_msg_(AUDIO, SL_RESULT_SUCCESS == result, "Couldn't enqueue audio stream."); - curBuffer ^= 1; // Switch buffer + curBuffer ^= 1; // Switch buffer // Render to the fresh buffer g_mixer->Mix(reinterpret_cast<short *>(buffer[curBuffer]), BUFFER_SIZE_IN_SAMPLES); } diff --git a/Source/Core/AudioCommon/XAudio2Stream.cpp b/Source/Core/AudioCommon/XAudio2Stream.cpp index cbc860bda3..4e9bade618 100644 --- a/Source/Core/AudioCommon/XAudio2Stream.cpp +++ b/Source/Core/AudioCommon/XAudio2Stream.cpp @@ -217,11 +217,11 @@ void XAudio2::Update() //static int xi = 0; //if (100000 == ++xi) //{ - // xi = 0; - // XAUDIO2_PERFORMANCE_DATA perfData; - // pXAudio2->GetPerformanceData(&perfData); - // NOTICE_LOG(DSPHLE, "XAudio2 latency (samples): %i", perfData.CurrentLatencyInSamples); - // NOTICE_LOG(DSPHLE, "XAudio2 total glitches: %i", perfData.GlitchesSinceEngineStarted); + // xi = 0; + // XAUDIO2_PERFORMANCE_DATA perfData; + // pXAudio2->GetPerformanceData(&perfData); + // NOTICE_LOG(DSPHLE, "XAudio2 latency (samples): %i", perfData.CurrentLatencyInSamples); + // NOTICE_LOG(DSPHLE, "XAudio2 total glitches: %i", perfData.GlitchesSinceEngineStarted); //} } @@ -250,7 +250,7 @@ void XAudio2::Stop() m_mastering_voice = nullptr; } - m_xaudio2.reset(); // release interface + m_xaudio2.reset(); // release interface if (m_xaudio2_dll) { diff --git a/Source/Core/AudioCommon/XAudio2_7Stream.cpp b/Source/Core/AudioCommon/XAudio2_7Stream.cpp index c3ddf1b039..d03953fc57 100644 --- a/Source/Core/AudioCommon/XAudio2_7Stream.cpp +++ b/Source/Core/AudioCommon/XAudio2_7Stream.cpp @@ -218,11 +218,11 @@ void XAudio2_7::Update() //static int xi = 0; //if (100000 == ++xi) //{ - // xi = 0; - // XAUDIO2_PERFORMANCE_DATA perfData; - // pXAudio2->GetPerformanceData(&perfData); - // NOTICE_LOG(DSPHLE, "XAudio2_7 latency (samples): %i", perfData.CurrentLatencyInSamples); - // NOTICE_LOG(DSPHLE, "XAudio2_7 total glitches: %i", perfData.GlitchesSinceEngineStarted); + // xi = 0; + // XAUDIO2_PERFORMANCE_DATA perfData; + // pXAudio2->GetPerformanceData(&perfData); + // NOTICE_LOG(DSPHLE, "XAudio2_7 latency (samples): %i", perfData.CurrentLatencyInSamples); + // NOTICE_LOG(DSPHLE, "XAudio2_7 total glitches: %i", perfData.GlitchesSinceEngineStarted); //} } @@ -251,7 +251,7 @@ void XAudio2_7::Stop() m_mastering_voice = nullptr; } - m_xaudio2.reset(); // release interface + m_xaudio2.reset(); // release interface if (m_xaudio2_dll) { diff --git a/Source/Core/AudioCommon/aldlist.cpp b/Source/Core/AudioCommon/aldlist.cpp index 7499ae165d..0cb33a8ad2 100644 --- a/Source/Core/AudioCommon/aldlist.cpp +++ b/Source/Core/AudioCommon/aldlist.cpp @@ -41,7 +41,7 @@ */ ALDeviceList::ALDeviceList() { - ALDEVICEINFO ALDeviceInfo; + ALDEVICEINFO ALDeviceInfo; char *devices; s32 index; const char *defaultDeviceName = NULL; diff --git a/Source/Core/AudioCommon/aldlist.h b/Source/Core/AudioCommon/aldlist.h index 29d742a98b..7ea071d12e 100644 --- a/Source/Core/AudioCommon/aldlist.h +++ b/Source/Core/AudioCommon/aldlist.h @@ -12,12 +12,12 @@ using namespace std; typedef struct { - string strDeviceName; - s32 iMajorVersion; - s32 iMinorVersion; - u32 uiSourceCount; - vector<string> *pvstrExtensions; - bool bSelected; + string strDeviceName; + s32 iMajorVersion; + s32 iMinorVersion; + u32 uiSourceCount; + vector<string>* pvstrExtensions; + bool bSelected; } ALDEVICEINFO, *LPALDEVICEINFO; class ALDeviceList diff --git a/Source/Core/AudioCommon/stdafx.h b/Source/Core/AudioCommon/stdafx.h index 9cd419573c..e28b312ed0 100644 --- a/Source/Core/AudioCommon/stdafx.h +++ b/Source/Core/AudioCommon/stdafx.h @@ -11,7 +11,7 @@ #define _WIN32_WINNT 0x602 #endif */ -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #include <algorithm> #include <functional> diff --git a/Source/Core/Common/ArmEmitter.cpp b/Source/Core/Common/ArmEmitter.cpp index 00b64606db..7bcd6e8f68 100644 --- a/Source/Core/Common/ArmEmitter.cpp +++ b/Source/Core/Common/ArmEmitter.cpp @@ -412,7 +412,7 @@ FixupBranch ARMXEmitter::BL_CC(CCFlags Cond) void ARMXEmitter::SetJumpTarget(FixupBranch const &branch) { s32 distance = (s32(code) - 8) - (s32)branch.ptr; - _dbg_assert_msg_(DYNA_REC, distance > -33554432 + _dbg_assert_msg_(DYNA_REC, distance > -33554432 && distance <= 33554432, "SetJumpTarget out of range (%p calls %p)", code, branch.ptr); @@ -420,13 +420,13 @@ void ARMXEmitter::SetJumpTarget(FixupBranch const &branch) *(u32*)branch.ptr = (u32)(branch.condition | (10 << 24) | ((distance >> 2) & 0x00FFFFFF)); else // BL - *(u32*)branch.ptr = (u32)(branch.condition | 0x0B000000 | ((distance >> 2) + *(u32*)branch.ptr = (u32)(branch.condition | 0x0B000000 | ((distance >> 2) & 0x00FFFFFF)); } void ARMXEmitter::B (const void *fnptr) { s32 distance = (s32)fnptr - (s32(code) + 8); - _dbg_assert_msg_(DYNA_REC, distance > -33554432 + _dbg_assert_msg_(DYNA_REC, distance > -33554432 && distance <= 33554432, "B out of range (%p calls %p)", code, fnptr); @@ -553,19 +553,19 @@ void ARMXEmitter::SBC (ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(6, void ARMXEmitter::SBCS(ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(6, Rd, Rn, Rm, true); } void ARMXEmitter::RSC (ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(7, Rd, Rn, Rm); } void ARMXEmitter::RSCS(ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(7, Rd, Rn, Rm, true); } -void ARMXEmitter::TST ( ARMReg Rn, Operand2 Rm) { WriteInstruction(8, R0, Rn, Rm, true); } -void ARMXEmitter::TEQ ( ARMReg Rn, Operand2 Rm) { WriteInstruction(9, R0, Rn, Rm, true); } -void ARMXEmitter::CMP ( ARMReg Rn, Operand2 Rm) { WriteInstruction(10, R0, Rn, Rm, true); } -void ARMXEmitter::CMN ( ARMReg Rn, Operand2 Rm) { WriteInstruction(11, R0, Rn, Rm, true); } +void ARMXEmitter::TST ( ARMReg Rn, Operand2 Rm) { WriteInstruction(8, R0, Rn, Rm, true); } +void ARMXEmitter::TEQ ( ARMReg Rn, Operand2 Rm) { WriteInstruction(9, R0, Rn, Rm, true); } +void ARMXEmitter::CMP ( ARMReg Rn, Operand2 Rm) { WriteInstruction(10, R0, Rn, Rm, true); } +void ARMXEmitter::CMN ( ARMReg Rn, Operand2 Rm) { WriteInstruction(11, R0, Rn, Rm, true); } void ARMXEmitter::ORR (ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(12, Rd, Rn, Rm); } void ARMXEmitter::ORRS(ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(12, Rd, Rn, Rm, true); } -void ARMXEmitter::MOV (ARMReg Rd, Operand2 Rm) { WriteInstruction(13, Rd, R0, Rm); } -void ARMXEmitter::MOVS(ARMReg Rd, Operand2 Rm) { WriteInstruction(13, Rd, R0, Rm, true); } +void ARMXEmitter::MOV (ARMReg Rd, Operand2 Rm) { WriteInstruction(13, Rd, R0, Rm); } +void ARMXEmitter::MOVS(ARMReg Rd, Operand2 Rm) { WriteInstruction(13, Rd, R0, Rm, true); } void ARMXEmitter::BIC (ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(14, Rd, Rn, Rm); } void ARMXEmitter::BICS(ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(14, Rd, Rn, Rm, true); } -void ARMXEmitter::MVN (ARMReg Rd, Operand2 Rm) { WriteInstruction(15, Rd, R0, Rm); } -void ARMXEmitter::MVNS(ARMReg Rd, Operand2 Rm) { WriteInstruction(15, Rd, R0, Rm, true); } -void ARMXEmitter::MOVW(ARMReg Rd, Operand2 Rm) { WriteInstruction(16, Rd, R0, Rm); } +void ARMXEmitter::MVN (ARMReg Rd, Operand2 Rm) { WriteInstruction(15, Rd, R0, Rm); } +void ARMXEmitter::MVNS(ARMReg Rd, Operand2 Rm) { WriteInstruction(15, Rd, R0, Rm, true); } +void ARMXEmitter::MOVW(ARMReg Rd, Operand2 Rm) { WriteInstruction(16, Rd, R0, Rm); } void ARMXEmitter::MOVT(ARMReg Rd, Operand2 Rm, bool TopBits) { WriteInstruction(17, Rd, R0, TopBits ? Rm.Value >> 16 : Rm); } void ARMXEmitter::WriteInstruction (u32 Op, ARMReg Rd, ARMReg Rn, Operand2 Rm, bool SetFlags) // This can get renamed later @@ -614,11 +614,11 @@ void ARMXEmitter::LSRS(ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedData void ARMXEmitter::ASR (ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedDataOp(4, false, dest, src, op2);} void ARMXEmitter::ASRS(ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedDataOp(4, true, dest, src, op2);} -void ARMXEmitter::MUL (ARMReg dest, ARMReg src, ARMReg op2) +void ARMXEmitter::MUL (ARMReg dest, ARMReg src, ARMReg op2) { Write32(condition | (dest << 16) | (src << 8) | (9 << 4) | op2); } -void ARMXEmitter::MULS(ARMReg dest, ARMReg src, ARMReg op2) +void ARMXEmitter::MULS(ARMReg dest, ARMReg src, ARMReg op2) { Write32(condition | (1 << 20) | (dest << 16) | (src << 8) | (9 << 4) | op2); } @@ -697,11 +697,11 @@ void ARMXEmitter::REV16(ARMReg dest, ARMReg src) Write32(condition | (0x6BF << 16) | (dest << 12) | (0xFB << 4) | src); } -void ARMXEmitter::_MSR (bool write_nzcvq, bool write_g, Operand2 op2) +void ARMXEmitter::_MSR (bool write_nzcvq, bool write_g, Operand2 op2) { Write32(condition | (0x320F << 12) | (write_nzcvq << 19) | (write_g << 18) | op2.Imm12Mod()); } -void ARMXEmitter::_MSR (bool write_nzcvq, bool write_g, ARMReg src) +void ARMXEmitter::_MSR (bool write_nzcvq, bool write_g, ARMReg src) { Write32(condition | (0x120F << 12) | (write_nzcvq << 19) | (write_g << 18) | src); } diff --git a/Source/Core/Common/ArmEmitter.h b/Source/Core/Common/ArmEmitter.h index 9c53cb66f3..836a1072b8 100644 --- a/Source/Core/Common/ArmEmitter.h +++ b/Source/Core/Common/ArmEmitter.h @@ -118,7 +118,7 @@ private: OpType Type; // IMM types - u8 Rotation; // Only for u8 values + u8 Rotation; // Only for u8 values // Register types u8 IndexOrShift; @@ -302,9 +302,9 @@ bool TryMakeOperand2_AllowNegation(s32 imm, Operand2 &op2, bool *negated); // Use this only when you know imm can be made into an Operand2. Operand2 AssumeMakeOperand2(u32 imm); -inline Operand2 R(ARMReg Reg) { return Operand2(Reg, TYPE_REG); } -inline Operand2 IMM(u32 Imm) { return Operand2(Imm, TYPE_IMM); } -inline Operand2 Mem(void *ptr) { return Operand2((u32)ptr, TYPE_IMM); } +inline Operand2 R(ARMReg Reg) { return Operand2(Reg, TYPE_REG); } +inline Operand2 IMM(u32 Imm) { return Operand2(Imm, TYPE_IMM); } +inline Operand2 Mem(void *ptr) { return Operand2((u32)ptr, TYPE_IMM); } //usage: struct {int e;} s; STRUCT_OFFSET(s,e) #define STRUCT_OFF(str,elem) ((u32)((u32)&(str).elem-(u32)&(str))) @@ -474,8 +474,8 @@ public: void UDIV(ARMReg dest, ARMReg dividend, ARMReg divisor); void SDIV(ARMReg dest, ARMReg dividend, ARMReg divisor); - void MUL (ARMReg dest, ARMReg src, ARMReg op2); - void MULS(ARMReg dest, ARMReg src, ARMReg op2); + void MUL (ARMReg dest, ARMReg src, ARMReg op2); + void MULS(ARMReg dest, ARMReg src, ARMReg op2); void UMULL(ARMReg destLo, ARMReg destHi, ARMReg rn, ARMReg rm); void UMULLS(ARMReg destLo, ARMReg destHi, ARMReg rn, ARMReg rm); @@ -599,7 +599,7 @@ private: void VREVX(u32 size, u32 Size, ARMReg Vd, ARMReg Vm); -public: +public: NEONXEmitter(ARMXEmitter *emit) : _emit(emit) {} diff --git a/Source/Core/Common/BreakPoints.cpp b/Source/Core/Common/BreakPoints.cpp index bd96e2cefc..912afd7fee 100644 --- a/Source/Core/Common/BreakPoints.cpp +++ b/Source/Core/Common/BreakPoints.cpp @@ -132,11 +132,11 @@ void MemChecks::AddFromStrings(const TMemChecksStr& mcstrs) std::stringstream ss; ss << std::hex << mcstr; ss >> mc.StartAddress; - mc.bRange = mcstr.find("n") != mcstr.npos; - mc.OnRead = mcstr.find("r") != mcstr.npos; - mc.OnWrite = mcstr.find("w") != mcstr.npos; - mc.Log = mcstr.find("l") != mcstr.npos; - mc.Break = mcstr.find("p") != mcstr.npos; + mc.bRange = mcstr.find("n") != mcstr.npos; + mc.OnRead = mcstr.find("r") != mcstr.npos; + mc.OnWrite = mcstr.find("w") != mcstr.npos; + mc.Log = mcstr.find("l") != mcstr.npos; + mc.Break = mcstr.find("p") != mcstr.npos; if (mc.bRange) ss >> mc.EndAddress; else diff --git a/Source/Core/Common/CDUtils.cpp b/Source/Core/Common/CDUtils.cpp index cd9d881fb7..37b5f281c5 100644 --- a/Source/Core/Common/CDUtils.cpp +++ b/Source/Core/Common/CDUtils.cpp @@ -47,7 +47,7 @@ std::vector<std::string> cdio_get_devices() if (is_cdrom(drive)) { std::string str(TStrToUTF8(drive)); - str.pop_back(); // we don't want the final backslash + str.pop_back(); // we don't want the final backslash drives.push_back(std::move(str)); } diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h index b6592e3ea1..611e1a1641 100644 --- a/Source/Core/Common/CommonFuncs.h +++ b/Source/Core/Common/CommonFuncs.h @@ -105,13 +105,13 @@ inline u64 _rotr64(u64 x, unsigned int shift){ #define freelocale _free_locale #define newlocale(mask, locale, base) _create_locale(mask, locale) - #define LC_GLOBAL_LOCALE ((locale_t)-1) - #define LC_ALL_MASK LC_ALL - #define LC_COLLATE_MASK LC_COLLATE - #define LC_CTYPE_MASK LC_CTYPE - #define LC_MONETARY_MASK LC_MONETARY - #define LC_NUMERIC_MASK LC_NUMERIC - #define LC_TIME_MASK LC_TIME + #define LC_GLOBAL_LOCALE ((locale_t)-1) + #define LC_ALL_MASK LC_ALL + #define LC_COLLATE_MASK LC_COLLATE + #define LC_CTYPE_MASK LC_CTYPE + #define LC_MONETARY_MASK LC_MONETARY + #define LC_NUMERIC_MASK LC_NUMERIC + #define LC_TIME_MASK LC_TIME inline locale_t uselocale(locale_t new_locale) { diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h index 3481aca00f..633afbd755 100644 --- a/Source/Core/Common/CommonPaths.h +++ b/Source/Core/Common/CommonPaths.h @@ -55,63 +55,63 @@ #define JAP_DIR "JAP" // Subdirs in the User dir returned by GetUserPath(D_USER_IDX) -#define GC_USER_DIR "GC" -#define WII_USER_DIR "Wii" -#define CONFIG_DIR "Config" -#define GAMESETTINGS_DIR "GameSettings" -#define MAPS_DIR "Maps" -#define CACHE_DIR "Cache" -#define SHADERCACHE_DIR "ShaderCache" -#define STATESAVES_DIR "StateSaves" -#define SCREENSHOTS_DIR "ScreenShots" -#define LOAD_DIR "Load" -#define HIRES_TEXTURES_DIR LOAD_DIR DIR_SEP "Textures" -#define DUMP_DIR "Dump" -#define DUMP_TEXTURES_DIR "Textures" -#define DUMP_FRAMES_DIR "Frames" -#define DUMP_AUDIO_DIR "Audio" -#define DUMP_DSP_DIR "DSP" -#define LOGS_DIR "Logs" -#define MAIL_LOGS_DIR "Mail" -#define SHADERS_DIR "Shaders" -#define WII_SYSCONF_DIR "shared2" DIR_SEP "sys" -#define WII_WC24CONF_DIR "shared2" DIR_SEP "wc24" -#define THEMES_DIR "Themes" +#define GC_USER_DIR "GC" +#define WII_USER_DIR "Wii" +#define CONFIG_DIR "Config" +#define GAMESETTINGS_DIR "GameSettings" +#define MAPS_DIR "Maps" +#define CACHE_DIR "Cache" +#define SHADERCACHE_DIR "ShaderCache" +#define STATESAVES_DIR "StateSaves" +#define SCREENSHOTS_DIR "ScreenShots" +#define LOAD_DIR "Load" +#define HIRES_TEXTURES_DIR LOAD_DIR DIR_SEP "Textures" +#define DUMP_DIR "Dump" +#define DUMP_TEXTURES_DIR "Textures" +#define DUMP_FRAMES_DIR "Frames" +#define DUMP_AUDIO_DIR "Audio" +#define DUMP_DSP_DIR "DSP" +#define LOGS_DIR "Logs" +#define MAIL_LOGS_DIR "Mail" +#define SHADERS_DIR "Shaders" +#define WII_SYSCONF_DIR "shared2" DIR_SEP "sys" +#define WII_WC24CONF_DIR "shared2" DIR_SEP "wc24" +#define THEMES_DIR "Themes" // Filenames // Files in the directory returned by GetUserPath(D_CONFIG_IDX) -#define DOLPHIN_CONFIG "Dolphin.ini" -#define DEBUGGER_CONFIG "Debugger.ini" -#define LOGGER_CONFIG "Logger.ini" +#define DOLPHIN_CONFIG "Dolphin.ini" +#define DEBUGGER_CONFIG "Debugger.ini" +#define LOGGER_CONFIG "Logger.ini" // Files in the directory returned by GetUserPath(D_LOGS_IDX) -#define MAIN_LOG "dolphin.log" +#define MAIN_LOG "dolphin.log" // Files in the directory returned by GetUserPath(D_WIISYSCONF_IDX) -#define WII_SYSCONF "SYSCONF" +#define WII_SYSCONF "SYSCONF" // Files in the directory returned by GetUserPath(D_DUMP_IDX) -#define RAM_DUMP "ram.raw" -#define ARAM_DUMP "aram.raw" -#define FAKEVMEM_DUMP "fakevmem.raw" +#define RAM_DUMP "ram.raw" +#define ARAM_DUMP "aram.raw" +#define FAKEVMEM_DUMP "fakevmem.raw" // Sys files -#define TOTALDB "totaldb.dsy" +#define TOTALDB "totaldb.dsy" -#define FONT_ANSI "font_ansi.bin" -#define FONT_SJIS "font_sjis.bin" +#define FONT_ANSI "font_ansi.bin" +#define FONT_SJIS "font_sjis.bin" -#define DSP_IROM "dsp_rom.bin" -#define DSP_COEF "dsp_coef.bin" +#define DSP_IROM "dsp_rom.bin" +#define DSP_COEF "dsp_coef.bin" -#define GC_IPL "IPL.bin" -#define GC_SRAM "SRAM.raw" -#define GC_MEMCARDA "MemoryCardA" -#define GC_MEMCARDB "MemoryCardB" +#define GC_IPL "IPL.bin" +#define GC_SRAM "SRAM.raw" +#define GC_MEMCARDA "MemoryCardA" +#define GC_MEMCARDB "MemoryCardB" -#define WII_STATE "state.dat" +#define WII_STATE "state.dat" -#define WII_SETTING "setting.txt" +#define WII_SETTING "setting.txt" #define GECKO_CODE_HANDLER "codehandler.bin" diff --git a/Source/Core/Common/Crypto/ec.cpp b/Source/Core/Common/Crypto/ec.cpp index d360a5b659..e1eb617406 100644 --- a/Source/Core/Common/Crypto/ec.cpp +++ b/Source/Core/Common/Crypto/ec.cpp @@ -307,7 +307,7 @@ static void point_add(u8 *r, u8 *p, u8 *q) elt_add(ry, s, rx); } -void point_mul(u8 *d, const u8 *a, u8 *b) // a is bignum +void point_mul(u8 *d, const u8 *a, u8 *b) // a is bignum { u32 i; u8 mask; diff --git a/Source/Core/Common/Crypto/tools.h b/Source/Core/Common/Crypto/tools.h index d97995c093..0e4d49be1a 100644 --- a/Source/Core/Common/Crypto/tools.h +++ b/Source/Core/Common/Crypto/tools.h @@ -11,7 +11,7 @@ int bn_compare(u8 *a, u8 *b, u32 n); void bn_sub_modulus(u8 *a, u8 *N, u32 n); void bn_add(u8 *d, u8 *a, u8 *b, u8 *N, u32 n); void bn_mul(u8 *d, u8 *a, u8 *b, u8 *N, u32 n); -void bn_inv(u8 *d, u8 *a, u8 *N, u32 n); // only for prime N +void bn_inv(u8 *d, u8 *a, u8 *N, u32 n); // only for prime N void bn_exp(u8 *d, u8 *a, u8 *N, u32 n, u8 *e, u32 en); void point_mul(u8 *d, const u8 *a, u8 *b); diff --git a/Source/Core/Common/FifoQueue.h b/Source/Core/Common/FifoQueue.h index 0e0ada1397..9cae0f5f1d 100644 --- a/Source/Core/Common/FifoQueue.h +++ b/Source/Core/Common/FifoQueue.h @@ -63,7 +63,7 @@ public: m_read_ptr = AtomicLoad(tmpptr->next); // set the next element to NULL to stop the recursive deletion tmpptr->next = NULL; - delete tmpptr; // this also deletes the element + delete tmpptr; // this also deletes the element } bool Pop(T& t) diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp index ae2d87496a..02c2b2aec5 100644 --- a/Source/Core/Common/FileUtil.cpp +++ b/Source/Core/Common/FileUtil.cpp @@ -803,37 +803,37 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new getenv("PWD") : "") + DIR_SEP DOLPHIN_DATA_DIR DIR_SEP; #endif - paths[D_GCUSER_IDX] = paths[D_USER_IDX] + GC_USER_DIR DIR_SEP; - paths[D_WIIROOT_IDX] = paths[D_USER_IDX] + WII_USER_DIR; - paths[D_WIIUSER_IDX] = paths[D_WIIROOT_IDX] + DIR_SEP; - paths[D_CONFIG_IDX] = paths[D_USER_IDX] + CONFIG_DIR DIR_SEP; - paths[D_GAMESETTINGS_IDX] = paths[D_USER_IDX] + GAMESETTINGS_DIR DIR_SEP; - paths[D_MAPS_IDX] = paths[D_USER_IDX] + MAPS_DIR DIR_SEP; - paths[D_CACHE_IDX] = paths[D_USER_IDX] + CACHE_DIR DIR_SEP; - paths[D_SHADERCACHE_IDX] = paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP; - paths[D_SHADERS_IDX] = paths[D_USER_IDX] + SHADERS_DIR DIR_SEP; - paths[D_STATESAVES_IDX] = paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP; - paths[D_SCREENSHOTS_IDX] = paths[D_USER_IDX] + SCREENSHOTS_DIR DIR_SEP; - paths[D_HIRESTEXTURES_IDX] = paths[D_USER_IDX] + HIRES_TEXTURES_DIR DIR_SEP; - paths[D_DUMP_IDX] = paths[D_USER_IDX] + DUMP_DIR DIR_SEP; - paths[D_DUMPFRAMES_IDX] = paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP; - paths[D_DUMPAUDIO_IDX] = paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP; - paths[D_DUMPTEXTURES_IDX] = paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP; - paths[D_DUMPDSP_IDX] = paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP; - paths[D_LOGS_IDX] = paths[D_USER_IDX] + LOGS_DIR DIR_SEP; - paths[D_MAILLOGS_IDX] = paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP; - paths[D_WIISYSCONF_IDX] = paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR DIR_SEP; - paths[D_WIIWC24_IDX] = paths[D_WIIUSER_IDX] + WII_WC24CONF_DIR DIR_SEP; - paths[D_THEMES_IDX] = paths[D_USER_IDX] + THEMES_DIR DIR_SEP; - paths[F_DOLPHINCONFIG_IDX] = paths[D_CONFIG_IDX] + DOLPHIN_CONFIG; - paths[F_DEBUGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + DEBUGGER_CONFIG; - paths[F_LOGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + LOGGER_CONFIG; - paths[F_MAINLOG_IDX] = paths[D_LOGS_IDX] + MAIN_LOG; - paths[F_WIISYSCONF_IDX] = paths[D_WIISYSCONF_IDX] + WII_SYSCONF; - paths[F_RAMDUMP_IDX] = paths[D_DUMP_IDX] + RAM_DUMP; - paths[F_ARAMDUMP_IDX] = paths[D_DUMP_IDX] + ARAM_DUMP; - paths[F_FAKEVMEMDUMP_IDX] = paths[D_DUMP_IDX] + FAKEVMEM_DUMP; - paths[F_GCSRAM_IDX] = paths[D_GCUSER_IDX] + GC_SRAM; + paths[D_GCUSER_IDX] = paths[D_USER_IDX] + GC_USER_DIR DIR_SEP; + paths[D_WIIROOT_IDX] = paths[D_USER_IDX] + WII_USER_DIR; + paths[D_WIIUSER_IDX] = paths[D_WIIROOT_IDX] + DIR_SEP; + paths[D_CONFIG_IDX] = paths[D_USER_IDX] + CONFIG_DIR DIR_SEP; + paths[D_GAMESETTINGS_IDX] = paths[D_USER_IDX] + GAMESETTINGS_DIR DIR_SEP; + paths[D_MAPS_IDX] = paths[D_USER_IDX] + MAPS_DIR DIR_SEP; + paths[D_CACHE_IDX] = paths[D_USER_IDX] + CACHE_DIR DIR_SEP; + paths[D_SHADERCACHE_IDX] = paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP; + paths[D_SHADERS_IDX] = paths[D_USER_IDX] + SHADERS_DIR DIR_SEP; + paths[D_STATESAVES_IDX] = paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP; + paths[D_SCREENSHOTS_IDX] = paths[D_USER_IDX] + SCREENSHOTS_DIR DIR_SEP; + paths[D_HIRESTEXTURES_IDX] = paths[D_USER_IDX] + HIRES_TEXTURES_DIR DIR_SEP; + paths[D_DUMP_IDX] = paths[D_USER_IDX] + DUMP_DIR DIR_SEP; + paths[D_DUMPFRAMES_IDX] = paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP; + paths[D_DUMPAUDIO_IDX] = paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP; + paths[D_DUMPTEXTURES_IDX] = paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP; + paths[D_DUMPDSP_IDX] = paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP; + paths[D_LOGS_IDX] = paths[D_USER_IDX] + LOGS_DIR DIR_SEP; + paths[D_MAILLOGS_IDX] = paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP; + paths[D_WIISYSCONF_IDX] = paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR DIR_SEP; + paths[D_WIIWC24_IDX] = paths[D_WIIUSER_IDX] + WII_WC24CONF_DIR DIR_SEP; + paths[D_THEMES_IDX] = paths[D_USER_IDX] + THEMES_DIR DIR_SEP; + paths[F_DOLPHINCONFIG_IDX] = paths[D_CONFIG_IDX] + DOLPHIN_CONFIG; + paths[F_DEBUGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + DEBUGGER_CONFIG; + paths[F_LOGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + LOGGER_CONFIG; + paths[F_MAINLOG_IDX] = paths[D_LOGS_IDX] + MAIN_LOG; + paths[F_WIISYSCONF_IDX] = paths[D_WIISYSCONF_IDX] + WII_SYSCONF; + paths[F_RAMDUMP_IDX] = paths[D_DUMP_IDX] + RAM_DUMP; + paths[F_ARAMDUMP_IDX] = paths[D_DUMP_IDX] + ARAM_DUMP; + paths[F_FAKEVMEMDUMP_IDX] = paths[D_DUMP_IDX] + FAKEVMEM_DUMP; + paths[F_GCSRAM_IDX] = paths[D_GCUSER_IDX] + GC_SRAM; } if (!newPath.empty()) @@ -851,72 +851,72 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new switch (DirIDX) { case D_WIIROOT_IDX: - paths[D_WIIUSER_IDX] = paths[D_WIIROOT_IDX] + DIR_SEP; - paths[D_WIISYSCONF_IDX] = paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR + DIR_SEP; - paths[F_WIISYSCONF_IDX] = paths[D_WIISYSCONF_IDX] + WII_SYSCONF; + paths[D_WIIUSER_IDX] = paths[D_WIIROOT_IDX] + DIR_SEP; + paths[D_WIISYSCONF_IDX] = paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR + DIR_SEP; + paths[F_WIISYSCONF_IDX] = paths[D_WIISYSCONF_IDX] + WII_SYSCONF; break; case D_USER_IDX: - paths[D_GCUSER_IDX] = paths[D_USER_IDX] + GC_USER_DIR DIR_SEP; - paths[D_WIIROOT_IDX] = paths[D_USER_IDX] + WII_USER_DIR; - paths[D_WIIUSER_IDX] = paths[D_WIIROOT_IDX] + DIR_SEP; - paths[D_CONFIG_IDX] = paths[D_USER_IDX] + CONFIG_DIR DIR_SEP; - paths[D_GAMESETTINGS_IDX] = paths[D_USER_IDX] + GAMESETTINGS_DIR DIR_SEP; - paths[D_MAPS_IDX] = paths[D_USER_IDX] + MAPS_DIR DIR_SEP; - paths[D_CACHE_IDX] = paths[D_USER_IDX] + CACHE_DIR DIR_SEP; - paths[D_SHADERCACHE_IDX] = paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP; - paths[D_SHADERS_IDX] = paths[D_USER_IDX] + SHADERS_DIR DIR_SEP; - paths[D_STATESAVES_IDX] = paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP; - paths[D_SCREENSHOTS_IDX] = paths[D_USER_IDX] + SCREENSHOTS_DIR DIR_SEP; - paths[D_HIRESTEXTURES_IDX] = paths[D_USER_IDX] + HIRES_TEXTURES_DIR DIR_SEP; - paths[D_DUMP_IDX] = paths[D_USER_IDX] + DUMP_DIR DIR_SEP; - paths[D_DUMPFRAMES_IDX] = paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP; - paths[D_DUMPAUDIO_IDX] = paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP; - paths[D_DUMPTEXTURES_IDX] = paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP; - paths[D_DUMPDSP_IDX] = paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP; - paths[D_LOGS_IDX] = paths[D_USER_IDX] + LOGS_DIR DIR_SEP; - paths[D_MAILLOGS_IDX] = paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP; - paths[D_WIISYSCONF_IDX] = paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR DIR_SEP; - paths[D_THEMES_IDX] = paths[D_USER_IDX] + THEMES_DIR DIR_SEP; - paths[F_DOLPHINCONFIG_IDX] = paths[D_CONFIG_IDX] + DOLPHIN_CONFIG; - paths[F_DEBUGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + DEBUGGER_CONFIG; - paths[F_LOGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + LOGGER_CONFIG; - paths[F_MAINLOG_IDX] = paths[D_LOGS_IDX] + MAIN_LOG; - paths[F_WIISYSCONF_IDX] = paths[D_WIISYSCONF_IDX] + WII_SYSCONF; - paths[F_RAMDUMP_IDX] = paths[D_DUMP_IDX] + RAM_DUMP; - paths[F_ARAMDUMP_IDX] = paths[D_DUMP_IDX] + ARAM_DUMP; - paths[F_FAKEVMEMDUMP_IDX] = paths[D_DUMP_IDX] + FAKEVMEM_DUMP; - paths[F_GCSRAM_IDX] = paths[D_GCUSER_IDX] + GC_SRAM; + paths[D_GCUSER_IDX] = paths[D_USER_IDX] + GC_USER_DIR DIR_SEP; + paths[D_WIIROOT_IDX] = paths[D_USER_IDX] + WII_USER_DIR; + paths[D_WIIUSER_IDX] = paths[D_WIIROOT_IDX] + DIR_SEP; + paths[D_CONFIG_IDX] = paths[D_USER_IDX] + CONFIG_DIR DIR_SEP; + paths[D_GAMESETTINGS_IDX] = paths[D_USER_IDX] + GAMESETTINGS_DIR DIR_SEP; + paths[D_MAPS_IDX] = paths[D_USER_IDX] + MAPS_DIR DIR_SEP; + paths[D_CACHE_IDX] = paths[D_USER_IDX] + CACHE_DIR DIR_SEP; + paths[D_SHADERCACHE_IDX] = paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP; + paths[D_SHADERS_IDX] = paths[D_USER_IDX] + SHADERS_DIR DIR_SEP; + paths[D_STATESAVES_IDX] = paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP; + paths[D_SCREENSHOTS_IDX] = paths[D_USER_IDX] + SCREENSHOTS_DIR DIR_SEP; + paths[D_HIRESTEXTURES_IDX] = paths[D_USER_IDX] + HIRES_TEXTURES_DIR DIR_SEP; + paths[D_DUMP_IDX] = paths[D_USER_IDX] + DUMP_DIR DIR_SEP; + paths[D_DUMPFRAMES_IDX] = paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP; + paths[D_DUMPAUDIO_IDX] = paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP; + paths[D_DUMPTEXTURES_IDX] = paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP; + paths[D_DUMPDSP_IDX] = paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP; + paths[D_LOGS_IDX] = paths[D_USER_IDX] + LOGS_DIR DIR_SEP; + paths[D_MAILLOGS_IDX] = paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP; + paths[D_WIISYSCONF_IDX] = paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR DIR_SEP; + paths[D_THEMES_IDX] = paths[D_USER_IDX] + THEMES_DIR DIR_SEP; + paths[F_DOLPHINCONFIG_IDX] = paths[D_CONFIG_IDX] + DOLPHIN_CONFIG; + paths[F_DEBUGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + DEBUGGER_CONFIG; + paths[F_LOGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + LOGGER_CONFIG; + paths[F_MAINLOG_IDX] = paths[D_LOGS_IDX] + MAIN_LOG; + paths[F_WIISYSCONF_IDX] = paths[D_WIISYSCONF_IDX] + WII_SYSCONF; + paths[F_RAMDUMP_IDX] = paths[D_DUMP_IDX] + RAM_DUMP; + paths[F_ARAMDUMP_IDX] = paths[D_DUMP_IDX] + ARAM_DUMP; + paths[F_FAKEVMEMDUMP_IDX] = paths[D_DUMP_IDX] + FAKEVMEM_DUMP; + paths[F_GCSRAM_IDX] = paths[D_GCUSER_IDX] + GC_SRAM; break; case D_CONFIG_IDX: - paths[F_DOLPHINCONFIG_IDX] = paths[D_CONFIG_IDX] + DOLPHIN_CONFIG; - paths[F_DEBUGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + DEBUGGER_CONFIG; - paths[F_LOGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + LOGGER_CONFIG; + paths[F_DOLPHINCONFIG_IDX] = paths[D_CONFIG_IDX] + DOLPHIN_CONFIG; + paths[F_DEBUGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + DEBUGGER_CONFIG; + paths[F_LOGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + LOGGER_CONFIG; break; case D_GCUSER_IDX: - paths[F_GCSRAM_IDX] = paths[D_GCUSER_IDX] + GC_SRAM; + paths[F_GCSRAM_IDX] = paths[D_GCUSER_IDX] + GC_SRAM; break; case D_DUMP_IDX: - paths[D_DUMPFRAMES_IDX] = paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP; - paths[D_DUMPAUDIO_IDX] = paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP; - paths[D_DUMPTEXTURES_IDX] = paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP; - paths[D_DUMPDSP_IDX] = paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP; - paths[F_RAMDUMP_IDX] = paths[D_DUMP_IDX] + RAM_DUMP; - paths[F_ARAMDUMP_IDX] = paths[D_DUMP_IDX] + ARAM_DUMP; - paths[F_FAKEVMEMDUMP_IDX] = paths[D_DUMP_IDX] + FAKEVMEM_DUMP; + paths[D_DUMPFRAMES_IDX] = paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP; + paths[D_DUMPAUDIO_IDX] = paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP; + paths[D_DUMPTEXTURES_IDX] = paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP; + paths[D_DUMPDSP_IDX] = paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP; + paths[F_RAMDUMP_IDX] = paths[D_DUMP_IDX] + RAM_DUMP; + paths[F_ARAMDUMP_IDX] = paths[D_DUMP_IDX] + ARAM_DUMP; + paths[F_FAKEVMEMDUMP_IDX] = paths[D_DUMP_IDX] + FAKEVMEM_DUMP; break; case D_LOGS_IDX: - paths[D_MAILLOGS_IDX] = paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP; - paths[F_MAINLOG_IDX] = paths[D_LOGS_IDX] + MAIN_LOG; + paths[D_MAILLOGS_IDX] = paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP; + paths[F_MAINLOG_IDX] = paths[D_LOGS_IDX] + MAIN_LOG; } - paths[D_WIIUSER_IDX] = paths[D_WIIROOT_IDX] + DIR_SEP; - paths[D_WIIWC24_IDX] = paths[D_WIIUSER_IDX] + WII_WC24CONF_DIR DIR_SEP; - paths[D_WIISYSCONF_IDX] = paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR + DIR_SEP; - paths[F_WIISYSCONF_IDX] = paths[D_WIISYSCONF_IDX] + WII_SYSCONF; + paths[D_WIIUSER_IDX] = paths[D_WIIROOT_IDX] + DIR_SEP; + paths[D_WIIWC24_IDX] = paths[D_WIIUSER_IDX] + WII_WC24CONF_DIR DIR_SEP; + paths[D_WIISYSCONF_IDX] = paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR + DIR_SEP; + paths[F_WIISYSCONF_IDX] = paths[D_WIISYSCONF_IDX] + WII_SYSCONF; } return paths[DirIDX]; diff --git a/Source/Core/Common/FileUtil.h b/Source/Core/Common/FileUtil.h index e0efc42ca1..61dd618c1b 100644 --- a/Source/Core/Common/FileUtil.h +++ b/Source/Core/Common/FileUtil.h @@ -198,7 +198,7 @@ public: bool IsOpen() { return NULL != m_file; } // m_good is set to false when a read, write or other function fails - bool IsGood() { return m_good; } + bool IsGood() { return m_good; } operator void*() { return m_good ? m_file : NULL; } std::FILE* ReleaseHandle(); diff --git a/Source/Core/Common/FixedSizeQueue.h b/Source/Core/Common/FixedSizeQueue.h index 2b54b631b8..b6b9b0afe8 100644 --- a/Source/Core/Common/FixedSizeQueue.h +++ b/Source/Core/Common/FixedSizeQueue.h @@ -20,7 +20,7 @@ class FixedSizeQueue int count; // sacrifice 4 bytes for a simpler implementation. may optimize away in the future. // Make copy constructor private for now. - FixedSizeQueue(FixedSizeQueue &other) { } + FixedSizeQueue(FixedSizeQueue &other) {} public: FixedSizeQueue() diff --git a/Source/Core/Common/IniFile.h b/Source/Core/Common/IniFile.h index 9987dfc7e7..4d87b6bea8 100644 --- a/Source/Core/Common/IniFile.h +++ b/Source/Core/Common/IniFile.h @@ -36,7 +36,7 @@ public: void Set(const std::string& key, const std::string& newValue); void Set(const std::string& key, const std::string& newValue, const std::string& defaultValue); - bool Get(const std::string& key, std::string* value, const std::string& defaultValue = NULL_STRING); + bool Get(const std::string& key, std::string* value, const std::string& defaultValue = NULL_STRING); void Set(const std::string& key, u32 newValue) { Set(key, StringFromFormat("0x%08x", newValue)); diff --git a/Source/Core/Common/LinearDiskCache.h b/Source/Core/Common/LinearDiskCache.h index 34bf38165c..5103db96f0 100644 --- a/Source/Core/Common/LinearDiskCache.h +++ b/Source/Core/Common/LinearDiskCache.h @@ -87,7 +87,7 @@ public: Read(value, value_size) && Read(&entry_number) && entry_number == m_num_entries+1) - { + { reader.Read(key, value, value_size); } else diff --git a/Source/Core/Common/Log.h b/Source/Core/Common/Log.h index 544245e847..e7282e6b9c 100644 --- a/Source/Core/Common/Log.h +++ b/Source/Core/Common/Log.h @@ -140,12 +140,12 @@ void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type, #ifndef GEKKO #ifdef _WIN32 -#define _assert_msg_(_t_, _a_, _fmt_, ...) \ +#define _assert_msg_(_t_, _a_, _fmt_, ...) \ if (!(_a_)) {\ if (!PanicYesNo(_fmt_, __VA_ARGS__)) {Crash();} \ } #else // not win32 -#define _assert_msg_(_t_, _a_, _fmt_, ...) \ +#define _assert_msg_(_t_, _a_, _fmt_, ...) \ if (!(_a_)) {\ if (!PanicYesNo(_fmt_, ##__VA_ARGS__)) {Crash();} \ } diff --git a/Source/Core/Common/LogManager.cpp b/Source/Core/Common/LogManager.cpp index 7651415474..45bcd53db4 100644 --- a/Source/Core/Common/LogManager.cpp +++ b/Source/Core/Common/LogManager.cpp @@ -28,52 +28,52 @@ LogManager *LogManager::m_logManager = NULL; LogManager::LogManager() { // create log files - m_Log[LogTypes::MASTER_LOG] = new LogContainer("*", "Master Log"); - m_Log[LogTypes::BOOT] = new LogContainer("BOOT", "Boot"); - m_Log[LogTypes::COMMON] = new LogContainer("COMMON", "Common"); - m_Log[LogTypes::DISCIO] = new LogContainer("DIO", "Disc IO"); - m_Log[LogTypes::FILEMON] = new LogContainer("FileMon", "File Monitor"); - m_Log[LogTypes::PAD] = new LogContainer("PAD", "Pad"); - m_Log[LogTypes::PIXELENGINE] = new LogContainer("PE", "PixelEngine"); - m_Log[LogTypes::COMMANDPROCESSOR] = new LogContainer("CP", "CommandProc"); - m_Log[LogTypes::VIDEOINTERFACE] = new LogContainer("VI", "VideoInt"); - m_Log[LogTypes::SERIALINTERFACE] = new LogContainer("SI", "SerialInt"); - m_Log[LogTypes::PROCESSORINTERFACE] = new LogContainer("PI", "ProcessorInt"); - m_Log[LogTypes::MEMMAP] = new LogContainer("MI", "MI & memmap"); - m_Log[LogTypes::SP1] = new LogContainer("SP1", "Serial Port 1"); - m_Log[LogTypes::STREAMINGINTERFACE] = new LogContainer("Stream", "StreamingInt"); - m_Log[LogTypes::DSPINTERFACE] = new LogContainer("DSP", "DSPInterface"); - m_Log[LogTypes::DVDINTERFACE] = new LogContainer("DVD", "DVDInterface"); - m_Log[LogTypes::GPFIFO] = new LogContainer("GP", "GPFifo"); - m_Log[LogTypes::EXPANSIONINTERFACE] = new LogContainer("EXI", "ExpansionInt"); - m_Log[LogTypes::GDB_STUB] = new LogContainer("GDB_STUB", "GDB Stub"); - m_Log[LogTypes::AUDIO_INTERFACE] = new LogContainer("AI", "AudioInt"); - m_Log[LogTypes::POWERPC] = new LogContainer("PowerPC", "IBM CPU"); - m_Log[LogTypes::OSHLE] = new LogContainer("HLE", "HLE"); - m_Log[LogTypes::DSPHLE] = new LogContainer("DSPHLE", "DSP HLE"); - m_Log[LogTypes::DSPLLE] = new LogContainer("DSPLLE", "DSP LLE"); - m_Log[LogTypes::DSP_MAIL] = new LogContainer("DSPMails", "DSP Mails"); - m_Log[LogTypes::VIDEO] = new LogContainer("Video", "Video Backend"); - m_Log[LogTypes::AUDIO] = new LogContainer("Audio", "Audio Emulator"); - m_Log[LogTypes::DYNA_REC] = new LogContainer("JIT", "Dynamic Recompiler"); - m_Log[LogTypes::CONSOLE] = new LogContainer("CONSOLE", "Dolphin Console"); - m_Log[LogTypes::OSREPORT] = new LogContainer("OSREPORT", "OSReport"); - m_Log[LogTypes::WIIMOTE] = new LogContainer("Wiimote", "Wiimote"); - m_Log[LogTypes::WII_IPC] = new LogContainer("WII_IPC", "WII IPC"); - m_Log[LogTypes::WII_IPC_HID] = new LogContainer("WII_IPC_HID", "WII IPC HID"); - m_Log[LogTypes::WII_IPC_HLE] = new LogContainer("WII_IPC_HLE", "WII IPC HLE"); - m_Log[LogTypes::WII_IPC_DVD] = new LogContainer("WII_IPC_DVD", "WII IPC DVD"); - m_Log[LogTypes::WII_IPC_ES] = new LogContainer("WII_IPC_ES", "WII IPC ES"); - m_Log[LogTypes::WII_IPC_FILEIO] = new LogContainer("WII_IPC_FILEIO","WII IPC FILEIO"); - m_Log[LogTypes::WII_IPC_SD] = new LogContainer("WII_IPC_SD", "WII IPC SD"); - m_Log[LogTypes::WII_IPC_STM] = new LogContainer("WII_IPC_STM", "WII IPC STM"); - m_Log[LogTypes::WII_IPC_NET] = new LogContainer("WII_IPC_NET", "WII IPC NET"); - m_Log[LogTypes::WII_IPC_WC24] = new LogContainer("WII_IPC_WC24", "WII IPC WC24"); - m_Log[LogTypes::WII_IPC_SSL] = new LogContainer("WII_IPC_SSL", "WII IPC SSL"); - m_Log[LogTypes::WII_IPC_WIIMOTE] = new LogContainer("WII_IPC_WIIMOTE","WII IPC WIIMOTE"); - m_Log[LogTypes::ACTIONREPLAY] = new LogContainer("ActionReplay", "ActionReplay"); - m_Log[LogTypes::MEMCARD_MANAGER] = new LogContainer("MemCard Manager", "MemCard Manager"); - m_Log[LogTypes::NETPLAY] = new LogContainer("NETPLAY", "Netplay"); + m_Log[LogTypes::MASTER_LOG] = new LogContainer("*", "Master Log"); + m_Log[LogTypes::BOOT] = new LogContainer("BOOT", "Boot"); + m_Log[LogTypes::COMMON] = new LogContainer("COMMON", "Common"); + m_Log[LogTypes::DISCIO] = new LogContainer("DIO", "Disc IO"); + m_Log[LogTypes::FILEMON] = new LogContainer("FileMon", "File Monitor"); + m_Log[LogTypes::PAD] = new LogContainer("PAD", "Pad"); + m_Log[LogTypes::PIXELENGINE] = new LogContainer("PE", "PixelEngine"); + m_Log[LogTypes::COMMANDPROCESSOR] = new LogContainer("CP", "CommandProc"); + m_Log[LogTypes::VIDEOINTERFACE] = new LogContainer("VI", "VideoInt"); + m_Log[LogTypes::SERIALINTERFACE] = new LogContainer("SI", "SerialInt"); + m_Log[LogTypes::PROCESSORINTERFACE] = new LogContainer("PI", "ProcessorInt"); + m_Log[LogTypes::MEMMAP] = new LogContainer("MI", "MI & memmap"); + m_Log[LogTypes::SP1] = new LogContainer("SP1", "Serial Port 1"); + m_Log[LogTypes::STREAMINGINTERFACE] = new LogContainer("Stream", "StreamingInt"); + m_Log[LogTypes::DSPINTERFACE] = new LogContainer("DSP", "DSPInterface"); + m_Log[LogTypes::DVDINTERFACE] = new LogContainer("DVD", "DVDInterface"); + m_Log[LogTypes::GPFIFO] = new LogContainer("GP", "GPFifo"); + m_Log[LogTypes::EXPANSIONINTERFACE] = new LogContainer("EXI", "ExpansionInt"); + m_Log[LogTypes::GDB_STUB] = new LogContainer("GDB_STUB", "GDB Stub"); + m_Log[LogTypes::AUDIO_INTERFACE] = new LogContainer("AI", "AudioInt"); + m_Log[LogTypes::POWERPC] = new LogContainer("PowerPC", "IBM CPU"); + m_Log[LogTypes::OSHLE] = new LogContainer("HLE", "HLE"); + m_Log[LogTypes::DSPHLE] = new LogContainer("DSPHLE", "DSP HLE"); + m_Log[LogTypes::DSPLLE] = new LogContainer("DSPLLE", "DSP LLE"); + m_Log[LogTypes::DSP_MAIL] = new LogContainer("DSPMails", "DSP Mails"); + m_Log[LogTypes::VIDEO] = new LogContainer("Video", "Video Backend"); + m_Log[LogTypes::AUDIO] = new LogContainer("Audio", "Audio Emulator"); + m_Log[LogTypes::DYNA_REC] = new LogContainer("JIT", "Dynamic Recompiler"); + m_Log[LogTypes::CONSOLE] = new LogContainer("CONSOLE", "Dolphin Console"); + m_Log[LogTypes::OSREPORT] = new LogContainer("OSREPORT", "OSReport"); + m_Log[LogTypes::WIIMOTE] = new LogContainer("Wiimote", "Wiimote"); + m_Log[LogTypes::WII_IPC] = new LogContainer("WII_IPC", "WII IPC"); + m_Log[LogTypes::WII_IPC_HID] = new LogContainer("WII_IPC_HID", "WII IPC HID"); + m_Log[LogTypes::WII_IPC_HLE] = new LogContainer("WII_IPC_HLE", "WII IPC HLE"); + m_Log[LogTypes::WII_IPC_DVD] = new LogContainer("WII_IPC_DVD", "WII IPC DVD"); + m_Log[LogTypes::WII_IPC_ES] = new LogContainer("WII_IPC_ES", "WII IPC ES"); + m_Log[LogTypes::WII_IPC_FILEIO] = new LogContainer("WII_IPC_FILEIO", "WII IPC FILEIO"); + m_Log[LogTypes::WII_IPC_SD] = new LogContainer("WII_IPC_SD", "WII IPC SD"); + m_Log[LogTypes::WII_IPC_STM] = new LogContainer("WII_IPC_STM", "WII IPC STM"); + m_Log[LogTypes::WII_IPC_NET] = new LogContainer("WII_IPC_NET", "WII IPC NET"); + m_Log[LogTypes::WII_IPC_WC24] = new LogContainer("WII_IPC_WC24", "WII IPC WC24"); + m_Log[LogTypes::WII_IPC_SSL] = new LogContainer("WII_IPC_SSL", "WII IPC SSL"); + m_Log[LogTypes::WII_IPC_WIIMOTE] = new LogContainer("WII_IPC_WIIMOTE", "WII IPC WIIMOTE"); + m_Log[LogTypes::ACTIONREPLAY] = new LogContainer("ActionReplay", "ActionReplay"); + m_Log[LogTypes::MEMCARD_MANAGER] = new LogContainer("MemCard Manager", "MemCard Manager"); + m_Log[LogTypes::NETPLAY] = new LogContainer("NETPLAY", "Netplay"); m_fileLog = new FileLogListener(File::GetUserPath(F_MAINLOG_IDX).c_str()); diff --git a/Source/Core/Common/LogManager.h b/Source/Core/Common/LogManager.h index 487fc6771a..36b197cc3e 100644 --- a/Source/Core/Common/LogManager.h +++ b/Source/Core/Common/LogManager.h @@ -60,9 +60,9 @@ public: bool IsEnabled() const { return m_enable; } void SetEnable(bool enable) { m_enable = enable; } - LogTypes::LOG_LEVELS GetLevel() const { return m_level; } + LogTypes::LOG_LEVELS GetLevel() const { return m_level; } - void SetLevel(LogTypes::LOG_LEVELS level) { m_level = level; } + void SetLevel(LogTypes::LOG_LEVELS level) { m_level = level; } bool HasListeners() const { return !m_listeners.empty(); } @@ -86,7 +86,7 @@ private: ~LogManager(); public: - static u32 GetMaxLevel() { return MAX_LOGLEVEL; } + static u32 GetMaxLevel() { return MAX_LOGLEVEL; } void Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char *file, int line, const char *fmt, va_list args); diff --git a/Source/Core/Common/MemoryUtil.cpp b/Source/Core/Common/MemoryUtil.cpp index ce1c5d8a54..242fdbcb81 100644 --- a/Source/Core/Common/MemoryUtil.cpp +++ b/Source/Core/Common/MemoryUtil.cpp @@ -58,7 +58,7 @@ void* AllocateExecutableMemory(size_t size, bool low) #else
if (ptr == NULL)
{
-#endif
+#endif
PanicAlert("Failed to allocate executable memory");
}
#if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT)
diff --git a/Source/Core/Common/StdConditionVariable.h b/Source/Core/Common/StdConditionVariable.h index d9f17ec718..68e1f187dc 100644 --- a/Source/Core/Common/StdConditionVariable.h +++ b/Source/Core/Common/StdConditionVariable.h @@ -4,7 +4,7 @@ #pragma once -#define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z)) +#define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z)) #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) #ifndef __has_include diff --git a/Source/Core/Common/StdMutex.h b/Source/Core/Common/StdMutex.h index 509e1d2566..365aa7f3b4 100644 --- a/Source/Core/Common/StdMutex.h +++ b/Source/Core/Common/StdMutex.h @@ -4,7 +4,7 @@ #pragma once -#define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z)) +#define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z)) #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) #ifndef __has_include @@ -194,7 +194,7 @@ private: }; #else -typedef recursive_mutex mutex; // just use CriticalSections +typedef recursive_mutex mutex; // just use CriticalSections #endif @@ -346,11 +346,6 @@ public: return owns; } - //explicit operator bool () const - //{ - // return owns_lock(); - //} - mutex_type* mutex() const { return pm; diff --git a/Source/Core/Common/StdThread.h b/Source/Core/Common/StdThread.h index ca7d6917e1..7f02eebd5e 100644 --- a/Source/Core/Common/StdThread.h +++ b/Source/Core/Common/StdThread.h @@ -4,7 +4,7 @@ #pragma once -#define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z)) +#define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z)) #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) #ifndef __has_include @@ -311,9 +311,9 @@ inline thread::id get_id() #endif } -} // namespace this_thread +} // namespace this_thread -} // namespace std +} // namespace std #undef USE_RVALUE_REFERENCES #undef USE_BEGINTHREADEX diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index 7ad4ac6ca5..7d8825231e 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -520,11 +520,7 @@ std::string SHIFTJISToUTF8(const std::string& input) std::string UTF16ToUTF8(const std::wstring& input) { - std::string result = - // CodeToUTF8("UCS-2", input); - // CodeToUTF8("UCS-2LE", input); - // CodeToUTF8("UTF-16", input); - CodeToUTF8("UTF-16LE", input); + std::string result = CodeToUTF8("UTF-16LE", input); // TODO: why is this needed? result.erase(std::remove(result.begin(), result.end(), 0x00), result.end()); diff --git a/Source/Core/Common/Thread.h b/Source/Core/Common/Thread.h index 5f3af35da5..4eda7ae9ec 100644 --- a/Source/Core/Common/Thread.h +++ b/Source/Core/Common/Thread.h @@ -108,7 +108,7 @@ private: }; void SleepCurrentThread(int ms); -void SwitchCurrentThread(); // On Linux, this is equal to sleep 1ms +void SwitchCurrentThread(); // On Linux, this is equal to sleep 1ms // Use this function during a spin-wait to make the current thread // relax while another thread is working. This may be more efficient diff --git a/Source/Core/Common/Timer.cpp b/Source/Core/Common/Timer.cpp index a2e08bbf1d..8faf502c90 100644 --- a/Source/Core/Common/Timer.cpp +++ b/Source/Core/Common/Timer.cpp @@ -157,7 +157,7 @@ u64 Timer::GetLocalTimeSinceJan1970() tzDST = 0; // Lazy way to get local time in sec - gmTime = gmtime(&sysTime); + gmTime = gmtime(&sysTime); tzDiff = sysTime - mktime(gmTime); return (u64)(sysTime + tzDiff + tzDST); diff --git a/Source/Core/Common/stdafx.h b/Source/Core/Common/stdafx.h index de740c3c89..8b1c934c4f 100644 --- a/Source/Core/Common/stdafx.h +++ b/Source/Core/Common/stdafx.h @@ -13,7 +13,7 @@ #endif */ -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers /* #define _CRT_SECURE_NO_DEPRECATE 1 #define _CRT_NONSTDC_NO_DEPRECATE 1 diff --git a/Source/Core/Common/x64Emitter.h b/Source/Core/Common/x64Emitter.h index bdf82442b4..b3ec34bf0c 100644 --- a/Source/Core/Common/x64Emitter.h +++ b/Source/Core/Common/x64Emitter.h @@ -161,8 +161,8 @@ private: u16 indexReg; }; -inline OpArg M(void *ptr) {return OpArg((u64)ptr, (int)SCALE_RIP);} -inline OpArg R(X64Reg value) {return OpArg(0, SCALE_NONE, value);} +inline OpArg M(void *ptr) {return OpArg((u64)ptr, (int)SCALE_RIP);} +inline OpArg R(X64Reg value) {return OpArg(0, SCALE_NONE, value);} inline OpArg MatR(X64Reg value) {return OpArg(0, SCALE_ATREG, value);} inline OpArg MDisp(X64Reg value, int offset) { return OpArg((u32)offset, SCALE_ATREG, value); diff --git a/Source/Core/Core/ARDecrypt.cpp b/Source/Core/Core/ARDecrypt.cpp index db3134acb0..37e50bb75e 100644 --- a/Source/Core/Core/ARDecrypt.cpp +++ b/Source/Core/Core/ARDecrypt.cpp @@ -370,11 +370,11 @@ bool batchdecrypt(u32 *codes, u16 size) tmparray[1] = 0; tmparray[2] = 4; // Skip crc tmparray[3] = size; - getbitstring(tmparray,tmparray2+1,11); // Game id - getbitstring(tmparray,tmparray2+2,17); // Code id - getbitstring(tmparray,tmparray2+3,1); // Master code - getbitstring(tmparray,tmparray2+4,1); // Unknown - getbitstring(tmparray,tmparray2+5,2); // Region + getbitstring(tmparray,tmparray2+1,11); // Game id + getbitstring(tmparray,tmparray2+2,17); // Code id + getbitstring(tmparray,tmparray2+3,1); // Master code + getbitstring(tmparray,tmparray2+4,1); // Unknown + getbitstring(tmparray,tmparray2+5,2); // Region // Grab gameid and region from the last decrypted code // Maybe check this against dolphin's GameID? - "code is for wrong game" type msg @@ -473,7 +473,7 @@ void DecryptARCode(std::vector<std::string> vCodes, std::vector<AREntry> &ops) { // Commented out since we just send the code anyways and hope for the best XD //PanicAlert("Action Replay Code Decryption Error:\nCRC Check Failed\n\n" - // "First Code in Block(should be verification code):\n%s", vCodes[0].c_str()); + // "First Code in Block(should be verification code):\n%s", vCodes[0].c_str()); for (i = 0; i < (vCodes.size()<<1); i+=2) { diff --git a/Source/Core/Core/ActionReplay.cpp b/Source/Core/Core/ActionReplay.cpp index db201ba081..6da6f66884 100644 --- a/Source/Core/Core/ActionReplay.cpp +++ b/Source/Core/Core/ActionReplay.cpp @@ -195,7 +195,7 @@ void LoadCodes(const IniFile& globalIni, const IniFile& localIni, bool forceLoad { // Encrypted AR code // Decryption is done in "blocks", so we must push blocks into a vector, - // then send to decrypt when a new block is encountered, or if it's the last block. + // then send to decrypt when a new block is encountered, or if it's the last block. encryptedLines.push_back(pieces[0]+pieces[1]+pieces[2]); } } @@ -293,7 +293,7 @@ bool RunCode(const ARCode &arcode) // after a conditional code, skip lines if needed if (skip_count) { - if (skip_count > 0) // skip x lines + if (skip_count > 0) // skip x lines { LogInfo("Line skipped"); --skip_count; @@ -302,13 +302,13 @@ bool RunCode(const ARCode &arcode) { // skip all lines LogInfo("All Lines skipped"); - return true; // don't need to iterate through the rest of the ops + return true; // don't need to iterate through the rest of the ops } else if (-CONDTIONAL_ALL_LINES_UNTIL == skip_count) { // skip until a "00000000 40000000" line is reached LogInfo("Line skipped"); - if (0 == addr && 0x40000000 == data) // check for an endif line + if (addr == 0 && 0x40000000 == data) // check for an endif line skip_count = 0; } @@ -642,7 +642,7 @@ bool Subtype_AddCode(const ARAddr addr, const u32 data) LogInfo("--------"); const u32 read = Memory::Read_U32(new_addr); - const float fread = *((float*)&read) + (float)data; // data contains an integer value + const float fread = *((float*)&read) + (float)data; // data contains an integer value const u32 newval = *((u32*)&fread); Memory::Write_U32(newval, new_addr); LogInfo("Old Value %08x", read); @@ -928,7 +928,7 @@ bool CompareValues(const u32 val1, const u32 val2, const int type) case CONDTIONAL_AND: LogInfo("Type 7: If And"); - return !!(val1 & val2); // bitwise AND + return !!(val1 & val2); // bitwise AND break; default: LogInfo("Unknown Compare type"); diff --git a/Source/Core/Core/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Boot/Boot_BS2Emu.cpp index f484b54a7e..1059bf7c4f 100644 --- a/Source/Core/Core/Boot/Boot_BS2Emu.cpp +++ b/Source/Core/Core/Boot/Boot_BS2Emu.cpp @@ -49,37 +49,37 @@ bool CBoot::EmulatedBS2_GC() // Write necessary values // Here we write values to memory that the apploader does not take care of. Game info goes - // to 0x80000000 according to yagcd 4.2. + // to 0x80000000 according to YAGCD 4.2. DVDInterface::DVDRead(0x00000000, 0x80000000, 0x20); // write disc info - Memory::Write_U32(0x0D15EA5E, 0x80000020); // booted from bootrom. 0xE5207C22 = booted from jtag - Memory::Write_U32(Memory::REALRAM_SIZE, 0x80000028); // Physical Memory Size (24MB on retail) - // TODO determine why some games fail when using a retail id. (Seem to take different EXI paths, see ikaruga for example) - Memory::Write_U32(0x10000006, 0x8000002C); // Console type - DevKit (retail ID == 0x00000003) see yagcd 4.2.1.1.2 + Memory::Write_U32(0x0D15EA5E, 0x80000020); // Booted from bootrom. 0xE5207C22 = booted from jtag + Memory::Write_U32(Memory::REALRAM_SIZE, 0x80000028); // Physical Memory Size (24MB on retail) + // TODO determine why some games fail when using a retail ID. (Seem to take different EXI paths, see Ikaruga for example) + Memory::Write_U32(0x10000006, 0x8000002C); // Console type - DevKit (retail ID == 0x00000003) see YAGCD 4.2.1.1.2 Memory::Write_U32(SConfig::GetInstance().m_LocalCoreStartupParameter.bNTSC - ? 0 : 1, 0x800000CC); // fake the VI Init of the IPL (yagcd 4.2.1.4) + ? 0 : 1, 0x800000CC); // Fake the VI Init of the IPL (YAGCD 4.2.1.4) - Memory::Write_U32(0x01000000, 0x800000d0); // ARAM Size. 16MB main + 4/16/32MB external (retail consoles have no external ARAM) + Memory::Write_U32(0x01000000, 0x800000d0); // ARAM Size. 16MB main + 4/16/32MB external (retail consoles have no external ARAM) - Memory::Write_U32(0x09a7ec80, 0x800000F8); // Bus Clock Speed - Memory::Write_U32(0x1cf7c580, 0x800000FC); // CPU Clock Speed + Memory::Write_U32(0x09a7ec80, 0x800000F8); // Bus Clock Speed + Memory::Write_U32(0x1cf7c580, 0x800000FC); // CPU Clock Speed - Memory::Write_U32(0x4c000064, 0x80000300); // write default DFI Handler: rfi - Memory::Write_U32(0x4c000064, 0x80000800); // write default FPU Handler: rfi - Memory::Write_U32(0x4c000064, 0x80000C00); // write default Syscall Handler: rfi + Memory::Write_U32(0x4c000064, 0x80000300); // Write default DFI Handler: rfi + Memory::Write_U32(0x4c000064, 0x80000800); // Write default FPU Handler: rfi + Memory::Write_U32(0x4c000064, 0x80000C00); // Write default Syscall Handler: rfi - Memory::Write_U64((u64)CEXIIPL::GetGCTime() * (u64)40500000, 0x800030D8); // preset time base ticks + Memory::Write_U64((u64)CEXIIPL::GetGCTime() * (u64)40500000, 0x800030D8); // Preset time base ticks // HIO checks this - //Memory::Write_U16(0x8200, 0x000030e6); // Console type + //Memory::Write_U16(0x8200, 0x000030e6); // Console type HLE::Patch(0x81300000, "OSReport"); // HLE OSReport for Apploader // Load Apploader to Memory - The apploader is hardcoded to begin at 0x2440 on the disc, - // but the size can differ between discs. Compare with yagcd chap 13. + // but the size can differ between discs. Compare with YAGCD chap 13. u32 iAppLoaderOffset = 0x2440; - u32 iAppLoaderEntry = VolumeHandler::Read32(iAppLoaderOffset + 0x10); - u32 iAppLoaderSize = VolumeHandler::Read32(iAppLoaderOffset + 0x14) + VolumeHandler::Read32(iAppLoaderOffset + 0x18); + u32 iAppLoaderEntry = VolumeHandler::Read32(iAppLoaderOffset + 0x10); + u32 iAppLoaderSize = VolumeHandler::Read32(iAppLoaderOffset + 0x14) + VolumeHandler::Read32(iAppLoaderOffset + 0x18); if ((iAppLoaderEntry == (u32)-1) || (iAppLoaderSize == (u32)-1)) { INFO_LOG(BOOT, "GC BS2: Not running apploader!"); @@ -90,9 +90,9 @@ bool CBoot::EmulatedBS2_GC() // Setup pointers like real BS2 does if (SConfig::GetInstance().m_LocalCoreStartupParameter.bNTSC) { - PowerPC::ppcState.gpr[1] = 0x81566550; // StackPointer, used to be set to 0x816ffff0 - PowerPC::ppcState.gpr[2] = 0x81465cc0; // global pointer to Small Data Area 2 Base (haven't seen anything use it...meh) - PowerPC::ppcState.gpr[13] = 0x81465320; // global pointer to Small Data Area Base (Luigi's Mansion's apploader uses it) + PowerPC::ppcState.gpr[1] = 0x81566550; // StackPointer, used to be set to 0x816ffff0 + PowerPC::ppcState.gpr[2] = 0x81465cc0; // Global pointer to Small Data Area 2 Base (haven't seen anything use it...meh) + PowerPC::ppcState.gpr[13] = 0x81465320; // Global pointer to Small Data Area Base (Luigi's Mansion's apploader uses it) } else { @@ -131,9 +131,9 @@ bool CBoot::EmulatedBS2_GC() RunFunction(iAppLoaderMain); - u32 iRamAddress = Memory::ReadUnchecked_U32(0x81300004); - u32 iLength = Memory::ReadUnchecked_U32(0x81300008); - u32 iDVDOffset = Memory::ReadUnchecked_U32(0x8130000c); + u32 iRamAddress = Memory::ReadUnchecked_U32(0x81300004); + u32 iLength = Memory::ReadUnchecked_U32(0x81300008); + u32 iDVDOffset = Memory::ReadUnchecked_U32(0x8130000c); INFO_LOG(MASTER_LOG, "DVDRead: offset: %08x memOffset: %08x length: %i", iDVDOffset, iRamAddress, iLength); DVDInterface::DVDRead(iDVDOffset, iRamAddress, iLength); @@ -232,55 +232,55 @@ bool CBoot::SetupWiiMemory(IVolume::ECountry country) Wiibrew. These values are needed for the games to function correctly. A few values in this region will also be placed here by the game as it boots. They are: - 0x80000038 Start of FST - 0x8000003c Size of FST Size - 0x80000060 Copyright code + 0x80000038 Start of FST + 0x8000003c Size of FST Size + 0x80000060 Copyright code */ DVDInterface::DVDRead(0x00000000, 0x00000000, 0x20); // Game Code - Memory::Write_U32(0x0D15EA5E, 0x00000020); // Another magic word - Memory::Write_U32(0x00000001, 0x00000024); // Unknown - Memory::Write_U32(Memory::REALRAM_SIZE, 0x00000028); // MEM1 size 24MB - Memory::Write_U32(0x00000023, 0x0000002c); // Production Board Model - Memory::Write_U32(0x00000000, 0x00000030); // Init - Memory::Write_U32(0x817FEC60, 0x00000034); // Init + Memory::Write_U32(0x0D15EA5E, 0x00000020); // Another magic word + Memory::Write_U32(0x00000001, 0x00000024); // Unknown + Memory::Write_U32(Memory::REALRAM_SIZE, 0x00000028); // MEM1 size 24MB + Memory::Write_U32(0x00000023, 0x0000002c); // Production Board Model + Memory::Write_U32(0x00000000, 0x00000030); // Init + Memory::Write_U32(0x817FEC60, 0x00000034); // Init // 38, 3C should get start, size of FST through apploader - Memory::Write_U32(0x38a00040, 0x00000060); // Exception init - Memory::Write_U32(0x8008f7b8, 0x000000e4); // Thread Init - Memory::Write_U32(Memory::REALRAM_SIZE, 0x000000f0); // "Simulated memory size" (debug mode?) - Memory::Write_U32(0x8179b500, 0x000000f4); // __start - Memory::Write_U32(0x0e7be2c0, 0x000000f8); // Bus speed - Memory::Write_U32(0x2B73A840, 0x000000fc); // CPU speed - Memory::Write_U16(0x0000, 0x000030e6); // Console type - Memory::Write_U32(0x00000000, 0x000030c0); // EXI - Memory::Write_U32(0x00000000, 0x000030c4); // EXI - Memory::Write_U32(0x00000000, 0x000030dc); // Time - Memory::Write_U32(0x00000000, 0x000030d8); // Time - Memory::Write_U16(0x8201, 0x000030e6); // Dev console / debug capable - Memory::Write_U32(0x00000000, 0x000030f0); // Apploader - Memory::Write_U32(0x01800000, 0x00003100); // BAT - Memory::Write_U32(0x01800000, 0x00003104); // BAT - Memory::Write_U32(0x00000000, 0x0000310c); // Init - Memory::Write_U32(0x8179d500, 0x00003110); // Init - Memory::Write_U32(0x04000000, 0x00003118); // Unknown - Memory::Write_U32(0x04000000, 0x0000311c); // BAT - Memory::Write_U32(0x93400000, 0x00003120); // BAT - Memory::Write_U32(0x90000800, 0x00003124); // Init - MEM2 low - Memory::Write_U32(0x93ae0000, 0x00003128); // Init - MEM2 high - Memory::Write_U32(0x93ae0000, 0x00003130); // IOS MEM2 low - Memory::Write_U32(0x93b00000, 0x00003134); // IOS MEM2 high - Memory::Write_U32(0x00000012, 0x00003138); // Console type + Memory::Write_U32(0x38a00040, 0x00000060); // Exception init + Memory::Write_U32(0x8008f7b8, 0x000000e4); // Thread Init + Memory::Write_U32(Memory::REALRAM_SIZE, 0x000000f0); // "Simulated memory size" (debug mode?) + Memory::Write_U32(0x8179b500, 0x000000f4); // __start + Memory::Write_U32(0x0e7be2c0, 0x000000f8); // Bus speed + Memory::Write_U32(0x2B73A840, 0x000000fc); // CPU speed + Memory::Write_U16(0x0000, 0x000030e6); // Console type + Memory::Write_U32(0x00000000, 0x000030c0); // EXI + Memory::Write_U32(0x00000000, 0x000030c4); // EXI + Memory::Write_U32(0x00000000, 0x000030dc); // Time + Memory::Write_U32(0x00000000, 0x000030d8); // Time + Memory::Write_U16(0x8201, 0x000030e6); // Dev console / debug capable + Memory::Write_U32(0x00000000, 0x000030f0); // Apploader + Memory::Write_U32(0x01800000, 0x00003100); // BAT + Memory::Write_U32(0x01800000, 0x00003104); // BAT + Memory::Write_U32(0x00000000, 0x0000310c); // Init + Memory::Write_U32(0x8179d500, 0x00003110); // Init + Memory::Write_U32(0x04000000, 0x00003118); // Unknown + Memory::Write_U32(0x04000000, 0x0000311c); // BAT + Memory::Write_U32(0x93400000, 0x00003120); // BAT + Memory::Write_U32(0x90000800, 0x00003124); // Init - MEM2 low + Memory::Write_U32(0x93ae0000, 0x00003128); // Init - MEM2 high + Memory::Write_U32(0x93ae0000, 0x00003130); // IOS MEM2 low + Memory::Write_U32(0x93b00000, 0x00003134); // IOS MEM2 high + Memory::Write_U32(0x00000012, 0x00003138); // Console type // 40 is copied from 88 after running apploader - Memory::Write_U32(0x00090204, 0x00003140); // IOS revision (IOS9, v2.4) - Memory::Write_U32(0x00062507, 0x00003144); // IOS date in USA format (June 25, 2007) - Memory::Write_U16(0x0113, 0x0000315e); // Apploader - Memory::Write_U32(0x0000FF16, 0x00003158); // DDR ram vendor code - Memory::Write_U32(0x00000000, 0x00003160); // Init semaphore (sysmenu waits for this to clear) - Memory::Write_U32(0x00090204, 0x00003188); // Expected IOS revision + Memory::Write_U32(0x00090204, 0x00003140); // IOS revision (IOS9, v2.4) + Memory::Write_U32(0x00062507, 0x00003144); // IOS date in USA format (June 25, 2007) + Memory::Write_U16(0x0113, 0x0000315e); // Apploader + Memory::Write_U32(0x0000FF16, 0x00003158); // DDR ram vendor code + Memory::Write_U32(0x00000000, 0x00003160); // Init semaphore (sysmenu waits for this to clear) + Memory::Write_U32(0x00090204, 0x00003188); // Expected IOS revision - Memory::Write_U8(0x80, 0x0000315c); // OSInit - Memory::Write_U16(0x0000, 0x000030e0); // PADInit - Memory::Write_U32(0x80000000, 0x00003184); // GameID Address + Memory::Write_U8(0x80, 0x0000315c); // OSInit + Memory::Write_U16(0x0000, 0x000030e0); // PADInit + Memory::Write_U32(0x80000000, 0x00003184); // GameID Address // Fake the VI Init of the IPL Memory::Write_U32(SConfig::GetInstance().m_LocalCoreStartupParameter.bNTSC ? 0 : 1, 0x000000CC); @@ -321,13 +321,13 @@ bool CBoot::EmulatedBS2_Wii() UReg_MSR& m_MSR = ((UReg_MSR&)PowerPC::ppcState.msr); m_MSR.FP = 1; - Memory::Write_U32(0x4c000064, 0x80000300); // write default DFI Handler: rfi - Memory::Write_U32(0x4c000064, 0x80000800); // write default FPU Handler: rfi - Memory::Write_U32(0x4c000064, 0x80000C00); // write default Syscall Handler: rfi + Memory::Write_U32(0x4c000064, 0x80000300); // Write default DFI Handler: rfi + Memory::Write_U32(0x4c000064, 0x80000800); // Write default FPU Handler: rfi + Memory::Write_U32(0x4c000064, 0x80000C00); // Write default Syscall Handler: rfi - HLE::Patch(0x81300000, "OSReport"); // HLE OSReport for Apploader + HLE::Patch(0x81300000, "OSReport"); // HLE OSReport for Apploader - PowerPC::ppcState.gpr[1] = 0x816ffff0; // StackPointer + PowerPC::ppcState.gpr[1] = 0x816ffff0; // StackPointer u32 iAppLoaderOffset = 0x2440; // 0x1c40; @@ -372,9 +372,9 @@ bool CBoot::EmulatedBS2_Wii() RunFunction(iAppLoaderMain); - u32 iRamAddress = Memory::ReadUnchecked_U32(0x81300004); - u32 iLength = Memory::ReadUnchecked_U32(0x81300008); - u32 iDVDOffset = Memory::ReadUnchecked_U32(0x8130000c) << 2; + u32 iRamAddress = Memory::ReadUnchecked_U32(0x81300004); + u32 iLength = Memory::ReadUnchecked_U32(0x81300008); + u32 iDVDOffset = Memory::ReadUnchecked_U32(0x8130000c) << 2; INFO_LOG(BOOT, "DVDRead: offset: %08x memOffset: %08x length: %i", iDVDOffset, iRamAddress, iLength); DVDInterface::DVDRead(iDVDOffset, iRamAddress, iLength); diff --git a/Source/Core/Core/Boot/ElfReader.h b/Source/Core/Core/Boot/ElfReader.h index 0d2890e1f1..7cf2fef997 100644 --- a/Source/Core/Core/Boot/ElfReader.h +++ b/Source/Core/Core/Boot/ElfReader.h @@ -66,7 +66,7 @@ public: return GetPtr(segments[segment].p_offset); } u32 GetSectionAddr(SectionID section) const { return sectionAddrs[section]; } - int GetSectionSize(SectionID section) const { return sections[section].sh_size; } + int GetSectionSize(SectionID section) const { return sections[section].sh_size; } SectionID GetSectionByName(const char *name, int firstSection = 0) const; //-1 for not found bool DidRelocate() { diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index 716c9f4d8e..c097c9e673 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -259,7 +259,7 @@ void Stop() // - Hammertime! INFO_LOG(CONSOLE, "%s", StopMessage(true, "Stopping Emu thread ...").c_str()); - g_EmuThread.join(); // Wait for emuthread to close. + g_EmuThread.join(); // Wait for emuthread to close. INFO_LOG(CONSOLE, "%s", StopMessage(true, "Main Emu thread stopped").c_str()); @@ -678,7 +678,7 @@ void UpdateTitle() float Speed = (float) (DrawnVideo * (100 * 1000.0) / (VideoInterface::TargetRefreshRate * ElapseTime)); // Settings are shown the same for both extended and summary info - std::string SSettings = StringFromFormat("%s %s | %s | %s", cpu_core_base->GetName(), _CoreParameter.bCPUThread ? "DC" : "SC", + std::string SSettings = StringFromFormat("%s %s | %s | %s", cpu_core_base->GetName(), _CoreParameter.bCPUThread ? "DC" : "SC", g_video_backend->GetDisplayName().c_str(), _CoreParameter.bDSPHLE ? "HLE" : "LLE"); // Use extended or summary information. The summary information does not print the ticks data, @@ -708,7 +708,7 @@ void UpdateTitle() _CoreParameter.bSkipIdle ? "~" : "", TicksPercentage); - #else // Summary information + #else // Summary information std::string SFPS; if (Movie::IsPlayingInput()) SFPS = StringFromFormat("VI: %u/%u - Frame: %u/%u - FPS: %.0f - VPS: %.0f - %.0f%%", (u32)Movie::g_currentFrame, (u32)Movie::g_totalFrames, (u32)Movie::g_currentInputCount, (u32)Movie::g_totalInputCount, FPS, VPS, Speed); diff --git a/Source/Core/Core/CoreParameter.cpp b/Source/Core/Core/CoreParameter.cpp index 6bfaedba45..8aee3eb5c8 100644 --- a/Source/Core/Core/CoreParameter.cpp +++ b/Source/Core/Core/CoreParameter.cpp @@ -97,7 +97,7 @@ void SCoreStartupParameter::LoadDefaults() bJITOff = false; // debugger only settings bJITLoadStoreOff = false; bJITLoadStoreFloatingOff = false; - bJITLoadStorePairedOff = false; // XXX not 64-bit clean + bJITLoadStorePairedOff = false; // XXX not 64-bit clean bJITFloatingPointOff = false; bJITIntegerOff = false; bJITPairedOff = false; @@ -271,7 +271,8 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2) delete pVolume; } else - { // null pVolume means that we are loading from nand folder (Most Likely Wii Menu) + { + // null pVolume means that we are loading from nand folder (Most Likely Wii Menu) // if this is the second boot we would be using the Name and id of the last title m_strName.clear(); m_strUniqueID.clear(); diff --git a/Source/Core/Core/CoreTiming.cpp b/Source/Core/Core/CoreTiming.cpp index ceda4a668b..9b4e87747f 100644 --- a/Source/Core/Core/CoreTiming.cpp +++ b/Source/Core/Core/CoreTiming.cpp @@ -395,8 +395,8 @@ void Advance() { if (first->time <= globalTimer) { -// LOG(POWERPC, "[Scheduler] %s (%lld, %lld) ", -// event_types[first->type].name ? event_types[first->type].name : "?", (u64)globalTimer, (u64)first->time); + //LOG(POWERPC, "[Scheduler] %s (%lld, %lld) ", + // event_types[first->type].name ? event_types[first->type].name : "?", (u64)globalTimer, (u64)first->time); Event* evt = first; first = first->next; event_types[evt->type].callback(evt->userdata, (int)(globalTimer - evt->time)); diff --git a/Source/Core/Core/DSP/DSPCodeUtil.cpp b/Source/Core/Core/DSP/DSPCodeUtil.cpp index 53e47b71cc..f2f4e5b79d 100644 --- a/Source/Core/Core/DSP/DSPCodeUtil.cpp +++ b/Source/Core/Core/DSP/DSPCodeUtil.cpp @@ -16,12 +16,12 @@ bool Assemble(const char *text, std::vector<u16> &code, bool force) { AssemblerSettings settings; - // settings.pc = 0; + // settings.pc = 0; // settings.decode_registers = false; // settings.decode_names = false; settings.force = force; - // settings.print_tabs = false; - // settings.ext_separator = '\''; + // settings.print_tabs = false; + // settings.ext_separator = '\''; // TODO: fix the terrible api of the assembler. DSPAssembler assembler(settings); diff --git a/Source/Core/Core/DSP/DSPCore.cpp b/Source/Core/Core/DSP/DSPCore.cpp index caaff46be5..1796a1bf56 100644 --- a/Source/Core/Core/DSP/DSPCore.cpp +++ b/Source/Core/Core/DSP/DSPCore.cpp @@ -3,7 +3,7 @@ filename: gdsp_interpreter.cpp project: GCemu created: 2004-6-18 - mail: duddie@walla.com + mail: duddie@walla.com Copyright (c) 2005 Duddie & Tratax diff --git a/Source/Core/Core/DSP/DSPCore.h b/Source/Core/Core/DSP/DSPCore.h index 39618d832a..8411a07e72 100644 --- a/Source/Core/Core/DSP/DSPCore.h +++ b/Source/Core/Core/DSP/DSPCore.h @@ -3,7 +3,7 @@ filename: DSPCore.h project: GCemu created: 2004-6-18 - mail: duddie@walla.com + mail: duddie@walla.com Copyright (c) 2005 Duddie & Tratax @@ -168,7 +168,7 @@ #define SR_MUL_UNSIGNED 0x8000 // 0 = normal. 1 = unsigned (CLR15, SET15) If set, treats ax?.l as unsigned (MULX family only). // This should be the bits affected by CMP. Does not include logic zero. -#define SR_CMP_MASK 0x3f +#define SR_CMP_MASK 0x3f // exceptions vector #define EXP_STOVF 1 // 0x0002 stack under/over flow diff --git a/Source/Core/Core/DSP/DSPHWInterface.cpp b/Source/Core/Core/DSP/DSPHWInterface.cpp index a8ecd3ad2d..5eceeb257e 100644 --- a/Source/Core/Core/DSP/DSPHWInterface.cpp +++ b/Source/Core/Core/DSP/DSPHWInterface.cpp @@ -3,7 +3,7 @@ filename: gdsp_interface.h project: GCemu created: 2004-6-18 - mail: duddie@walla.com + mail: duddie@walla.com Copyright (c) 2005 Duddie & Tratax diff --git a/Source/Core/Core/DSP/DSPHWInterface.h b/Source/Core/Core/DSP/DSPHWInterface.h index b1d226d94c..3d16b0d9a6 100644 --- a/Source/Core/Core/DSP/DSPHWInterface.h +++ b/Source/Core/Core/DSP/DSPHWInterface.h @@ -3,7 +3,7 @@ filename: gdsp_interface.h project: GCemu created: 2004-6-18 - mail: duddie@walla.com + mail: duddie@walla.com Copyright (c) 2005 Duddie & Tratax diff --git a/Source/Core/Core/DSP/DSPIntExtOps.h b/Source/Core/Core/DSP/DSPIntExtOps.h index bcd554e6ba..353a39ac84 100644 --- a/Source/Core/Core/DSP/DSPIntExtOps.h +++ b/Source/Core/Core/DSP/DSPIntExtOps.h @@ -3,7 +3,7 @@ filename: opcodes.h project: GameCube DSP Tool (gcdsp) created: 2005.03.04 - mail: duddie@walla.com + mail: duddie@walla.com Copyright (c) 2005 Duddie diff --git a/Source/Core/Core/DSP/DSPIntUtil.h b/Source/Core/Core/DSP/DSPIntUtil.h index f1e228da38..b8c78184ea 100644 --- a/Source/Core/Core/DSP/DSPIntUtil.h +++ b/Source/Core/Core/DSP/DSPIntUtil.h @@ -3,7 +3,7 @@ filename: gdsp_opcodes_helper.h project: GameCube DSP Tool (gcdsp) created: 2005.03.04 - mail: duddie@walla.com + mail: duddie@walla.com Copyright (c) 2005 Duddie diff --git a/Source/Core/Core/DSP/DSPInterpreter.cpp b/Source/Core/Core/DSP/DSPInterpreter.cpp index 19edffd785..9b33cb6b33 100644 --- a/Source/Core/Core/DSP/DSPInterpreter.cpp +++ b/Source/Core/Core/DSP/DSPInterpreter.cpp @@ -3,7 +3,7 @@ filename: gdsp_interpreter.cpp project: GCemu created: 2004-6-18 - mail: duddie@walla.com + mail: duddie@walla.com Copyright (c) 2005 Duddie & Tratax diff --git a/Source/Core/Core/DSP/DSPMemoryMap.cpp b/Source/Core/Core/DSP/DSPMemoryMap.cpp index 542823257a..9bd5b19acc 100644 --- a/Source/Core/Core/DSP/DSPMemoryMap.cpp +++ b/Source/Core/Core/DSP/DSPMemoryMap.cpp @@ -3,7 +3,7 @@ filename: gdsp_memory.cpp project: GCemu created: 2004-6-18 - mail: duddie@walla.com + mail: duddie@walla.com Copyright (c) 2005 Duddie & Tratax diff --git a/Source/Core/Core/DSP/DSPMemoryMap.h b/Source/Core/Core/DSP/DSPMemoryMap.h index 55de7f1734..7f7296b1a8 100644 --- a/Source/Core/Core/DSP/DSPMemoryMap.h +++ b/Source/Core/Core/DSP/DSPMemoryMap.h @@ -3,7 +3,7 @@ filename: gdsp_memory.h project: GCemu created: 2004-6-18 - mail: duddie@walla.com + mail: duddie@walla.com Copyright (c) 2005 Duddie & Tratax diff --git a/Source/Core/Core/DSP/DSPStacks.cpp b/Source/Core/Core/DSP/DSPStacks.cpp index d1e70a616a..0bdff3be50 100644 --- a/Source/Core/Core/DSP/DSPStacks.cpp +++ b/Source/Core/Core/DSP/DSPStacks.cpp @@ -3,7 +3,7 @@ filename: gdsp_registers.cpp project: GCemu created: 2004-6-18 - mail: duddie@walla.com + mail: duddie@walla.com Copyright (c) 2005 Duddie & Tratax diff --git a/Source/Core/Core/DSP/DSPStacks.h b/Source/Core/Core/DSP/DSPStacks.h index 6bb621d085..2ffcd08077 100644 --- a/Source/Core/Core/DSP/DSPStacks.h +++ b/Source/Core/Core/DSP/DSPStacks.h @@ -3,7 +3,7 @@ filename: gdsp_registers.h project: GCemu created: 2004-6-18 - mail: duddie@walla.com + mail: duddie@walla.com Copyright (c) 2005 Duddie & Tratax diff --git a/Source/Core/Core/DSP/DSPTables.h b/Source/Core/Core/DSP/DSPTables.h index 66f29f9fef..80a479a2ef 100644 --- a/Source/Core/Core/DSP/DSPTables.h +++ b/Source/Core/Core/DSP/DSPTables.h @@ -35,7 +35,7 @@ enum partype_t P_REGM19 = P_REG | 0x1910, // used in multiply instructions P_REG1A = P_REG | 0x1a80, P_REG1C = P_REG | 0x1c00, -// P_ACC = P_REG | 0x1c10, // used for global accum (gcdsptool's value) + // P_ACC = P_REG | 0x1c10, // used for global accum (gcdsptool's value) P_ACCL = P_REG | 0x1c00, // used for low part of accum P_ACCM = P_REG | 0x1e00, // used for mid part of accum // The following are not in gcdsptool diff --git a/Source/Core/Core/DSP/DspIntArithmetic.cpp b/Source/Core/Core/DSP/DspIntArithmetic.cpp index 7de0327491..6420dd4b0b 100644 --- a/Source/Core/Core/DSP/DspIntArithmetic.cpp +++ b/Source/Core/Core/DSP/DspIntArithmetic.cpp @@ -832,7 +832,7 @@ void lsr16(const UDSPInstruction opc) u8 areg = (opc >> 8) & 0x1; u64 acc = dsp_get_long_acc(areg); - acc &= 0x000000FFFFFFFFFFULL; // Lop off the extraneous sign extension our 64-bit fake accum causes + acc &= 0x000000FFFFFFFFFFULL; // Lop off the extraneous sign extension our 64-bit fake accum causes acc >>= 16; zeroWriteBackLog(); @@ -887,7 +887,7 @@ void lsr(const UDSPInstruction opc) u8 rreg = (opc >> 8) & 0x01; u16 shift; u64 acc = dsp_get_long_acc(rreg); - acc &= 0x000000FFFFFFFFFFULL; // Lop off the extraneous sign extension our 64-bit fake accum causes + acc &= 0x000000FFFFFFFFFFULL; // Lop off the extraneous sign extension our 64-bit fake accum causes if ((opc & 0x3f) == 0) shift = 0; diff --git a/Source/Core/Core/DSP/assemble.cpp b/Source/Core/Core/DSP/assemble.cpp index 7ae9346f29..9924c576be 100644 --- a/Source/Core/Core/DSP/assemble.cpp +++ b/Source/Core/Core/DSP/assemble.cpp @@ -3,7 +3,7 @@ $Id: assemble.cpp,v 1.3 2008-11-11 01:04:26 wntrmute Exp $ project: GameCube DSP Tool (gcdsp) -mail: duddie@walla.com +mail: duddie@walla.com Copyright (c) 2005 Duddie @@ -817,11 +817,11 @@ bool DSPAssembler::AssembleFile(const char *fname, int pass) if (c == 0x0a || c == 0x0d || c == ';') c = 0x00; - if (c == 0x09) // tabs to spaces + if (c == 0x09) // tabs to spaces c = ' '; if (c == '"') upper = !upper; - if (upper && c >= 'a' && c <= 'z') // convert to uppercase + if (upper && c >= 'a' && c <= 'z') // convert to uppercase c = c - 'a' + 'A'; line[i] = c; if (c == 0) @@ -847,7 +847,7 @@ bool DSPAssembler::AssembleFile(const char *fname, int pass) if (valid) { label = std::string(line).substr(0, col_pos); - ptr += col_pos + 1; + ptr += col_pos + 1; } } diff --git a/Source/Core/Core/DSP/assemble.h b/Source/Core/Core/DSP/assemble.h index 8f77622052..1412faf6b1 100644 --- a/Source/Core/Core/DSP/assemble.h +++ b/Source/Core/Core/DSP/assemble.h @@ -2,7 +2,7 @@ project: GameCube DSP Tool (gcdsp) created: 2005.03.04 - mail: duddie@walla.com + mail: duddie@walla.com Copyright (c) 2005 Duddie @@ -121,7 +121,7 @@ private: LabelMap labels; - u32 code_line; + u32 code_line; bool failed; std::string last_error_str; err_t last_error; diff --git a/Source/Core/Core/DSP/disassemble.cpp b/Source/Core/Core/DSP/disassemble.cpp index 33fc28eb7a..af0eb91c29 100644 --- a/Source/Core/Core/DSP/disassemble.cpp +++ b/Source/Core/Core/DSP/disassemble.cpp @@ -3,7 +3,7 @@ filename: disassemble.cpp project: GameCube DSP Tool (gcdsp) created: 2005.03.04 - mail: duddie@walla.com + mail: duddie@walla.com Copyright (c) 2005 Duddie @@ -221,7 +221,7 @@ bool DSPDisassembler::DisOpcode(const u16 *binbuf, int base_addr, int pass, u16 break; } } - const DSPOPCTemplate fake_op = {"CW", 0x0000, 0x0000, nop, NULL, 1, 1, {{P_VAL, 2, 0, 0, 0xffff}}, false, false, false, false, false}; + const DSPOPCTemplate fake_op = {"CW", 0x0000, 0x0000, nop, NULL, 1, 1, {{P_VAL, 2, 0, 0, 0xffff}}, false, false, false, false, false}; if (!opc) opc = &fake_op; diff --git a/Source/Core/Core/DSP/disassemble.h b/Source/Core/Core/DSP/disassemble.h index 3c31695125..1e3af70d3c 100644 --- a/Source/Core/Core/DSP/disassemble.h +++ b/Source/Core/Core/DSP/disassemble.h @@ -2,7 +2,7 @@ project: GameCube DSP Tool (gcdsp) created: 2005.03.04 - mail: duddie@walla.com + mail: duddie@walla.com Copyright (c) 2005 Duddie diff --git a/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp index 2bdbd88074..e73ed3d891 100644 --- a/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp @@ -190,12 +190,12 @@ void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory &cpMe case DIRECT: switch (colComp[i]) { - case FORMAT_16B_565: size = 2; break; - case FORMAT_24B_888: size = 3; break; - case FORMAT_32B_888x: size = 4; break; - case FORMAT_16B_4444: size = 2; break; - case FORMAT_24B_6666: size = 3; break; - case FORMAT_32B_8888: size = 4; break; + case FORMAT_16B_565: size = 2; break; + case FORMAT_24B_888: size = 3; break; + case FORMAT_32B_888x: size = 4; break; + case FORMAT_16B_4444: size = 2; break; + case FORMAT_24B_6666: size = 3; break; + case FORMAT_32B_8888: size = 4; break; default: _assert_(0); break; } break; diff --git a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp index 25c6c9064a..070f4792e3 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp @@ -309,8 +309,8 @@ void FifoPlayer::WriteFifo(u8 *data, u32 start, u32 end) void FifoPlayer::SetupFifo() { - WriteCP(0x02, 0); // disable read, BP, interrupts - WriteCP(0x04, 7); // clear overflow, underflow, metrics + WriteCP(0x02, 0); // disable read, BP, interrupts + WriteCP(0x04, 7); // clear overflow, underflow, metrics const FifoFrameInfo& frame = m_File->GetFrame(m_CurrentFrame); @@ -344,7 +344,7 @@ void FifoPlayer::SetupFifo() FlushWGP(); WritePI(20, frame.fifoStart); - WriteCP(0x02, 17); // enable read & GP link + WriteCP(0x02, 17); // enable read & GP link } void FifoPlayer::LoadMemory() diff --git a/Source/Core/Core/GeckoCode.cpp b/Source/Core/Core/GeckoCode.cpp index cfb9e35a70..54a92fa6d3 100644 --- a/Source/Core/Core/GeckoCode.cpp +++ b/Source/Core/Core/GeckoCode.cpp @@ -161,4 +161,4 @@ void RunCodeHandler() } } -} // namespace Gecko +} // namespace Gecko diff --git a/Source/Core/Core/GeckoCode.h b/Source/Core/Core/GeckoCode.h index 0ceb9b72c3..47f59fe1ee 100644 --- a/Source/Core/Core/GeckoCode.h +++ b/Source/Core/Core/GeckoCode.h @@ -45,4 +45,4 @@ namespace Gecko bool RunActiveCodes(); void RunCodeHandler(); -} // namespace Gecko +} // namespace Gecko diff --git a/Source/Core/Core/GeckoCodeConfig.cpp b/Source/Core/Core/GeckoCodeConfig.cpp index a21271d503..b434561230 100644 --- a/Source/Core/Core/GeckoCodeConfig.cpp +++ b/Source/Core/Core/GeckoCodeConfig.cpp @@ -29,7 +29,7 @@ void LoadCodes(const IniFile& globalIni, const IniFile& localIni, std::vector<Ge if (line.empty()) continue; - std::istringstream ss(line); + std::istringstream ss(line); switch ((line)[0]) { diff --git a/Source/Core/Core/HLE/HLE.cpp b/Source/Core/Core/HLE/HLE.cpp index c0ecc50826..986716990a 100644 --- a/Source/Core/Core/HLE/HLE.cpp +++ b/Source/Core/Core/HLE/HLE.cpp @@ -112,7 +112,7 @@ void PatchFunctions() } } - // CBreakPoints::AddBreakPoint(0x8000D3D0, false); + // CBreakPoints::AddBreakPoint(0x8000D3D0, false); } void Execute(u32 _CurrentPC, u32 _Instruction) @@ -127,7 +127,7 @@ void Execute(u32 _CurrentPC, u32 _Instruction) PanicAlert("HLE system tried to call an undefined HLE function %i.", FunctionIndex); } - // _dbg_assert_msg_(HLE,NPC == LR, "Broken HLE function (doesn't set NPC)", OSPatches[pos].m_szPatchName); + // _dbg_assert_msg_(HLE,NPC == LR, "Broken HLE function (doesn't set NPC)", OSPatches[pos].m_szPatchName); } u32 GetFunctionIndex(u32 addr) diff --git a/Source/Core/Core/HW/AudioInterface.cpp b/Source/Core/Core/HW/AudioInterface.cpp index b103f7a5f9..1de543470b 100644 --- a/Source/Core/Core/HW/AudioInterface.cpp +++ b/Source/Core/Core/HW/AudioInterface.cpp @@ -332,7 +332,7 @@ unsigned int Callback_GetStreaming(short* _pDestBuffer, unsigned int _numSamples { frac &= 0xffff; - l1 = l2; //current + l1 = l2; //current l2 = pcm[pos * 2]; //next } diff --git a/Source/Core/Core/HW/DSP.cpp b/Source/Core/Core/HW/DSP.cpp index 54374ff77b..76aa433b76 100644 --- a/Source/Core/Core/HW/DSP.cpp +++ b/Source/Core/Core/HW/DSP.cpp @@ -376,15 +376,15 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base) } // Update DSP related flags - g_dspState.DSPControl.DSPReset = tmpControl.DSPReset; - g_dspState.DSPControl.DSPAssertInt = tmpControl.DSPAssertInt; - g_dspState.DSPControl.DSPHalt = tmpControl.DSPHalt; - g_dspState.DSPControl.DSPInit = tmpControl.DSPInit; + g_dspState.DSPControl.DSPReset = tmpControl.DSPReset; + g_dspState.DSPControl.DSPAssertInt = tmpControl.DSPAssertInt; + g_dspState.DSPControl.DSPHalt = tmpControl.DSPHalt; + g_dspState.DSPControl.DSPInit = tmpControl.DSPInit; // Interrupt (mask) - g_dspState.DSPControl.AID_mask = tmpControl.AID_mask; - g_dspState.DSPControl.ARAM_mask = tmpControl.ARAM_mask; - g_dspState.DSPControl.DSP_mask = tmpControl.DSP_mask; + g_dspState.DSPControl.AID_mask = tmpControl.AID_mask; + g_dspState.DSPControl.ARAM_mask = tmpControl.ARAM_mask; + g_dspState.DSPControl.DSP_mask = tmpControl.DSP_mask; // Interrupt if (tmpControl.AID) g_dspState.DSPControl.AID = 0; @@ -392,8 +392,8 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base) if (tmpControl.DSP) g_dspState.DSPControl.DSP = 0; // unknown - g_dspState.DSPControl.unk3 = tmpControl.unk3; - g_dspState.DSPControl.pad = tmpControl.pad; + g_dspState.DSPControl.unk3 = tmpControl.unk3; + g_dspState.DSPControl.pad = tmpControl.pad; if (g_dspState.DSPControl.pad != 0) { PanicAlert("DSPInterface (w) g_dspState.DSPControl (CC00500A) gets a value with junk in the padding %08x", val); diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.cpp index 5502335083..45a8d55c89 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -34,7 +34,7 @@ CUCode_AX::~CUCode_AX() { if (m_run_on_thread) { - m_cmdlist_size = (u16)-1; // Special value to signal end + m_cmdlist_size = (u16)-1; // Special value to signal end NotifyAXThread(); m_axthread.join(); } @@ -94,7 +94,7 @@ void CUCode_AX::AXThread() m_cmdlist_cv.wait(lk); } - if (m_cmdlist_size == (u16)-1) // End of thread signal + if (m_cmdlist_size == (u16)-1) // End of thread signal break; m_processing.lock(); @@ -202,7 +202,7 @@ void CUCode_AX::HandleCommandList() SetMainLR(HILO_TO_32(addr)); break; - case CMD_UNK_08: curr_idx += 10; break; // TODO: check + case CMD_UNK_08: curr_idx += 10; break; // TODO: check case CMD_MIX_AUXB_NOWRITE: addr_hi = m_cmdlist[curr_idx++]; diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp index 4a82082def..573fb6e834 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp @@ -41,10 +41,10 @@ void CUCode_AXWii::HandleCommandList() u32 pb_addr = 0; -// WARN_LOG(DSPHLE, "Command list:"); -// for (u32 i = 0; m_cmdlist[i] != CMD_END; ++i) -// WARN_LOG(DSPHLE, "%04x", m_cmdlist[i]); -// WARN_LOG(DSPHLE, "-------------"); + // WARN_LOG(DSPHLE, "Command list:"); + // for (u32 i = 0; m_cmdlist[i] != CMD_END; ++i) + // WARN_LOG(DSPHLE, "%04x", m_cmdlist[i]); + // WARN_LOG(DSPHLE, "-------------"); u32 curr_idx = 0; bool end = false; diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.h index 713b95e1c8..a9fe80b46f 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.h @@ -65,7 +65,7 @@ protected: void UploadAUXMixLRSC(int aux_id, u32* addresses, u16 volume); void OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume, bool upload_auxc); - void OutputWMSamples(u32* addresses); // 4 addresses + void OutputWMSamples(u32* addresses); // 4 addresses private: enum CmdType diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h index 645dfe3e70..575481b3fb 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -193,7 +193,7 @@ u16 AcceleratorGetSample() switch (acc_pb->audio_addr.sample_format) { - case 0x00: // ADPCM + case 0x00: // ADPCM { // ADPCM decoding, not much to explain here. if ((*acc_cur_addr & 15) == 0) @@ -225,14 +225,14 @@ u16 AcceleratorGetSample() break; } - case 0x0A: // 16-bit PCM audio + case 0x0A: // 16-bit PCM audio ret = (DSP::ReadARAM(*acc_cur_addr * 2) << 8) | DSP::ReadARAM(*acc_cur_addr * 2 + 1); acc_pb->adpcm.yn2 = acc_pb->adpcm.yn1; acc_pb->adpcm.yn1 = ret; *acc_cur_addr += 1; break; - case 0x19: // 8-bit PCM audio + case 0x19: // 8-bit PCM audio ret = DSP::ReadARAM(*acc_cur_addr) << 8; acc_pb->adpcm.yn2 = acc_pb->adpcm.yn1; acc_pb->adpcm.yn1 = ret; diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp index c74967b90f..0490206842 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp @@ -126,7 +126,7 @@ void CUCode_Zelda::HandleMail(u32 _uMail) void CUCode_Zelda::HandleMail_LightVersion(u32 _uMail) { //ERROR_LOG(DSPHLE, "Light version mail %08X, list in progress: %s, step: %i/%i", - // _uMail, m_bListInProgress ? "yes":"no", m_step, m_numSteps); + // _uMail, m_bListInProgress ? "yes":"no", m_step, m_numSteps); if (m_bSyncCmdPending) { @@ -199,11 +199,11 @@ void CUCode_Zelda::HandleMail_SMSVersion(u32 _uMail) if (m_CurBuffer == m_NumBuffers) { m_rMailHandler.PushMail(DSP_FRAME_END); - // DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); + // DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); soundStream->GetMixer()->SetHLEReady(true); DEBUG_LOG(DSPHLE, "Update the SoundThread to be in sync"); -// soundStream->Update(); //do it in this thread to avoid sync problems + // soundStream->Update(); //do it in this thread to avoid sync problems m_bSyncCmdPending = false; } @@ -333,7 +333,7 @@ void CUCode_Zelda::HandleMail_NormalVersion(u32 _uMail) soundStream->GetMixer()->SetHLEReady(true); DEBUG_LOG(DSPHLE, "Update the SoundThread to be in sync"); -// soundStream->Update(); //do it in this thread to avoid sync problems + // soundStream->Update(); //do it in this thread to avoid sync problems m_bSyncCmdPending = false; } diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp index d013ef6d16..bf9a0cd3f7 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp @@ -487,9 +487,9 @@ void CUCode_Zelda::RenderAddVoice(ZeldaVoicePB &PB, s32* _LeftBuffer, s32* _Righ } // XK: Use this to disable MIDI music (GREAT for testing). Also kills some sound FX. - //if(PB.SoundType == 0x0d00) { - // PB.NeedsReset = 0; - // return; + //if (PB.SoundType == 0x0d00) { + // PB.NeedsReset = 0; + // return; //} // The Resample calls actually don't resample yet. @@ -500,18 +500,18 @@ void CUCode_Zelda::RenderAddVoice(ZeldaVoicePB &PB, s32* _LeftBuffer, s32* _Righ // First jump table at ZWW: 2a6 switch (PB.Format) { - case 0x0005: // AFC with extra low bitrate (32:5 compression). - case 0x0009: // AFC with normal bitrate (32:9 compression). + case 0x0005: // AFC with extra low bitrate (32:5 compression). + case 0x0009: // AFC with normal bitrate (32:9 compression). RenderVoice_AFC(PB, m_ResampleBuffer + 4, _Size); Resample(PB, _Size, m_ResampleBuffer + 4, m_VoiceBuffer, true); break; - case 0x0008: // PCM8 - normal PCM 8-bit audio. Used in Mario Kart DD + very little in Zelda WW. + case 0x0008: // PCM8 - normal PCM 8-bit audio. Used in Mario Kart DD + very little in Zelda WW. RenderVoice_PCM8(PB, m_ResampleBuffer + 4, _Size); Resample(PB, _Size, m_ResampleBuffer + 4, m_VoiceBuffer, true); break; - case 0x0010: // PCM16 - normal PCM 16-bit audio. + case 0x0010: // PCM16 - normal PCM 16-bit audio. RenderVoice_PCM16(PB, m_ResampleBuffer + 4, _Size); Resample(PB, _Size, m_ResampleBuffer + 4, m_VoiceBuffer, true); break; @@ -535,10 +535,10 @@ void CUCode_Zelda::RenderAddVoice(ZeldaVoicePB &PB, s32* _LeftBuffer, s32* _Righ default: // Second jump table // TODO: Cases to find examples of: - // -0x0002 - // -0x0003 - // -0x0006 - // -0x000a + // -0x0002 + // -0x0003 + // -0x0006 + // -0x000a switch (PB.Format) { // Synthesized sounds @@ -547,8 +547,7 @@ void CUCode_Zelda::RenderAddVoice(ZeldaVoicePB &PB, s32* _LeftBuffer, s32* _Righ RenderSynth_RectWave(PB, m_VoiceBuffer, _Size); break; - case 0x0001: // Example: "Denied" sound when trying to pull out a sword - // indoors in ZWW + case 0x0001: // Example: "Denied" sound when trying to pull out a sword indoors in ZWW RenderSynth_SawWave(PB, m_VoiceBuffer, _Size); break; diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h index ee845d69ac..7d21a3d1ec 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h +++ b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h @@ -9,7 +9,7 @@ // TODO: Get rid of this file. -#define PROFILE 0 +#define PROFILE 0 #if PROFILE void ProfilerDump(u64 _count); diff --git a/Source/Core/Core/HW/DVDInterface.cpp b/Source/Core/Core/HW/DVDInterface.cpp index 90b5f66c3a..884b5c3941 100644 --- a/Source/Core/Core/HW/DVDInterface.cpp +++ b/Source/Core/Core/HW/DVDInterface.cpp @@ -87,7 +87,7 @@ union UDICVR u32 Hex; struct { - u32 CVR : 1; // 0: Cover closed 1: Cover open + u32 CVR : 1; // 0: Cover closed 1: Cover open u32 CVRINTMASK : 1; // 1: Interrupt enabled u32 CVRINT : 1; // r 1: Interrupt requested w 1: Interrupt clear u32 : 29; @@ -249,17 +249,17 @@ void TransferComplete(u64 userdata, int cyclesLate) void Init() { - m_DISR.Hex = 0; - m_DICVR.Hex = 0; - m_DICMDBUF[0].Hex= 0; - m_DICMDBUF[1].Hex= 0; - m_DICMDBUF[2].Hex= 0; - m_DIMAR.Hex = 0; - m_DILENGTH.Hex = 0; - m_DICR.Hex = 0; - m_DIIMMBUF.Hex = 0; - m_DICFG.Hex = 0; - m_DICFG.CONFIG = 1; // Disable bootrom descrambler + m_DISR.Hex = 0; + m_DICVR.Hex = 0; + m_DICMDBUF[0].Hex = 0; + m_DICMDBUF[1].Hex = 0; + m_DICMDBUF[2].Hex = 0; + m_DIMAR.Hex = 0; + m_DILENGTH.Hex = 0; + m_DICR.Hex = 0; + m_DIIMMBUF.Hex = 0; + m_DICFG.Hex = 0; + m_DICFG.CONFIG = 1; // Disable bootrom descrambler AudioPos = 0; LoopStart = 0; @@ -412,10 +412,10 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base) MMIO::ComplexWrite<u32>([](u32, u32 val) { UDISR tmpStatusReg(val); - m_DISR.DEINITMASK = tmpStatusReg.DEINITMASK; - m_DISR.TCINTMASK = tmpStatusReg.TCINTMASK; - m_DISR.BRKINTMASK = tmpStatusReg.BRKINTMASK; - m_DISR.BREAK = tmpStatusReg.BREAK; + m_DISR.DEINITMASK = tmpStatusReg.DEINITMASK; + m_DISR.TCINTMASK = tmpStatusReg.TCINTMASK; + m_DISR.BRKINTMASK = tmpStatusReg.BRKINTMASK; + m_DISR.BREAK = tmpStatusReg.BREAK; if (tmpStatusReg.DEINT) m_DISR.DEINT = 0; @@ -503,10 +503,10 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base) void UpdateInterrupts() { - if ((m_DISR.DEINT & m_DISR.DEINITMASK) || - (m_DISR.TCINT & m_DISR.TCINTMASK) || - (m_DISR.BRKINT & m_DISR.BRKINTMASK) || - (m_DICVR.CVRINT & m_DICVR.CVRINTMASK)) + if ((m_DISR.DEINT & m_DISR.DEINITMASK) || + (m_DISR.TCINT & m_DISR.TCINTMASK) || + (m_DISR.BRKINT & m_DISR.BRKINTMASK) || + (m_DICVR.CVRINT & m_DICVR.CVRINTMASK)) { ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_DI, true); } @@ -523,10 +523,10 @@ void GenerateDIInterrupt(DI_InterruptType _DVDInterrupt) { switch(_DVDInterrupt) { - case INT_DEINT: m_DISR.DEINT = 1; break; - case INT_TCINT: m_DISR.TCINT = 1; break; - case INT_BRKINT: m_DISR.BRKINT = 1; break; - case INT_CVRINT: m_DICVR.CVRINT = 1; break; + case INT_DEINT: m_DISR.DEINT = 1; break; + case INT_TCINT: m_DISR.TCINT = 1; break; + case INT_BRKINT: m_DISR.BRKINT = 1; break; + case INT_CVRINT: m_DICVR.CVRINT = 1; break; } UpdateInterrupts(); @@ -534,7 +534,7 @@ void GenerateDIInterrupt(DI_InterruptType _DVDInterrupt) void ExecuteCommand(UDICR& _DICR) { -// _dbg_assert_(DVDINTERFACE, _DICR.RW == 0); // only DVD to Memory + // _dbg_assert_(DVDINTERFACE, _DICR.RW == 0); // only DVD to Memory int GCAM = ((SConfig::GetInstance().m_SIDevice[0] == SIDEVICE_AM_BASEBOARD) && (SConfig::GetInstance().m_EXIDevice[2] == EXIDEVICE_AM_BASEBOARD)) ? 1 : 0; @@ -825,9 +825,9 @@ void ExecuteCommand(UDICR& _DICR) break; // Audio Stream (Immediate) - // m_DICMDBUF[0].CMDBYTE1 = subcommand - // m_DICMDBUF[1].Hex << 2 = offset on disc - // m_DICMDBUF[2].Hex = Length of the stream + // m_DICMDBUF[0].CMDBYTE1 = Subcommand + // m_DICMDBUF[1].Hex << 2 = Offset on disc + // m_DICMDBUF[2].Hex = Length of the stream case 0xE1: { u32 pos = m_DICMDBUF[1].Hex << 2; diff --git a/Source/Core/Core/HW/EXI.cpp b/Source/Core/Core/HW/EXI.cpp index fed520fc11..dfa0b9da10 100644 --- a/Source/Core/Core/HW/EXI.cpp +++ b/Source/Core/Core/HW/EXI.cpp @@ -29,15 +29,15 @@ void Init() g_Channels[i] = new CEXIChannel(i); if (Movie::IsPlayingInput() && Movie::IsUsingMemcard() && Movie::IsConfigSaved()) - g_Channels[0]->AddDevice(EXIDEVICE_MEMORYCARD, 0); // SlotA + g_Channels[0]->AddDevice(EXIDEVICE_MEMORYCARD, 0); // SlotA else if(Movie::IsPlayingInput() && !Movie::IsUsingMemcard() && Movie::IsConfigSaved()) - g_Channels[0]->AddDevice(EXIDEVICE_NONE, 0); // SlotA + g_Channels[0]->AddDevice(EXIDEVICE_NONE, 0); // SlotA else - g_Channels[0]->AddDevice(SConfig::GetInstance().m_EXIDevice[0], 0); // SlotA - g_Channels[0]->AddDevice(EXIDEVICE_MASKROM, 1); - g_Channels[0]->AddDevice(SConfig::GetInstance().m_EXIDevice[2], 2); // Serial Port 1 - g_Channels[1]->AddDevice(SConfig::GetInstance().m_EXIDevice[1], 0); // SlotB - g_Channels[2]->AddDevice(EXIDEVICE_AD16, 0); + g_Channels[0]->AddDevice(SConfig::GetInstance().m_EXIDevice[0], 0); // SlotA + g_Channels[0]->AddDevice(EXIDEVICE_MASKROM, 1); + g_Channels[0]->AddDevice(SConfig::GetInstance().m_EXIDevice[2], 2); // Serial Port 1 + g_Channels[1]->AddDevice(SConfig::GetInstance().m_EXIDevice[1], 0); // SlotB + g_Channels[2]->AddDevice(EXIDEVICE_AD16, 0); changeDevice = CoreTiming::RegisterEvent("ChangeEXIDevice", ChangeDeviceCallback); } diff --git a/Source/Core/Core/HW/EXI_Device.cpp b/Source/Core/Core/HW/EXI_Device.cpp index ce657f7ff1..e2e4924d38 100644 --- a/Source/Core/Core/HW/EXI_Device.cpp +++ b/Source/Core/Core/HW/EXI_Device.cpp @@ -43,7 +43,7 @@ u32 IEXIDevice::ImmRead(u32 _uSize) void IEXIDevice::DMAWrite(u32 _uAddr, u32 _uSize) { -// _dbg_assert_(EXPANSIONINTERFACE, 0); + // _dbg_assert_(EXPANSIONINTERFACE, 0); while (_uSize--) { u8 uByte = Memory::Read_U8(_uAddr++); @@ -53,7 +53,7 @@ void IEXIDevice::DMAWrite(u32 _uAddr, u32 _uSize) void IEXIDevice::DMARead(u32 _uAddr, u32 _uSize) { -// _dbg_assert_(EXPANSIONINTERFACE, 0); + // _dbg_assert_(EXPANSIONINTERFACE, 0); while (_uSize--) { u8 uByte = 0; diff --git a/Source/Core/Core/HW/EXI_DeviceGecko.cpp b/Source/Core/Core/HW/EXI_DeviceGecko.cpp index 27e456e96b..594c9c674a 100644 --- a/Source/Core/Core/HW/EXI_DeviceGecko.cpp +++ b/Source/Core/Core/HW/EXI_DeviceGecko.cpp @@ -136,7 +136,7 @@ void GeckoSockServer::ClientThread() if (client.Send(&packet[0], packet.size()) == sf::Socket::Disconnected) client_running = false; } - } // unlock transfer + } // unlock transfer if (did_nothing) Common::YieldCPU(); diff --git a/Source/Core/Core/HW/EXI_DeviceMic.cpp b/Source/Core/Core/HW/EXI_DeviceMic.cpp index 804203eb04..863463f41c 100644 --- a/Source/Core/Core/HW/EXI_DeviceMic.cpp +++ b/Source/Core/Core/HW/EXI_DeviceMic.cpp @@ -179,7 +179,7 @@ void CEXIMic::SetCS(int cs) void CEXIMic::UpdateNextInterruptTicks() { next_int_ticks = CoreTiming::GetTicks() + - (SystemTimers::GetTicksPerSecond() / sample_rate) * buff_size_samples; + (SystemTimers::GetTicksPerSecond() / sample_rate) * buff_size_samples; } bool CEXIMic::IsInterruptSet() diff --git a/Source/Core/Core/HW/GCMemcard.cpp b/Source/Core/Core/HW/GCMemcard.cpp index d320f0177a..ec05e5043c 100644 --- a/Source/Core/Core/HW/GCMemcard.cpp +++ b/Source/Core/Core/HW/GCMemcard.cpp @@ -824,7 +824,7 @@ u32 GCMemcard::ImportGciInternal(FILE* gcih, const char *inputFile, const std::s gci.ReadBytes(tmp, 0xD); if (!strcasecmp(fileType.c_str(), ".gcs")) { - if (!memcmp(tmp, "GCSAVE", 6)) // Header must be uppercase + if (!memcmp(tmp, "GCSAVE", 6)) // Header must be uppercase offset = GCS; else return GCSFAIL; @@ -988,7 +988,8 @@ void GCMemcard::Gcs_SavConvert(DEntry &tempDEntry, int saveType, int length) switch(saveType) { case GCS: - { // field containing the Block count as displayed within + { + // field containing the Block count as displayed within // the GameSaves software is not stored in the GCS file. // It is stored only within the corresponding GSV file. // If the GCS file is added without using the GameSaves software, @@ -1269,7 +1270,7 @@ void GCMemcard::FormatInternal(GCMC_Header &GCP) p_hdr->SramBias = g_SRAM.counter_bias; p_hdr->SramLang = g_SRAM.lang; // TODO: determine the purpose of Unk2 1 works for slot A, 0 works for both slot A and slot B - *(u32*)&p_hdr->Unk2 = 0; // = _viReg[55]; static vu16* const _viReg = (u16*)0xCC002000; + *(u32*)&p_hdr->Unk2 = 0; // = _viReg[55]; static vu16* const _viReg = (u16*)0xCC002000; *(u16*)&p_hdr->deviceID = 0; calc_checksumsBE((u16*)p_hdr, 0xFE, &p_hdr->Checksum, &p_hdr->Checksum_Inv); diff --git a/Source/Core/Core/HW/Memmap.cpp b/Source/Core/Core/HW/Memmap.cpp index fea5f6dbd9..2d0568521d 100644 --- a/Source/Core/Core/HW/Memmap.cpp +++ b/Source/Core/Core/HW/Memmap.cpp @@ -53,7 +53,7 @@ bool bMMU = false; // Init() declarations // ---------------- // Store the MemArena here -u8* base = NULL; +u8* base = NULL; // The MemArena class MemArena g_arena; @@ -127,7 +127,7 @@ static const MemoryView views[] = // Don't map any memory for the EFB. We want all access to this area to go // through the hardware access handlers. #ifndef _M_X64 -// {&m_pEFB, &m_pVirtualEFB, 0xC8000000, EFB_SIZE, 0}, +// {&m_pEFB, &m_pVirtualEFB, 0xC8000000, EFB_SIZE, 0}, #endif {&m_pL1Cache, &m_pVirtualL1Cache, 0xE0000000, L1_CACHE_SIZE, 0}, @@ -166,7 +166,7 @@ void DoState(PointerWrap &p) { bool wii = SConfig::GetInstance().m_LocalCoreStartupParameter.bWii; p.DoArray(m_pPhysicalRAM, RAM_SIZE); -// p.DoArray(m_pVirtualEFB, EFB_SIZE); + //p.DoArray(m_pVirtualEFB, EFB_SIZE); p.DoArray(m_pVirtualL1Cache, L1_CACHE_SIZE); p.DoMarker("Memory RAM"); if (bFakeVMEM) diff --git a/Source/Core/Core/HW/MemmapFunctions.cpp b/Source/Core/Core/HW/MemmapFunctions.cpp index 895d861f05..6168d91bc3 100644 --- a/Source/Core/Core/HW/MemmapFunctions.cpp +++ b/Source/Core/Core/HW/MemmapFunctions.cpp @@ -35,15 +35,15 @@ namespace Memory // EFB RE /* GXPeekZ -80322de8: rlwinm r0, r3, 2, 14, 29 (0003fffc) a = x << 2 & 0x3fffc -80322dec: oris r0, r0, 0xC800 a |= 0xc8000000 -80322df0: rlwinm r3, r0, 0, 20, 9 (ffc00fff) x = a & 0xffc00fff -80322df4: rlwinm r0, r4, 12, 4, 19 (0ffff000) a = (y << 12) & 0x0ffff000; -80322df8: or r0, r3, r0 a |= x; -80322dfc: rlwinm r0, r0, 0, 10, 7 (ff3fffff) a &= 0xff3fffff -80322e00: oris r3, r0, 0x0040 x = a | 0x00400000 -80322e04: lwz r0, 0 (r3) r0 = *r3 -80322e08: stw r0, 0 (r5) z = +80322de8: rlwinm r0, r3, 2, 14, 29 (0003fffc) a = x << 2 & 0x3fffc +80322dec: oris r0, r0, 0xC800 a |= 0xc8000000 +80322df0: rlwinm r3, r0, 0, 20, 9 (ffc00fff) x = a & 0xffc00fff +80322df4: rlwinm r0, r4, 12, 4, 19 (0ffff000) a = (y << 12) & 0x0ffff000; +80322df8: or r0, r3, r0 a |= x; +80322dfc: rlwinm r0, r0, 0, 10, 7 (ff3fffff) a &= 0xff3fffff +80322e00: oris r3, r0, 0x0040 x = a | 0x00400000 +80322e04: lwz r0, 0 (r3) r0 = *r3 +80322e08: stw r0, 0 (r5) z = 80322e0c: blr */ @@ -148,11 +148,12 @@ inline void WriteToHardware(u32 em_address, const T data, u32 effective_address, // reason we end up in this function: if (em_address == 0xCC008000) { - switch (sizeof(T)) { - case 1: GPFifo::Write8((u8)data, em_address); return; - case 2: GPFifo::Write16((u16)data, em_address); return; - case 4: GPFifo::Write32((u32)data, em_address); return; - case 8: GPFifo::Write64((u64)data, em_address); return; + switch (sizeof(T)) + { + case 1: GPFifo::Write8((u8)data, em_address); return; + case 2: GPFifo::Write16((u16)data, em_address); return; + case 4: GPFifo::Write32((u32)data, em_address); return; + case 8: GPFifo::Write64((u64)data, em_address); return; } } if ((em_address & 0xC8000000) == 0xC8000000) @@ -466,23 +467,23 @@ void WriteUnchecked_U32(const u32 _iValue, const u32 _Address) // ********************************************************************************* /* -* PearPC -* ppc_mmu.cc +* PearPC +* ppc_mmu.cc * -* Copyright (C) 2003, 2004 Sebastian Biallas (sb@biallas.net) +* Copyright (C) 2003, 2004 Sebastian Biallas (sb@biallas.net) * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. * -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. * -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -503,8 +504,8 @@ void WriteUnchecked_U32(const u32 _iValue, const u32 _Address) #define EA_SR(v) (((v)>>28)&0xf) #define EA_PageIndex(v) (((v)>>12)&0xffff) -#define EA_Offset(v) ((v)&0xfff) -#define EA_API(v) (((v)>>22)&0x3f) +#define EA_Offset(v) ((v)&0xfff) +#define EA_API(v) (((v)>>22)&0x3f) #define PA_RPN(v) (((v)>>12)&0xfffff) #define PA_Offset(v) ((v)&0xfff) @@ -759,10 +760,10 @@ u32 TranslatePageAddress(const u32 _Address, const XCheckTLBFlag _Flag) u32 sr = PowerPC::ppcState.sr[EA_SR(_Address)]; - u32 offset = EA_Offset(_Address); // 12 bit - u32 page_index = EA_PageIndex(_Address); // 16 bit - u32 VSID = SR_VSID(sr); // 24 bit - u32 api = EA_API(_Address); // 6 bit (part of page_index) + u32 offset = EA_Offset(_Address); // 12 bit + u32 page_index = EA_PageIndex(_Address); // 16 bit + u32 VSID = SR_VSID(sr); // 24 bit + u32 api = EA_API(_Address); // 6 bit (part of page_index) u8* pRAM = GetPointer(0); diff --git a/Source/Core/Core/HW/SI.cpp b/Source/Core/Core/HW/SI.cpp index 66d8bc088a..f3ec409d04 100644 --- a/Source/Core/Core/HW/SI.cpp +++ b/Source/Core/Core/HW/SI.cpp @@ -98,10 +98,10 @@ union USIChannelIn_Lo // SI Channel struct SSIChannel { - USIChannelOut m_Out; + USIChannelOut m_Out; USIChannelIn_Hi m_InHi; USIChannelIn_Lo m_InLo; - ISIDevice* m_pDevice; + ISIDevice* m_pDevice; }; // SI Poll: Controls how often a device is polled @@ -333,19 +333,19 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base) MMIO::ComplexWrite<u32>([](u32, u32 val) { USIComCSR tmpComCSR(val); - g_ComCSR.CHANNEL = tmpComCSR.CHANNEL; - g_ComCSR.INLNGTH = tmpComCSR.INLNGTH; - g_ComCSR.OUTLNGTH = tmpComCSR.OUTLNGTH; + g_ComCSR.CHANNEL = tmpComCSR.CHANNEL; + g_ComCSR.INLNGTH = tmpComCSR.INLNGTH; + g_ComCSR.OUTLNGTH = tmpComCSR.OUTLNGTH; g_ComCSR.RDSTINTMSK = tmpComCSR.RDSTINTMSK; - g_ComCSR.TCINTMSK = tmpComCSR.TCINTMSK; + g_ComCSR.TCINTMSK = tmpComCSR.TCINTMSK; - g_ComCSR.COMERR = 0; + g_ComCSR.COMERR = 0; - if (tmpComCSR.RDSTINT) g_ComCSR.RDSTINT = 0; - if (tmpComCSR.TCINT) g_ComCSR.TCINT = 0; + if (tmpComCSR.RDSTINT) g_ComCSR.RDSTINT = 0; + if (tmpComCSR.TCINT) g_ComCSR.TCINT = 0; // be careful: run si-buffer after updating the INT flags - if (tmpComCSR.TSTART) RunSIBuffer(); + if (tmpComCSR.TSTART) RunSIBuffer(); UpdateInterrupts(); }) ); @@ -424,8 +424,8 @@ void GenerateSIInterrupt(SIInterruptType _SIInterrupt) { switch(_SIInterrupt) { - case INT_RDSTINT: g_ComCSR.RDSTINT = 1; break; - case INT_TCINT: g_ComCSR.TCINT = 1; break; + case INT_RDSTINT: g_ComCSR.RDSTINT = 1; break; + case INT_TCINT: g_ComCSR.TCINT = 1; break; } UpdateInterrupts(); diff --git a/Source/Core/Core/HW/Sram.cpp b/Source/Core/Core/HW/Sram.cpp index 8c135798b3..368d2b3a97 100644 --- a/Source/Core/Core/HW/Sram.cpp +++ b/Source/Core/Core/HW/Sram.cpp @@ -41,7 +41,7 @@ SRAM sram_dump_german = {{ 0x00, 0x01, 0x3C, - 0x12, 0xD5, 0xEA, 0xD3, 0x00, 0xFA, 0x2D, 0x33, 0x13, 0x41, 0x26, 0x03, + 0x12, 0xD5, 0xEA, 0xD3, 0x00, 0xFA, 0x2D, 0x33, 0x13, 0x41, 0x26, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/Source/Core/Core/HW/Sram.h b/Source/Core/Core/HW/Sram.h index f678cd8f1d..9a84212c3c 100644 --- a/Source/Core/Core/HW/Sram.h +++ b/Source/Core/Core/HW/Sram.h @@ -20,15 +20,15 @@ Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: -1. The origin of this software must not be misrepresented; you +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source +3. This notice may not be removed or altered from any source distribution. diff --git a/Source/Core/Core/HW/SystemTimers.cpp b/Source/Core/Core/HW/SystemTimers.cpp index 9c519793a3..27683d1214 100644 --- a/Source/Core/Core/HW/SystemTimers.cpp +++ b/Source/Core/Core/HW/SystemTimers.cpp @@ -115,7 +115,7 @@ int et_CP; int et_AudioDMA; int et_DSP; int et_IPC_HLE; -int et_PatchEngine; // PatchEngine updates every 1/60th of a second by default +int et_PatchEngine; // PatchEngine updates every 1/60th of a second by default int et_Throttle; // These are badly educated guesses diff --git a/Source/Core/Core/HW/Wiimote.h b/Source/Core/Core/HW/Wiimote.h index 434a3beb23..66541a6e9c 100644 --- a/Source/Core/Core/HW/Wiimote.h +++ b/Source/Core/Core/HW/Wiimote.h @@ -7,7 +7,8 @@ #include "../InputCommon/InputConfig.h" #include "ChunkFile.h" -enum { +enum +{ WIIMOTE_CHAN_0 = 0, WIIMOTE_CHAN_1, WIIMOTE_CHAN_2, @@ -18,14 +19,14 @@ enum { }; -#define WIIMOTE_INI_NAME "WiimoteNew" +#define WIIMOTE_INI_NAME "WiimoteNew" enum { - WIIMOTE_SRC_NONE = 0, - WIIMOTE_SRC_EMU = 1, - WIIMOTE_SRC_REAL = 2, - WIIMOTE_SRC_HYBRID = 3, // emu + real + WIIMOTE_SRC_NONE = 0, + WIIMOTE_SRC_EMU = 1, + WIIMOTE_SRC_REAL = 2, + WIIMOTE_SRC_HYBRID = 3, // emu + real }; extern unsigned int g_wiimote_sources[MAX_BBMOTES]; diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp index 4648eeae86..dbb718d211 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp @@ -9,9 +9,9 @@ namespace WiimoteEmu // Extension device IDs to be written to the last bytes of the extension reg // The id for nothing inserted -static const u8 nothing_id[] = { 0x00, 0x00, 0x00, 0x00, 0x2e, 0x2e }; +static const u8 nothing_id[] = { 0x00, 0x00, 0x00, 0x00, 0x2e, 0x2e }; // The id for a partially inserted extension -static const u8 partially_id[] = { 0x00, 0x00, 0x00, 0x00, 0xff, 0xff }; +static const u8 partially_id[] = { 0x00, 0x00, 0x00, 0x00, 0xff, 0xff }; Attachment::Attachment( const char* const _name, WiimoteEmu::ExtensionReg& _reg ) : name( _name ), reg( _reg ) diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp index b00fae43e4..dd33309481 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp @@ -8,7 +8,7 @@ namespace WiimoteEmu { -static const u8 guitar_id[] = { 0x00, 0x00, 0xa4, 0x20, 0x01, 0x03 }; +static const u8 guitar_id[] = { 0x00, 0x00, 0xa4, 0x20, 0x01, 0x03 }; static const u16 guitar_fret_bitmasks[] = { @@ -82,7 +82,7 @@ void Guitar::GetState(u8* const data, const bool focus) } // TODO: touch bar, probably not - gdata->tb = 0x0F; // not touched + gdata->tb = 0x0F; // not touched // whammy bar u8 whammy; diff --git a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp index f30d81224a..ede4e67f4b 100644 --- a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp @@ -358,27 +358,27 @@ void Spy(Wiimote* wm_, const void* data_, size_t size_) //if(((((u8*)&wm->m_reg_ext)[0xf0] == 0xaa) || ((u8*)&wm->m_reg_motion_plus)[0xf0] == 0xaa) && rdr->address>>8 < 0xf0) { //if(!wm->GetMotionPlusActive() && ((u8*)&wm->m_reg_ext)[0xf0] == 0xaa && rdr->address>>8 < 0xf0) { - + //if(!wm->GetMotionPlusActive() && ((u8*)&wm->m_reg_ext)[0xf0] == 0xaa) { - - // SWARN_LOG(CONSOLE, "key %s", ArrayToString(((u8*)&wm->m_ext_key), sizeof(wm->m_ext_key), 0, 30).c_str()); - // SWARN_LOG(CONSOLE, "decrypt %s", ArrayToString(rdr->data, rdr->size+1, 0, 30).c_str()); - // wiimote_decrypt(&wm->m_ext_key, rdr->data, dataReply[2]&0xffff, rdr->size+1); - // SWARN_LOG(CONSOLE, "decrypt %s", ArrayToString(rdr->data, rdr->size+1, 0, 30).c_str()); - // decrypted = true; + + // SWARN_LOG(CONSOLE, "key %s", ArrayToString(((u8*)&wm->m_ext_key), sizeof(wm->m_ext_key), 0, 30).c_str()); + // SWARN_LOG(CONSOLE, "decrypt %s", ArrayToString(rdr->data, rdr->size+1, 0, 30).c_str()); + // wiimote_decrypt(&wm->m_ext_key, rdr->data, dataReply[2]&0xffff, rdr->size+1); + // SWARN_LOG(CONSOLE, "decrypt %s", ArrayToString(rdr->data, rdr->size+1, 0, 30).c_str()); + // decrypted = true; //} // save data if (!emu && !rdr->error) { //if (dataReply[1] == 0xa4 && wm->GetMotionPlusActive()) - //memcpy(&((u8*)&wm->m_reg_motion_plus)[rdr->address>>8], rdr->data, rdr->size+1); + // memcpy(&((u8*)&wm->m_reg_motion_plus)[rdr->address>>8], rdr->data, rdr->size+1); //if (dataReply[1] == 0xa4 && !wm->GetMotionPlusActive()) //if (dataReply[1] == 0xa4) - // memcpy(&((u8*)&wm->m_reg_ext)[rdr->address>>8], rdr->data, rdr->size+1); + // memcpy(&((u8*)&wm->m_reg_ext)[rdr->address>>8], rdr->data, rdr->size+1); //if (!wm->GetMotionPlusActive() && wm->GetMotionPlusAttached()) //if (dataReply[1] == 0xa6) - // memcpy(&((u8*)&wm->m_reg_motion_plus)[rdr->address>>8], rdr->data, rdr->size+1); + // memcpy(&((u8*)&wm->m_reg_motion_plus)[rdr->address>>8], rdr->data, rdr->size+1); //INFO_LOG(CONSOLE, "Saving[0x%2x:0x%2x]: %s", dataReply[1], rdr->address>>8, ArrayToString(rdr->data, rdr->size+1).c_str()); } @@ -395,39 +395,41 @@ void Spy(Wiimote* wm_, const void* data_, size_t size_) // decrypt //if(((u8*)&wm->m_reg_ext)[0xf0] == 0xaa) { - // wiimote_decrypt(&wm->m_ext_key, &data[0x07], 0x00, (data[4] >> 0x04) + 1); - - //if (wm->m_extension->name == "NUNCHUCK") { - // INFO_LOG(CONSOLE, "\nGame got the Nunchuck calibration:\n"); - // INFO_LOG(CONSOLE, "Cal_zero.x: %i\n", data[7 + 0]); - // INFO_LOG(CONSOLE, "Cal_zero.y: %i\n", data[7 + 1]); - // INFO_LOG(CONSOLE, "Cal_zero.z: %i\n", data[7 + 2]); - // INFO_LOG(CONSOLE, "Cal_g.x: %i\n", data[7 + 4]); - // INFO_LOG(CONSOLE, "Cal_g.y: %i\n", data[7 + 5]); - // INFO_LOG(CONSOLE, "Cal_g.z: %i\n", data[7 + 6]); - // INFO_LOG(CONSOLE, "Js.Max.x: %i\n", data[7 + 8]); - // INFO_LOG(CONSOLE, "Js.Min.x: %i\n", data[7 + 9]); - // INFO_LOG(CONSOLE, "Js.Center.x: %i\n", data[7 + 10]); - // INFO_LOG(CONSOLE, "Js.Max.y: %i\n", data[7 + 11]); - // INFO_LOG(CONSOLE, "Js.Min.y: %i\n", data[7 + 12]); - // INFO_LOG(CONSOLE, "JS.Center.y: %i\n\n", data[7 + 13]); + // wiimote_decrypt(&wm->m_ext_key, &data[0x07], 0x00, (data[4] >> 0x04) + 1); + + //if (wm->m_extension->name == "NUNCHUCK") + //{ + // INFO_LOG(CONSOLE, "\nGame got the Nunchuck calibration:\n"); + // INFO_LOG(CONSOLE, "Cal_zero.x: %i\n", data[7 + 0]); + // INFO_LOG(CONSOLE, "Cal_zero.y: %i\n", data[7 + 1]); + // INFO_LOG(CONSOLE, "Cal_zero.z: %i\n", data[7 + 2]); + // INFO_LOG(CONSOLE, "Cal_g.x: %i\n", data[7 + 4]); + // INFO_LOG(CONSOLE, "Cal_g.y: %i\n", data[7 + 5]); + // INFO_LOG(CONSOLE, "Cal_g.z: %i\n", data[7 + 6]); + // INFO_LOG(CONSOLE, "Js.Max.x: %i\n", data[7 + 8]); + // INFO_LOG(CONSOLE, "Js.Min.x: %i\n", data[7 + 9]); + // INFO_LOG(CONSOLE, "Js.Center.x: %i\n", data[7 + 10]); + // INFO_LOG(CONSOLE, "Js.Max.y: %i\n", data[7 + 11]); + // INFO_LOG(CONSOLE, "Js.Min.y: %i\n", data[7 + 12]); + // INFO_LOG(CONSOLE, "JS.Center.y: %i\n\n", data[7 + 13]); //} - //else // g_Config.bClassicControllerConnected { - // INFO_LOG(CONSOLE, "\nGame got the Classic Controller calibration:\n"); - // INFO_LOG(CONSOLE, "Lx.Max: %i\n", data[7 + 0]); - // INFO_LOG(CONSOLE, "Lx.Min: %i\n", data[7 + 1]); - // INFO_LOG(CONSOLE, "Lx.Center: %i\n", data[7 + 2]); - // INFO_LOG(CONSOLE, "Ly.Max: %i\n", data[7 + 3]); - // INFO_LOG(CONSOLE, "Ly.Min: %i\n", data[7 + 4]); - // INFO_LOG(CONSOLE, "Ly.Center: %i\n", data[7 + 5]); - // INFO_LOG(CONSOLE, "Rx.Max.x: %i\n", data[7 + 6]); - // INFO_LOG(CONSOLE, "Rx.Min.x: %i\n", data[7 + 7]); - // INFO_LOG(CONSOLE, "Rx.Center.x: %i\n", data[7 + 8]); - // INFO_LOG(CONSOLE, "Ry.Max.y: %i\n", data[7 + 9]); - // INFO_LOG(CONSOLE, "Ry.Min: %i\n", data[7 + 10]); - // INFO_LOG(CONSOLE, "Ry.Center: %i\n\n", data[7 + 11]); - // INFO_LOG(CONSOLE, "Lt.Neutral: %i\n", data[7 + 12]); - // INFO_LOG(CONSOLE, "Rt.Neutral %i\n\n", data[7 + 13]); + //else // g_Config.bClassicControllerConnected + //{ + // INFO_LOG(CONSOLE, "\nGame got the Classic Controller calibration:\n"); + // INFO_LOG(CONSOLE, "Lx.Max: %i\n", data[7 + 0]); + // INFO_LOG(CONSOLE, "Lx.Min: %i\n", data[7 + 1]); + // INFO_LOG(CONSOLE, "Lx.Center: %i\n", data[7 + 2]); + // INFO_LOG(CONSOLE, "Ly.Max: %i\n", data[7 + 3]); + // INFO_LOG(CONSOLE, "Ly.Min: %i\n", data[7 + 4]); + // INFO_LOG(CONSOLE, "Ly.Center: %i\n", data[7 + 5]); + // INFO_LOG(CONSOLE, "Rx.Max.x: %i\n", data[7 + 6]); + // INFO_LOG(CONSOLE, "Rx.Min.x: %i\n", data[7 + 7]); + // INFO_LOG(CONSOLE, "Rx.Center.x: %i\n", data[7 + 8]); + // INFO_LOG(CONSOLE, "Ry.Max.y: %i\n", data[7 + 9]); + // INFO_LOG(CONSOLE, "Ry.Min: %i\n", data[7 + 10]); + // INFO_LOG(CONSOLE, "Ry.Center: %i\n\n", data[7 + 11]); + // INFO_LOG(CONSOLE, "Lt.Neutral: %i\n", data[7 + 12]); + // INFO_LOG(CONSOLE, "Rt.Neutral %i\n\n", data[7 + 13]); //} // save values diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp index e0c4a36e39..ae506a1bce 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp @@ -44,7 +44,7 @@ namespace WiimoteEmu static const u8 eeprom_data_0[] = { // IR, maybe more // assuming last 2 bytes are checksum - 0xA1, 0xAA, 0x8B, 0x99, 0xAE, 0x9E, 0x78, 0x30, 0xA7, /*0x74, 0xD3,*/ 0x00, 0x00, // messing up the checksum on purpose + 0xA1, 0xAA, 0x8B, 0x99, 0xAE, 0x9E, 0x78, 0x30, 0xA7, /*0x74, 0xD3,*/ 0x00, 0x00, // messing up the checksum on purpose 0xA1, 0xAA, 0x8B, 0x99, 0xAE, 0x9E, 0x78, 0x30, 0xA7, /*0x74, 0xD3,*/ 0x00, 0x00, // Accelerometer // 0g x,y,z, 1g x,y,z, idk, last byte is a checksum @@ -131,7 +131,7 @@ void EmulateTilt(AccelData* const accel // 180 degrees tilt_group->GetState(&roll, &pitch, 0, focus ? PI : 0); - unsigned int ud = 0, lr = 0, fb = 0; + unsigned int ud = 0, lr = 0, fb = 0; // some notes that no one will understand but me :p // left, forward, up @@ -156,7 +156,7 @@ void EmulateTilt(AccelData* const accel (&accel->x)[fb] = sin(pitch)*sgn[fb]; } -#define SWING_INTENSITY 2.5f//-uncalibrated(aprox) 0x40-calibrated +#define SWING_INTENSITY 2.5f//-uncalibrated(aprox) 0x40-calibrated void EmulateSwing(AccelData* const accel , ControllerEmu::Force* const swing_group @@ -169,9 +169,9 @@ void EmulateSwing(AccelData* const accel u8 axis_map[3]; // determine which axis is which direction - axis_map[0] = upright ? (sideways ? 0 : 1) : 2; // up/down - axis_map[1] = sideways; // left|right - axis_map[2] = upright ? 2 : (sideways ? 0 : 1); // forward/backward + axis_map[0] = upright ? (sideways ? 0 : 1) : 2; // up/down + axis_map[1] = sideways; // left|right + axis_map[2] = upright ? 2 : (sideways ? 0 : 1); // forward/backward // some orientations have up as positive, some as negative // same with forward @@ -263,7 +263,7 @@ Wiimote::Wiimote( const unsigned int index ) : m_index(index) , ir_sin(0) , ir_cos(1) -// , m_sound_stream( NULL ) +// , m_sound_stream( NULL ) { // ---- set up all the controls ---- @@ -329,7 +329,7 @@ std::string Wiimote::GetName() const } // if windows is focused or background input is enabled -#define HAS_FOCUS (Host_RendererHasFocus() || (m_options->settings[0]->value != 0)) +#define HAS_FOCUS (Host_RendererHasFocus() || (m_options->settings[0]->value != 0)) bool Wiimote::Step() { @@ -469,9 +469,8 @@ void Wiimote::GetIRData(u8* const data, bool use_accel) nsin=0; ncos=1; } - // PanicAlert("%d %d %d\nx:%f\nz:%f\nsin:%f\ncos:%f",accel->x,accel->y,accel->z,ax,az,sin,cos); - //PanicAlert("%d %d %d\n%d %d %d\n%d %d %d",accel->x,accel->y,accel->z,calib->zero_g.x,calib->zero_g.y,calib->zero_g.z, - // calib->one_g.x,calib->one_g.y,calib->one_g.z); + // PanicAlert("%d %d %d\nx:%f\nz:%f\nsin:%f\ncos:%f",accel->x,accel->y,accel->z,ax,az,sin,cos); + // PanicAlert("%d %d %d\n%d %d %d\n%d %d %d",accel->x,accel->y,accel->z,calib->zero_g.x,calib->zero_g.y,calib->zero_g.z, calib->one_g.x,calib->one_g.y,calib->one_g.z); } else { @@ -530,9 +529,9 @@ void Wiimote::GetIRData(u8* const data, bool use_accel) x[i]=(u16)round((v[i].x+1)/2*(camWidth-1)); y[i]=(u16)round((v[i].y+1)/2*(camHeight-1)); } - // PanicAlert("%f %f\n%f %f\n%f %f\n%f %f\n%d %d\n%d %d\n%d %d\n%d %d", - // v[0].x,v[0].y,v[1].x,v[1].y,v[2].x,v[2].y,v[3].x,v[3].y, - // x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[38]); + // PanicAlert("%f %f\n%f %f\n%f %f\n%f %f\n%d %d\n%d %d\n%d %d\n%d %d", + // v[0].x,v[0].y,v[1].x,v[1].y,v[2].x,v[2].y,v[3].x,v[3].y, + // x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[38]); } // Fill report with valid data when full handshake was done if (m_reg_ir.data[0x30]) @@ -895,7 +894,7 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface) { ControllerEmu::LoadDefaults(ciface); - #define set_control(group, num, str) (group)->controls[num]->control_ref->expression = (str) + #define set_control(group, num, str) (group)->controls[num]->control_ref->expression = (str) // Buttons #if defined HAVE_X11 && HAVE_X11 diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteHid.h b/Source/Core/Core/HW/WiimoteEmu/WiimoteHid.h index f417f810aa..e25edfc6cf 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteHid.h +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteHid.h @@ -347,8 +347,8 @@ struct wm_speaker_data // Custom structs /** - * @struct accel_t - * @brief Accelerometer struct. For any device with an accelerometer. + * @struct accel_t + * @brief Accelerometer struct. For any device with an accelerometer. */ struct accel_cal { diff --git a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp index 13728a9d72..e08e160f61 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp @@ -19,7 +19,7 @@ // Used for pair up #undef NTDDI_VERSION -#define NTDDI_VERSION NTDDI_WINXPSP2 +#define NTDDI_VERSION NTDDI_WINXPSP2 #include <bthdef.h> #include <BluetoothAPIs.h> @@ -49,7 +49,7 @@ typedef DWORD (__stdcall *PBth_BluetoothGetRadioInfo)(HANDLE, PBLUETOOTH_RADIO_I typedef DWORD (__stdcall *PBth_BluetoothRemoveDevice)(const BLUETOOTH_ADDRESS*); typedef DWORD (__stdcall *PBth_BluetoothSetServiceState)(HANDLE, const BLUETOOTH_DEVICE_INFO*, const GUID*, DWORD); typedef DWORD (__stdcall *PBth_BluetoothAuthenticateDevice)(HWND, HANDLE, BLUETOOTH_DEVICE_INFO*, PWCHAR, ULONG); -typedef DWORD (__stdcall *PBth_BluetoothEnumerateInstalledServices)(HANDLE, BLUETOOTH_DEVICE_INFO*, DWORD*, GUID*); +typedef DWORD (__stdcall *PBth_BluetoothEnumerateInstalledServices)(HANDLE, BLUETOOTH_DEVICE_INFO*, DWORD*, GUID*); PHidD_GetHidGuid HidD_GetHidGuid = NULL; PHidD_GetAttributes HidD_GetAttributes = NULL; @@ -244,7 +244,7 @@ void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimot // Don't mind me, just a random sleep to fix stuff on Windows //if (!wiimotes.empty()) - // SLEEP(2000); + // SLEEP(2000); } int CheckDeviceType_Write(HANDLE &dev_handle, const u8* buf, size_t size, int attempts) diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h index d4fef86c69..72db5a6d61 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h @@ -97,7 +97,7 @@ public: protected: Report m_last_input_report; - u16 m_channel; + u16 m_channel; private: void ClearReadQueue(); @@ -123,8 +123,8 @@ private: std::mutex m_thread_ready_mutex; std::condition_variable m_thread_ready_cond; - Common::FifoQueue<Report> m_read_reports; - Common::FifoQueue<Report> m_write_reports; + Common::FifoQueue<Report> m_read_reports; + Common::FifoQueue<Report> m_write_reports; Common::Timer m_last_audio_report; }; diff --git a/Source/Core/Core/IPC_HLE/ICMPWin.cpp b/Source/Core/Core/IPC_HLE/ICMPWin.cpp index 55ccb9e5c8..b1d3f5da97 100644 --- a/Source/Core/Core/IPC_HLE/ICMPWin.cpp +++ b/Source/Core/Core/IPC_HLE/ICMPWin.cpp @@ -53,10 +53,10 @@ u16 cksum(const u16 *buffer, int length) int icmp_echo_req(const u32 s, const sockaddr_in *addr, const u8 *data, const u32 data_length) { memset(workspace, 0, sizeof(workspace)); - icmp_hdr *header = (icmp_hdr *)workspace; - header->type = ICMP_ECHOREQ; - header->code = 0; - header->checksum = 0; + icmp_hdr *header = (icmp_hdr *)workspace; + header->type = ICMP_ECHOREQ; + header->code = 0; + header->checksum = 0; memcpy(&header->id, data, data_length); header->checksum = cksum((u16 *)header, ICMP_HDR_LEN + data_length); diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp index ba6cf7936b..1029a39ecb 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp @@ -72,8 +72,8 @@ IWII_IPC_HLE_Device* es_handles[ES_MAX_COUNT]; typedef std::deque<u32> ipc_msg_queue; -static ipc_msg_queue request_queue; // ppc -> arm -static ipc_msg_queue reply_queue; // arm -> ppc +static ipc_msg_queue request_queue; // ppc -> arm +static ipc_msg_queue reply_queue; // arm -> ppc static std::mutex s_reply_queue; static int enque_reply; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h index 37c14746f8..d47e2972f4 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h @@ -16,8 +16,8 @@ #define FS_EINVAL (u32)-4 // Invalid argument Invalid FD #define FS_ENOENT (u32)-6 // File not found #define FS_EBUSY (u32)-8 // Resource busy -#define FS_EIO (u32)-12 // Returned on ECC error -#define FS_ENOMEM (u32)-22 // Alloc failed during request +#define FS_EIO (u32)-12 // Returned on ECC error +#define FS_ENOMEM (u32)-22 // Alloc failed during request #define FS_EFATAL (u32)-101 // Fatal error #define FS_EACCESS (u32)-102 // Permission denied #define FS_ECORRUPT (u32)-103 // returned for "corrupted" NAND @@ -33,7 +33,7 @@ #define FS_EDIRDEPTH (u32)-116 // Max directory depth exceeded #define FS_EBUSY2 (u32)-118 // Resource busy //#define FS_EFATAL (u32)-119 // Fatal error not used by IOS as fatal ERROR -#define FS_EESEXHAUSTED (u32)-1016 // Max of 2 ES handles at a time +#define FS_EESEXHAUSTED (u32)-1016 // Max of 2 ES handles at a time // A struct for IOS ioctlv calls struct SIOCtlVBuffer diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp index 551cb1cf62..17009fb33d 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp @@ -24,8 +24,8 @@ using namespace DVDInterface; -#define DI_COVER_REG_INITIALIZED 0 // Should be 4, but doesn't work correctly... -#define DI_COVER_REG_NO_DISC 1 +#define DI_COVER_REG_INITIALIZED 0 // Should be 4, but doesn't work correctly... +#define DI_COVER_REG_NO_DISC 1 CWII_IPC_HLE_Device_di::CWII_IPC_HLE_Device_di(u32 _DeviceID, const std::string& _rDeviceName ) : IWII_IPC_HLE_Device(_DeviceID, _rDeviceName) @@ -72,11 +72,11 @@ bool CWII_IPC_HLE_Device_di::Close(u32 _CommandAddress, bool _bForce) bool CWII_IPC_HLE_Device_di::IOCtl(u32 _CommandAddress) { - u32 BufferIn = Memory::Read_U32(_CommandAddress + 0x10); - u32 BufferInSize = Memory::Read_U32(_CommandAddress + 0x14); - u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18); - u32 BufferOutSize = Memory::Read_U32(_CommandAddress + 0x1C); - u32 Command = Memory::Read_U32(BufferIn) >> 24; + u32 BufferIn = Memory::Read_U32(_CommandAddress + 0x10); + u32 BufferInSize = Memory::Read_U32(_CommandAddress + 0x14); + u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18); + u32 BufferOutSize = Memory::Read_U32(_CommandAddress + 0x1C); + u32 Command = Memory::Read_U32(BufferIn) >> 24; DEBUG_LOG(WII_IPC_DVD, "IOCtl Command(0x%08x) BufferIn(0x%08x, 0x%x) BufferOut(0x%08x, 0x%x)", Command, BufferIn, BufferInSize, BufferOut, BufferOutSize); @@ -453,8 +453,8 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32 int CWII_IPC_HLE_Device_di::GetCmdDelay(u32 _CommandAddress) { - u32 BufferIn = Memory::Read_U32(_CommandAddress + 0x10); - u32 Command = Memory::Read_U32(BufferIn) >> 24; + u32 BufferIn = Memory::Read_U32(_CommandAddress + 0x10); + u32 Command = Memory::Read_U32(BufferIn) >> 24; // Hacks below @@ -477,14 +477,14 @@ int CWII_IPC_HLE_Device_di::GetCmdDelay(u32 _CommandAddress) return SystemTimers::GetTicksPerSecond() / 146; break; -// case DVDLowAudioBufferConfig: -// case DVDLowInquiry: -// case DVDLowReadDiskID: -// case DVDLowWaitForCoverClose: -// case DVDLowGetCoverReg: -// case DVDLowGetCoverStatus: -// case DVDLowReset: -// case DVDLowClosePartition: + // case DVDLowAudioBufferConfig: + // case DVDLowInquiry: + // case DVDLowReadDiskID: + // case DVDLowWaitForCoverClose: + // case DVDLowGetCoverReg: + // case DVDLowGetCoverStatus: + // case DVDLowReset: + // case DVDLowClosePartition: default: // random numbers here! // More than ~1/2000th of a second hangs DKCR with DSP HLE, maybe. diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp index 1a8febe6fd..82f3fdaec4 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp @@ -66,7 +66,7 @@ void HLE_IPC_CreateVirtualFATFilesystem() } CWII_IPC_HLE_Device_FileIO::CWII_IPC_HLE_Device_FileIO(u32 _DeviceID, const std::string& _rDeviceName) - : IWII_IPC_HLE_Device(_DeviceID, _rDeviceName, false) // not a real hardware + : IWII_IPC_HLE_Device(_DeviceID, _rDeviceName, false) // not a real hardware , m_Mode(0) , m_SeekPos(0) { @@ -148,7 +148,7 @@ File::IOFile CWII_IPC_HLE_Device_FileIO::OpenFile() bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) { - u32 ReturnValue = FS_RESULT_FATAL; + u32 ReturnValue = FS_RESULT_FATAL; const s32 SeekPosition = Memory::Read_U32(_CommandAddress + 0xC); const s32 Mode = Memory::Read_U32(_CommandAddress + 0x10); @@ -210,8 +210,8 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) bool CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress) { u32 ReturnValue = FS_EACCESS; - const u32 Address = Memory::Read_U32(_CommandAddress + 0xC); // Read to this memory address - const u32 Size = Memory::Read_U32(_CommandAddress + 0x10); + const u32 Address = Memory::Read_U32(_CommandAddress + 0xC); // Read to this memory address + const u32 Size = Memory::Read_U32(_CommandAddress + 0x10); if (auto file = OpenFile()) @@ -249,9 +249,8 @@ bool CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress) bool CWII_IPC_HLE_Device_FileIO::Write(u32 _CommandAddress) { u32 ReturnValue = FS_EACCESS; - const u32 Address = Memory::Read_U32(_CommandAddress + 0xC); // Write data from this memory address - const u32 Size = Memory::Read_U32(_CommandAddress + 0x10); - + const u32 Address = Memory::Read_U32(_CommandAddress + 0xC); // Write data from this memory address + const u32 Size = Memory::Read_U32(_CommandAddress + 0x10); if (auto file = OpenFile()) { diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp index 8ae31d71f9..ecb4f0eb29 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -857,12 +857,12 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) case IOCTL_ES_ENCRYPT: { - u32 keyIndex = Memory::Read_U32(Buffer.InBuffer[0].m_Address); - u8* IV = Memory::GetPointer(Buffer.InBuffer[1].m_Address); - u8* source = Memory::GetPointer(Buffer.InBuffer[2].m_Address); - u32 size = Buffer.InBuffer[2].m_Size; - u8* newIV = Memory::GetPointer(Buffer.PayloadBuffer[0].m_Address); - u8* destination = Memory::GetPointer(Buffer.PayloadBuffer[1].m_Address); + u32 keyIndex = Memory::Read_U32(Buffer.InBuffer[0].m_Address); + u8* IV = Memory::GetPointer(Buffer.InBuffer[1].m_Address); + u8* source = Memory::GetPointer(Buffer.InBuffer[2].m_Address); + u32 size = Buffer.InBuffer[2].m_Size; + u8* newIV = Memory::GetPointer(Buffer.PayloadBuffer[0].m_Address); + u8* destination = Memory::GetPointer(Buffer.PayloadBuffer[1].m_Address); aes_context AES_ctx; aes_setkey_enc(&AES_ctx, keyTable[keyIndex], 128); @@ -988,7 +988,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) Memory::Write_U32(0, _CommandAddress + 0x4); ERROR_LOG(WII_IPC_ES, "IOCTL_ES_LAUNCH %016" PRIx64 " %08x %016" PRIx64 " %08x %016" PRIx64 " %04x", TitleID,view,ticketid,devicetype,titleid,access); - // IOCTL_ES_LAUNCH 0001000248414341 00000001 0001c0fef3df2cfa 00000000 0001000248414341 ffff + // IOCTL_ES_LAUNCH 0001000248414341 00000001 0001c0fef3df2cfa 00000000 0001000248414341 ffff // This is necessary because Reset(true) above deleted this object. Ew. @@ -1016,7 +1016,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) { WARN_LOG(WII_IPC_ES, "IOCTL_ES_GETDEVICECERT"); _dbg_assert_(WII_IPC_ES, Buffer.NumberPayloadBuffer == 1); - u8* destination = Memory::GetPointer(Buffer.PayloadBuffer[0].m_Address); + u8* destination = Memory::GetPointer(Buffer.PayloadBuffer[0].m_Address); EcWii &ec = EcWii::GetInstance(); get_ng_cert(destination, ec.getNgId(), ec.getNgKeyId(), ec.getNgPriv(), ec.getNgSig()); diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp index cae62b8f70..e4a690ceae 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp @@ -17,7 +17,7 @@ #include "../VolumeHandler.h" -#define MAX_NAME (12) +#define MAX_NAME 12 static Common::replace_v replacements; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp index 23f618f4fa..4a880a95da 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp @@ -205,7 +205,7 @@ bool CWII_IPC_HLE_Device_hid::IOCtl(u32 _CommandAddress) libusb_submit_transfer(transfer); //DEBUG_LOG(WII_IPC_HID, "HID::IOCtl(Control)(%02X, %02X) (BufferIn: (%08x, %i), BufferOut: (%08x, %i)", - // bmRequestType, bRequest, BufferIn, BufferInSize, BufferOut, BufferOutSize); + // bmRequestType, bRequest, BufferIn, BufferInSize, BufferOut, BufferOutSize); // It's the async way! return false; @@ -237,7 +237,7 @@ bool CWII_IPC_HLE_Device_hid::IOCtl(u32 _CommandAddress) libusb_submit_transfer(transfer); //DEBUG_LOG(WII_IPC_HID, "HID::IOCtl(Interrupt %s)(%d,%d,%X) (BufferIn: (%08x, %i), BufferOut: (%08x, %i)", - // Parameter == IOCTL_HID_INTERRUPT_IN ? "In" : "Out", endpoint, length, data, BufferIn, BufferInSize, BufferOut, BufferOutSize); + // Parameter == IOCTL_HID_INTERRUPT_IN ? "In" : "Out", endpoint, length, data, BufferIn, BufferInSize, BufferOut, BufferOutSize); // It's the async way! return false; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp index 0e6706f619..8458103908 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp @@ -951,9 +951,9 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtl(u32 _CommandAddress) } // No need to change fd or events as they are input only. - //Memory::Write_U32(ufds[i].fd, BufferOut + 0xc*i); //fd - //Memory::Write_U32(events, BufferOut + 0xc*i + 4); //events - Memory::Write_U32(revents, BufferOut + 0xc*i + 8); //revents + //Memory::Write_U32(ufds[i].fd, BufferOut + 0xc*i); //fd + //Memory::Write_U32(events, BufferOut + 0xc*i + 4); //events + Memory::Write_U32(revents, BufferOut + 0xc*i + 8); //revents DEBUG_LOG(WII_IPC_NET, "IOCTL_SO_POLL socket %d revents %08X events %08X", i, revents, ufds[i].events); } @@ -1030,7 +1030,7 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtl(u32 _CommandAddress) } //ERROR_LOG(WII_IPC_NET, "\n%s", - // ArrayToString(Memory::GetPointer(BufferOut), BufferOutSize, 16).c_str()); + // ArrayToString(Memory::GetPointer(BufferOut), BufferOutSize, 16).c_str()); ReturnValue = 0; } else diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h index 7041f38721..67e731d047 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h @@ -254,7 +254,7 @@ public: s32 CheckNwc24Config(void) { - if (Magic() != 0x57634366) /* 'WcCf' magic */ + if (Magic() != 0x57634366) /* 'WcCf' magic */ { ERROR_LOG(WII_IPC_WC24, "Magic mismatch"); return -14; diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp index ee4ca795fd..07ceef30e4 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp @@ -204,10 +204,10 @@ bool CWII_IPC_HLE_Device_sdio_slot0::IOCtl(u32 _CommandAddress) break; } -// INFO_LOG(WII_IPC_SD, "InBuffer"); -// DumpCommands(BufferIn, BufferInSize / 4, LogTypes::WII_IPC_SD); -// INFO_LOG(WII_IPC_SD, "OutBuffer"); -// DumpCommands(BufferOut, BufferOutSize/4, LogTypes::WII_IPC_SD); + // INFO_LOG(WII_IPC_SD, "InBuffer"); + // DumpCommands(BufferIn, BufferInSize / 4, LogTypes::WII_IPC_SD); + // INFO_LOG(WII_IPC_SD, "OutBuffer"); + // DumpCommands(BufferOut, BufferOutSize/4, LogTypes::WII_IPC_SD); if (ReturnValue == RET_EVENT_REGISTER) { @@ -333,7 +333,7 @@ u32 CWII_IPC_HLE_Device_sdio_slot0::ExecuteCommand(u32 _BufferIn, u32 _BufferInS case SEND_CSD: DEBUG_LOG(WII_IPC_SD, "SEND_CSD"); // <WntrMute> shuffle2_, OCR: 0x80ff8000 CID: 0x38a00000 0x480032d5 0x3c608030 0x8803d420 - // CSD: 0xff928040 0xc93efbcf 0x325f5a83 0x00002600 + // CSD: 0xff928040 0xc93efbcf 0x325f5a83 0x00002600 // Values used currently are from lpfaint99 Memory::Write_U32(0x80168000, _BufferOut); diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index bd5294fd8a..95f409a92b 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -150,7 +150,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::Close(u32 _CommandAddress, bool _bForc bool CWII_IPC_HLE_Device_usb_oh1_57e_305::IOCtl(u32 _CommandAddress) { //ERROR_LOG(WII_IPC_WIIMOTE, "Passing ioctl to ioctlv"); - return IOCtlV(_CommandAddress); //hack + return IOCtlV(_CommandAddress); // FIXME: Hack } bool CWII_IPC_HLE_Device_usb_oh1_57e_305::IOCtlV(u32 _CommandAddress) @@ -333,8 +333,8 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::SendACLPacket(u16 _ConnectionHandle, u DEBUG_LOG(WII_IPC_WIIMOTE, "ACL endpoint valid, sending packet to %08x", m_ACLEndpoint.m_address); hci_acldata_hdr_t* pHeader = (hci_acldata_hdr_t*)Memory::GetPointer(m_ACLEndpoint.m_buffer); - pHeader->con_handle = HCI_MK_CON_HANDLE(_ConnectionHandle, HCI_PACKET_START, HCI_POINT2POINT); - pHeader->length = _Size; + pHeader->con_handle = HCI_MK_CON_HANDLE(_ConnectionHandle, HCI_PACKET_START, HCI_POINT2POINT); + pHeader->length = _Size; // Write the packet to the buffer memcpy((u8*)pHeader + sizeof(hci_acldata_hdr_t), _pData, pHeader->length); @@ -607,9 +607,9 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventConnectionComplete(const bdad static char s_szLinkType[][128] = { - { "HCI_LINK_SCO 0x00 - Voice"}, - { "HCI_LINK_ACL 0x01 - Data"}, - { "HCI_LINK_eSCO 0x02 - eSCO"}, + { "HCI_LINK_SCO 0x00 - Voice"}, + { "HCI_LINK_ACL 0x01 - Data"}, + { "HCI_LINK_eSCO 0x02 - eSCO"}, }; INFO_LOG(WII_IPC_WIIMOTE, "Event: SendEventConnectionComplete"); @@ -642,9 +642,9 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventRequestConnection(CWII_IPC_HL static char LinkType[][128] = { - { "HCI_LINK_SCO 0x00 - Voice"}, - { "HCI_LINK_ACL 0x01 - Data" }, - { "HCI_LINK_eSCO 0x02 - eSCO" }, + { "HCI_LINK_SCO 0x00 - Voice"}, + { "HCI_LINK_ACL 0x01 - Data" }, + { "HCI_LINK_eSCO 0x02 - eSCO" }, }; INFO_LOG(WII_IPC_WIIMOTE, "Event: SendEventRequestConnection"); diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h index 5f5e73f8b9..6798f5d9a5 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h @@ -218,7 +218,7 @@ private: // Execute HCI Message void ExecuteHCICommandMessage(const SHCICommandMessage& _rCtrlMessage); - // OGF 0x01 Link control commands and return parameters + // OGF 0x01 - Link control commands and return parameters void CommandWriteInquiryMode(u8* _Input); void CommandWritePageScanType(u8* _Input); void CommandHostBufferSize(u8* _Input); @@ -237,11 +237,11 @@ private: void CommandDeleteStoredLinkKey(u8* _Input); void CommandChangeConPacketType(u8* _Input); - // OGF 0x02 Link policy commands and return parameters + // OGF 0x02 - Link policy commands and return parameters void CommandWriteLinkPolicy(u8* _Input); void CommandSniffMode(u8* _Input); - // OGF 0x03 Host Controller and Baseband commands and return parameters + // OGF 0x03 - Host Controller and Baseband commands and return parameters void CommandReset(u8* _Input); void CommandWriteLocalName(u8* _Input); void CommandWritePageTimeOut(u8* _Input); @@ -253,13 +253,13 @@ private: void CommandWriteInquiryScanType(u8* _Input); void CommandWriteLinkSupervisionTimeout(u8* _Input); - // OGF 0x04 Informational commands and return parameters + // OGF 0x04 - Informational commands and return parameters void CommandReadBufferSize(u8* _Input); void CommandReadLocalVer(u8* _Input); void CommandReadLocalFeatures(u8* _Input); void CommandReadBDAdrr(u8* _Input); - // OGF 0x3F Vendor specific + // OGF 0x3F - Vendor specific void CommandVendorSpecific_FC4C(u8* _Input, u32 _Size); void CommandVendorSpecific_FC4F(u8* _Input, u32 _Size); diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp index 9aaf0a537c..07f6d37774 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp @@ -404,7 +404,7 @@ void CWII_IPC_HLE_WiiMote::ReceiveConnectionResponse(u8 _Ident, u8* _pData, u32 INFO_LOG(WII_IPC_WIIMOTE, "[L2CAP] ReceiveConnectionResponse"); DEBUG_LOG(WII_IPC_WIIMOTE, " DCID: 0x%04x", rsp->dcid); DEBUG_LOG(WII_IPC_WIIMOTE, " SCID: 0x%04x", rsp->scid); - DEBUG_LOG(WII_IPC_WIIMOTE, " Result: 0x%04x", rsp->result); + DEBUG_LOG(WII_IPC_WIIMOTE, " Result: 0x%04x", rsp->result); DEBUG_LOG(WII_IPC_WIIMOTE, " Status: 0x%04x", rsp->status); _dbg_assert_(WII_IPC_WIIMOTE, rsp->result == L2CAP_SUCCESS); @@ -503,7 +503,7 @@ void CWII_IPC_HLE_WiiMote::ReceiveConfigurationResponse(u8 _Ident, u8* _pData, u INFO_LOG(WII_IPC_WIIMOTE, "[L2CAP] ReceiveConfigurationResponse"); DEBUG_LOG(WII_IPC_WIIMOTE, " SCID: 0x%04x", rsp->scid); DEBUG_LOG(WII_IPC_WIIMOTE, " Flags: 0x%04x", rsp->flags); - DEBUG_LOG(WII_IPC_WIIMOTE, " Result: 0x%04x", rsp->result); + DEBUG_LOG(WII_IPC_WIIMOTE, " Result: 0x%04x", rsp->result); _dbg_assert_(WII_IPC_WIIMOTE, rsp->result == L2CAP_SUCCESS); @@ -609,8 +609,8 @@ void CWII_IPC_HLE_WiiMote::SendConfigurationRequest(u16 scid, u16 MTU, u16 Flush if (MTU == 0) MTU = rChannel.MTU; pOptions = (l2cap_cfg_opt_t*)&Buffer[Offset]; Offset += sizeof(l2cap_cfg_opt_t); - pOptions->type = L2CAP_OPT_MTU; - pOptions->length = L2CAP_OPT_MTU_SIZE; + pOptions->type = L2CAP_OPT_MTU; + pOptions->length = L2CAP_OPT_MTU_SIZE; *(u16*)&Buffer[Offset] = MTU; Offset += L2CAP_OPT_MTU_SIZE; DEBUG_LOG(WII_IPC_WIIMOTE, " MTU: 0x%04x", MTU); } @@ -620,8 +620,8 @@ void CWII_IPC_HLE_WiiMote::SendConfigurationRequest(u16 scid, u16 MTU, u16 Flush if (FlushTimeOut == 0) FlushTimeOut = rChannel.FlushTimeOut; pOptions = (l2cap_cfg_opt_t*)&Buffer[Offset]; Offset += sizeof(l2cap_cfg_opt_t); - pOptions->type = L2CAP_OPT_FLUSH_TIMO; - pOptions->length = L2CAP_OPT_FLUSH_TIMO_SIZE; + pOptions->type = L2CAP_OPT_FLUSH_TIMO; + pOptions->length = L2CAP_OPT_FLUSH_TIMO_SIZE; *(u16*)&Buffer[Offset] = FlushTimeOut; Offset += L2CAP_OPT_FLUSH_TIMO_SIZE; DEBUG_LOG(WII_IPC_WIIMOTE, " FlushTimeOut: 0x%04x", FlushTimeOut); } @@ -734,8 +734,8 @@ int ParseAttribList(u8* pAttribIDList, u16& _startID, u16& _endID) void CWII_IPC_HLE_WiiMote::SDPSendServiceAttributeResponse(u16 cid, u16 TransactionID, u32 ServiceHandle, - u16 startAttrID, u16 endAttrID, - u16 MaximumAttributeByteCount, u8* pContinuationState) + u16 startAttrID, u16 endAttrID, + u16 MaximumAttributeByteCount, u8* pContinuationState) { if (ServiceHandle != 0x10000) { @@ -744,7 +744,7 @@ void CWII_IPC_HLE_WiiMote::SDPSendServiceAttributeResponse(u16 cid, u16 Transact } -// _dbg_assert_(WII_IPC_WIIMOTE, ServiceHandle == 0x10000); + // _dbg_assert_(WII_IPC_WIIMOTE, ServiceHandle == 0x10000); u32 contState = ParseCont(pContinuationState); @@ -767,12 +767,12 @@ void CWII_IPC_HLE_WiiMote::SDPSendServiceAttributeResponse(u16 cid, u16 Transact pHeader->length = (u16)(Offset - sizeof(l2cap_hdr_t)); m_pHost->SendACLPacket(GetConnectionHandle(), DataFrame, pHeader->length + sizeof(l2cap_hdr_t)); - // Debugger::PrintDataBuffer(LogTypes::WIIMOTE, DataFrame, pHeader->length + sizeof(l2cap_hdr_t), "test response: "); + // Debugger::PrintDataBuffer(LogTypes::WIIMOTE, DataFrame, pHeader->length + sizeof(l2cap_hdr_t), "test response: "); } void CWII_IPC_HLE_WiiMote::HandleSDP(u16 cid, u8* _pData, u32 _Size) { - // Debugger::PrintDataBuffer(LogTypes::WIIMOTE, _pData, _Size, "HandleSDP: "); + // Debugger::PrintDataBuffer(LogTypes::WIIMOTE, _pData, _Size, "HandleSDP: "); CBigEndianBuffer buffer(_pData); diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h index 68d04e37fa..18c1869758 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h @@ -51,8 +51,8 @@ public: bool LinkChannel(); void ResetChannels(); void Activate(bool ready); - void ExecuteL2capCmd(u8* _pData, u32 _Size); // From CPU - void ReceiveL2capData(u16 scid, const void* _pData, u32 _Size); // From wiimote + void ExecuteL2capCmd(u8* _pData, u32 _Size); // From CPU + void ReceiveL2capData(u16 scid, const void* _pData, u32 _Size); // From wiimote int NetPlay_GetWiimoteNum(int _number); diff --git a/Source/Core/Core/IPC_HLE/WII_Socket.cpp b/Source/Core/Core/IPC_HLE/WII_Socket.cpp index 06c1b361d3..4a4527ea4b 100644 --- a/Source/Core/Core/IPC_HLE/WII_Socket.cpp +++ b/Source/Core/Core/IPC_HLE/WII_Socket.cpp @@ -192,8 +192,8 @@ void WiiSocket::update(bool read, bool write, bool except) { case IOCTL_SO_FCNTL: { - u32 cmd = Memory::Read_U32(BufferIn + 4); - u32 arg = Memory::Read_U32(BufferIn + 8); + u32 cmd = Memory::Read_U32(BufferIn + 4); + u32 arg = Memory::Read_U32(BufferIn + 8); ReturnValue = _fcntl(cmd, arg); break; } diff --git a/Source/Core/Core/IPC_HLE/WII_Socket.h b/Source/Core/Core/IPC_HLE/WII_Socket.h index 5bfaa5a172..153ebc3b20 100644 --- a/Source/Core/Core/IPC_HLE/WII_Socket.h +++ b/Source/Core/Core/IPC_HLE/WII_Socket.h @@ -187,7 +187,7 @@ private: public: WiiSocket() : fd(-1), nonBlock(false) {} ~WiiSocket(); - void operator=(WiiSocket const&); // Don't implement + void operator=(WiiSocket const&); // Don't implement }; @@ -200,7 +200,7 @@ public: static WiiSockMan& getInstance() { static WiiSockMan instance; // Guaranteed to be destroyed. - return instance; // Instantiated on first use. + return instance; // Instantiated on first use. } void Update(); static void EnqueueReply(u32 CommandAddress, s32 ReturnValue); diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index 78be8c41dc..8b4f6330ec 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/Source/Core/Core/NetPlayClient.cpp @@ -879,7 +879,7 @@ u32 CEXIIPL::NetPlay_GetGCTime() std::lock_guard<std::mutex> lk(crit_netplay_client); if (netplay_client) - return NETPLAY_INITIAL_GCTIME; // watev + return NETPLAY_INITIAL_GCTIME; // watev else return 0; } diff --git a/Source/Core/Core/NetPlayProto.h b/Source/Core/Core/NetPlayProto.h index be99a8860a..a0a650e8a3 100644 --- a/Source/Core/Core/NetPlayProto.h +++ b/Source/Core/Core/NetPlayProto.h @@ -60,10 +60,10 @@ enum NP_MSG_PLAYER_PING_DATA = 0xE2, }; -typedef u8 MessageId; -typedef u8 PlayerId; -typedef s8 PadMapping; -typedef u32 FrameNum; +typedef u8 MessageId; +typedef u8 PlayerId; +typedef s8 PadMapping; +typedef u32 FrameNum; enum { @@ -72,6 +72,7 @@ enum CON_ERR_VERSION_MISMATCH = 3 }; -namespace NetPlay { +namespace NetPlay +{ bool IsNetPlayRunning(); }; diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp index 91fa402b6b..fa9e11b8ba 100644 --- a/Source/Core/Core/NetPlayServer.cpp +++ b/Source/Core/Core/NetPlayServer.cpp @@ -211,7 +211,7 @@ unsigned int NetPlayServer::OnConnect(sf::SocketTCP& socket) std::lock_guard<std::recursive_mutex> lkp(m_crit.players); m_players[socket] = player; std::lock_guard<std::recursive_mutex> lks(m_crit.send); - UpdatePadMapping(); // sync pad mappings with everyone + UpdatePadMapping(); // sync pad mappings with everyone UpdateWiimoteMapping(); } @@ -486,7 +486,7 @@ void NetPlayServer::SendChatMessage(const std::string& msg) { sf::Packet spac; spac << (MessageId)NP_MSG_CHAT_MESSAGE; - spac << (PlayerId)0; // server id always 0 + spac << (PlayerId)0; // server id always 0 spac << msg; std::lock_guard<std::recursive_mutex> lkp(m_crit.players); diff --git a/Source/Core/Core/NetPlayServer.h b/Source/Core/Core/NetPlayServer.h index 11a8138559..0ed10d4f55 100644 --- a/Source/Core/Core/NetPlayServer.h +++ b/Source/Core/Core/NetPlayServer.h @@ -79,7 +79,7 @@ private: PadMapping m_pad_map[4]; PadMapping m_wiimote_map[4]; - std::map<sf::SocketTCP, Client> m_players; + std::map<sf::SocketTCP, Client> m_players; struct { diff --git a/Source/Core/Core/PowerPC/GDBStub.cpp b/Source/Core/Core/PowerPC/GDBStub.cpp index 17eaf3471b..3b1fd3d863 100644 --- a/Source/Core/Core/PowerPC/GDBStub.cpp +++ b/Source/Core/Core/PowerPC/GDBStub.cpp @@ -492,13 +492,13 @@ static void gdb_read_registers() wbe32hex(bufptr + i*8, riPS0(i)); } bufptr += 32 * 8; - wbe32hex(bufptr, PC); bufptr += 4; - wbe32hex(bufptr, MSR); bufptr += 4; - wbe32hex(bufptr, GetCR()); bufptr += 4; - wbe32hex(bufptr, LR); bufptr += 4; + wbe32hex(bufptr, PC); bufptr += 4; + wbe32hex(bufptr, MSR); bufptr += 4; + wbe32hex(bufptr, GetCR()); bufptr += 4; + wbe32hex(bufptr, LR); bufptr += 4; - wbe32hex(bufptr, CTR); bufptr += 4; + wbe32hex(bufptr, CTR); bufptr += 4; wbe32hex(bufptr, PowerPC::ppcState.spr[SPR_XER]); bufptr += 4; // MQ register not used. wbe32hex(bufptr, 0x0BADC0DE); bufptr += 4; @@ -841,10 +841,10 @@ void gdb_init(u32 port) saddr_client.sin_addr.s_addr = ntohl(saddr_client.sin_addr.s_addr); /*if (((saddr_client.sin_addr.s_addr >> 24) & 0xff) != 127 || - * ((saddr_client.sin_addr.s_addr >> 16) & 0xff) != 0 || - * ((saddr_client.sin_addr.s_addr >> 8) & 0xff) != 0 || - * ((saddr_client.sin_addr.s_addr >> 0) & 0xff) != 1) - * ERROR_LOG(GDB_STUB, "gdb: incoming connection not from localhost"); + * ((saddr_client.sin_addr.s_addr >> 16) & 0xff) != 0 || + * ((saddr_client.sin_addr.s_addr >> 8) & 0xff) != 0 || + * ((saddr_client.sin_addr.s_addr >> 0) & 0xff) != 1) + * ERROR_LOG(GDB_STUB, "gdb: incoming connection not from localhost"); */ close(tmpsock); tmpsock = -1; diff --git a/Source/Core/Core/PowerPC/Gekko.h b/Source/Core/Core/PowerPC/Gekko.h index 2695b9a004..7fd0295b3b 100644 --- a/Source/Core/Core/PowerPC/Gekko.h +++ b/Source/Core/Core/PowerPC/Gekko.h @@ -259,10 +259,10 @@ union UGeckoInstruction }; struct { - u32 : 17; + u32 : 17; // Field mask, identifies the FPSCR fields to be updated by mtfsf - u32 FM : 8; - u32 : 7; + u32 FM : 8; + u32 : 7; }; // paired single quantized load/store @@ -289,7 +289,7 @@ union UGeckoInstruction struct { - u32 : 11; + u32 : 11; // Number of bytes to use in lswi/stswi (0 means 32 bytes) u32 NB : 5; }; @@ -774,15 +774,15 @@ enum }; // Exceptions -#define EXCEPTION_DECREMENTER 0x00000001 -#define EXCEPTION_SYSCALL 0x00000002 -#define EXCEPTION_EXTERNAL_INT 0x00000004 -#define EXCEPTION_DSI 0x00000008 -#define EXCEPTION_ISI 0x00000010 -#define EXCEPTION_ALIGNMENT 0x00000020 -#define EXCEPTION_FPU_UNAVAILABLE 0x00000040 -#define EXCEPTION_PROGRAM 0x00000080 -#define EXCEPTION_PERFORMANCE_MONITOR 0x00000100 +#define EXCEPTION_DECREMENTER 0x00000001 +#define EXCEPTION_SYSCALL 0x00000002 +#define EXCEPTION_EXTERNAL_INT 0x00000004 +#define EXCEPTION_DSI 0x00000008 +#define EXCEPTION_ISI 0x00000010 +#define EXCEPTION_ALIGNMENT 0x00000020 +#define EXCEPTION_FPU_UNAVAILABLE 0x00000040 +#define EXCEPTION_PROGRAM 0x00000080 +#define EXCEPTION_PERFORMANCE_MONITOR 0x00000100 inline s32 SignExt16(s16 x) {return (s32)(s16)x;} inline s32 SignExt26(u32 x) {return x & 0x2000000 ? (s32)(x | 0xFC000000) : (s32)(x);} diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter.h b/Source/Core/Core/PowerPC/Interpreter/Interpreter.h index b6b68bfcd5..f9f252d4ec 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter.h +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter.h @@ -60,7 +60,7 @@ public: static void fnmaddsx(UGeckoInstruction _inst); static void fnmsubsx(UGeckoInstruction _inst); static void fresx(UGeckoInstruction _inst); -// static void fsqrtsx(UGeckoInstruction _inst); + //static void fsqrtsx(UGeckoInstruction _inst); static void fsubsx(UGeckoInstruction _inst); static void fabsx(UGeckoInstruction _inst); static void fcmpo(UGeckoInstruction _inst); diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp index daa02c20a1..9056c6f717 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp @@ -40,9 +40,9 @@ void Interpreter::fcmpo(UGeckoInstruction _inst) int compareResult; - if (fa < fb) compareResult = 8; - else if (fa > fb) compareResult = 4; - else if (fa == fb) compareResult = 2; + if (fa < fb) compareResult = 8; + else if (fa > fb) compareResult = 4; + else if (fa == fb) compareResult = 2; else { FPSCR.FX = 1; @@ -71,9 +71,9 @@ void Interpreter::fcmpu(UGeckoInstruction _inst) int compareResult; - if (fa < fb) compareResult = 8; - else if (fa > fb) compareResult = 4; - else if (fa == fb) compareResult = 2; + if (fa < fb) compareResult = 8; + else if (fa > fb) compareResult = 4; + else if (fa == fb) compareResult = 2; else { compareResult = 1; @@ -483,7 +483,7 @@ void Interpreter::fsubx(UGeckoInstruction _inst) void Interpreter::fsubsx(UGeckoInstruction _inst) { rPS0(_inst.FD) = rPS1(_inst.FD) = ForceSingle(NI_sub(rPS0(_inst.FA), rPS0(_inst.FB))); - UpdateFPRF(rPS0(_inst.FD)); + UpdateFPRF(rPS0(_inst.FD)); if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD)); } diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp index d09d9bf724..4fd420b234 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp @@ -217,7 +217,7 @@ void Interpreter::cmp(UGeckoInstruction _inst) s32 a = (s32)m_GPR[_inst.RA]; s32 b = (s32)m_GPR[_inst.RB]; int fTemp = 0x8; // a < b - // if (a < b) fTemp = 0x8; else + // if (a < b) fTemp = 0x8; else if (a > b) fTemp = 0x4; else if (a == b) fTemp = 0x2; if (GetXER_SO()) PanicAlert("cmp getting overflow flag"); // fTemp |= 0x1 @@ -230,7 +230,7 @@ void Interpreter::cmpl(UGeckoInstruction _inst) u32 b = m_GPR[_inst.RB]; u32 fTemp = 0x8; // a < b - // if (a < b) fTemp = 0x8;else + // if (a < b) fTemp = 0x8;else if (a > b) fTemp = 0x4; else if (a == b) fTemp = 0x2; if (GetXER_SO()) PanicAlert("cmpl getting overflow flag"); // fTemp |= 0x1; diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp index c90598772c..05a209ba2a 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp @@ -8,43 +8,43 @@ // dequantize table const float m_dequantizeTable[] = { - 1.0 / (1 << 0), 1.0 / (1 << 1), 1.0 / (1 << 2), 1.0 / (1 << 3), - 1.0 / (1 << 4), 1.0 / (1 << 5), 1.0 / (1 << 6), 1.0 / (1 << 7), - 1.0 / (1 << 8), 1.0 / (1 << 9), 1.0 / (1 << 10), 1.0 / (1 << 11), - 1.0 / (1 << 12), 1.0 / (1 << 13), 1.0 / (1 << 14), 1.0 / (1 << 15), - 1.0 / (1 << 16), 1.0 / (1 << 17), 1.0 / (1 << 18), 1.0 / (1 << 19), - 1.0 / (1 << 20), 1.0 / (1 << 21), 1.0 / (1 << 22), 1.0 / (1 << 23), - 1.0 / (1 << 24), 1.0 / (1 << 25), 1.0 / (1 << 26), 1.0 / (1 << 27), - 1.0 / (1 << 28), 1.0 / (1 << 29), 1.0 / (1 << 30), 1.0 / (1 << 31), - (1ULL << 32), (1 << 31), (1 << 30), (1 << 29), - (1 << 28), (1 << 27), (1 << 26), (1 << 25), - (1 << 24), (1 << 23), (1 << 22), (1 << 21), - (1 << 20), (1 << 19), (1 << 18), (1 << 17), - (1 << 16), (1 << 15), (1 << 14), (1 << 13), - (1 << 12), (1 << 11), (1 << 10), (1 << 9), - (1 << 8), (1 << 7), (1 << 6), (1 << 5), - (1 << 4), (1 << 3), (1 << 2), (1 << 1), + 1.0 / (1 << 0), 1.0 / (1 << 1), 1.0 / (1 << 2), 1.0 / (1 << 3), + 1.0 / (1 << 4), 1.0 / (1 << 5), 1.0 / (1 << 6), 1.0 / (1 << 7), + 1.0 / (1 << 8), 1.0 / (1 << 9), 1.0 / (1 << 10), 1.0 / (1 << 11), + 1.0 / (1 << 12), 1.0 / (1 << 13), 1.0 / (1 << 14), 1.0 / (1 << 15), + 1.0 / (1 << 16), 1.0 / (1 << 17), 1.0 / (1 << 18), 1.0 / (1 << 19), + 1.0 / (1 << 20), 1.0 / (1 << 21), 1.0 / (1 << 22), 1.0 / (1 << 23), + 1.0 / (1 << 24), 1.0 / (1 << 25), 1.0 / (1 << 26), 1.0 / (1 << 27), + 1.0 / (1 << 28), 1.0 / (1 << 29), 1.0 / (1 << 30), 1.0 / (1 << 31), + (1ULL << 32), (1 << 31), (1 << 30), (1 << 29), + (1 << 28), (1 << 27), (1 << 26), (1 << 25), + (1 << 24), (1 << 23), (1 << 22), (1 << 21), + (1 << 20), (1 << 19), (1 << 18), (1 << 17), + (1 << 16), (1 << 15), (1 << 14), (1 << 13), + (1 << 12), (1 << 11), (1 << 10), (1 << 9), + (1 << 8), (1 << 7), (1 << 6), (1 << 5), + (1 << 4), (1 << 3), (1 << 2), (1 << 1), }; // quantize table const float m_quantizeTable[] = { - (1 << 0), (1 << 1), (1 << 2), (1 << 3), - (1 << 4), (1 << 5), (1 << 6), (1 << 7), - (1 << 8), (1 << 9), (1 << 10), (1 << 11), - (1 << 12), (1 << 13), (1 << 14), (1 << 15), - (1 << 16), (1 << 17), (1 << 18), (1 << 19), - (1 << 20), (1 << 21), (1 << 22), (1 << 23), - (1 << 24), (1 << 25), (1 << 26), (1 << 27), - (1 << 28), (1 << 29), (1 << 30), (1 << 31), - 1.0 / (1ULL << 32), 1.0 / (1 << 31), 1.0 / (1 << 30), 1.0 / (1 << 29), - 1.0 / (1 << 28), 1.0 / (1 << 27), 1.0 / (1 << 26), 1.0 / (1 << 25), - 1.0 / (1 << 24), 1.0 / (1 << 23), 1.0 / (1 << 22), 1.0 / (1 << 21), - 1.0 / (1 << 20), 1.0 / (1 << 19), 1.0 / (1 << 18), 1.0 / (1 << 17), - 1.0 / (1 << 16), 1.0 / (1 << 15), 1.0 / (1 << 14), 1.0 / (1 << 13), - 1.0 / (1 << 12), 1.0 / (1 << 11), 1.0 / (1 << 10), 1.0 / (1 << 9), - 1.0 / (1 << 8), 1.0 / (1 << 7), 1.0 / (1 << 6), 1.0 / (1 << 5), - 1.0 / (1 << 4), 1.0 / (1 << 3), 1.0 / (1 << 2), 1.0 / (1 << 1), + (1 << 0), (1 << 1), (1 << 2), (1 << 3), + (1 << 4), (1 << 5), (1 << 6), (1 << 7), + (1 << 8), (1 << 9), (1 << 10), (1 << 11), + (1 << 12), (1 << 13), (1 << 14), (1 << 15), + (1 << 16), (1 << 17), (1 << 18), (1 << 19), + (1 << 20), (1 << 21), (1 << 22), (1 << 23), + (1 << 24), (1 << 25), (1 << 26), (1 << 27), + (1 << 28), (1 << 29), (1 << 30), (1 << 31), + 1.0 / (1ULL << 32), 1.0 / (1 << 31), 1.0 / (1 << 30), 1.0 / (1 << 29), + 1.0 / (1 << 28), 1.0 / (1 << 27), 1.0 / (1 << 26), 1.0 / (1 << 25), + 1.0 / (1 << 24), 1.0 / (1 << 23), 1.0 / (1 << 22), 1.0 / (1 << 21), + 1.0 / (1 << 20), 1.0 / (1 << 19), 1.0 / (1 << 18), 1.0 / (1 << 17), + 1.0 / (1 << 16), 1.0 / (1 << 15), 1.0 / (1 << 14), 1.0 / (1 << 13), + 1.0 / (1 << 12), 1.0 / (1 << 11), 1.0 / (1 << 10), 1.0 / (1 << 9), + 1.0 / (1 << 8), 1.0 / (1 << 7), 1.0 / (1 << 6), 1.0 / (1 << 5), + 1.0 / (1 << 4), 1.0 / (1 << 3), 1.0 / (1 << 2), 1.0 / (1 << 1), }; template <class T> @@ -54,8 +54,7 @@ inline T CLAMP(T a, T bottom, T top) { return a; } -void Interpreter::Helper_Quantize(const u32 _Addr, const double _fValue, - const EQuantizeType _quantizeType, const unsigned int _uScale) +void Interpreter::Helper_Quantize(const u32 _Addr, const double _fValue, const EQuantizeType _quantizeType, const unsigned int _uScale) { switch (_quantizeType) { @@ -98,8 +97,7 @@ void Interpreter::Helper_Quantize(const u32 _Addr, const double _fValue, } } -float Interpreter::Helper_Dequantize(const u32 _Addr, const EQuantizeType _quantizeType, - const unsigned int _uScale) +float Interpreter::Helper_Dequantize(const u32 _Addr, const EQuantizeType _quantizeType, const unsigned int _uScale) { // dequantize the value float fResult; diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp index 991ae89b6e..601bdb0523 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp @@ -358,9 +358,9 @@ void Interpreter::ps_cmpu0(UGeckoInstruction _inst) double fb = rPS0(_inst.FB); int compareResult; - if (fa < fb) compareResult = 8; - else if (fa > fb) compareResult = 4; - else if (fa == fb) compareResult = 2; + if (fa < fb) compareResult = 8; + else if (fa > fb) compareResult = 4; + else if (fa == fb) compareResult = 2; else { compareResult = 1; @@ -379,9 +379,9 @@ void Interpreter::ps_cmpo0(UGeckoInstruction _inst) double fb = rPS0(_inst.FB); int compareResult; - if (fa < fb) compareResult = 8; - else if (fa > fb) compareResult = 4; - else if (fa == fb) compareResult = 2; + if (fa < fb) compareResult = 8; + else if (fa > fb) compareResult = 4; + else if (fa == fb) compareResult = 2; else { compareResult = 1; @@ -407,9 +407,9 @@ void Interpreter::ps_cmpu1(UGeckoInstruction _inst) double fb = rPS1(_inst.FB); int compareResult; - if (fa < fb) compareResult = 8; - else if (fa > fb) compareResult = 4; - else if (fa == fb) compareResult = 2; + if (fa < fb) compareResult = 8; + else if (fa > fb) compareResult = 4; + else if (fa == fb) compareResult = 2; else { compareResult = 1; @@ -428,9 +428,9 @@ void Interpreter::ps_cmpo1(UGeckoInstruction _inst) double fb = rPS1(_inst.FB); int compareResult; - if (fa < fb) compareResult = 8; - else if (fa > fb) compareResult = 4; - else if (fa == fb) compareResult = 2; + if (fa < fb) compareResult = 8; + else if (fa > fb) compareResult = 4; + else if (fa == fb) compareResult = 2; else { compareResult = 1; diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp index 475f7591ce..60c1410d42 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp @@ -468,6 +468,6 @@ void Interpreter::mffsx(UGeckoInstruction _inst) // TODO(ector): grab all overflow flags etc and set them in FPSCR UpdateFPSCR(); - riPS0(_inst.FD) = (u64)FPSCR.Hex; + riPS0(_inst.FD) = (u64)FPSCR.Hex; if (_inst.Rc) PanicAlert("mffsx: inst_.Rc"); } diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp index 4b29b1680a..ec50040f57 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp @@ -310,7 +310,7 @@ static GekkoOPTemplate table59[] = {18, Interpreter::fdivsx, {"fdivsx", OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 16, 0, 0, 0}}, // TODO {20, Interpreter::fsubsx, {"fsubsx", OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}}, {21, Interpreter::faddsx, {"faddsx", OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}}, -// {22, Interpreter::fsqrtsx, {"fsqrtsx", OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}}, // Not implemented on gekko + //{22, Interpreter::fsqrtsx, {"fsqrtsx", OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}}, // Not implemented on gekko {24, Interpreter::fresx, {"fresx", OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}}, {25, Interpreter::fmulsx, {"fmulsx", OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}}, {28, Interpreter::fmsubsx, {"fmsubsx", OPTYPE_FPU, FL_RC_BIT_F | FL_USE_FPU, 0, 0, 0, 0}}, diff --git a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp index dc81015573..47b20ec4de 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp @@ -44,7 +44,7 @@ static GekkoOPTemplate primarytable[] = {17, &Jit64::sc}, //"sc", OPTYPE_SYSTEM, FL_ENDBLOCK, 1}}, {7, &Jit64::mulli}, //"mulli", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_RC_BIT, 2}}, - {8, &Jit64::subfic}, //"subfic", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA}}, + {8, &Jit64::subfic}, //"subfic", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA}}, {10, &Jit64::cmpXX}, //"cmpli", OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn}}, {11, &Jit64::cmpXX}, //"cmpi", OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn}}, {12, &Jit64::reg_imm}, //"addic", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA}}, diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp index a1e28ac6ea..36cf011873 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp @@ -86,8 +86,8 @@ void Jit64::bx(UGeckoInstruction inst) if (destination == js.compilerPC) { //PanicAlert("Idle loop detected at %08x", destination); - // CALL(ProtectFunction(&CoreTiming::Idle, 0)); - // JMP(Asm::testExceptions, true); + // CALL(ProtectFunction(&CoreTiming::Idle, 0)); + // JMP(Asm::testExceptions, true); // make idle loops go faster js.downcountAmount += 8; } @@ -163,7 +163,7 @@ void Jit64::bcctrx(UGeckoInstruction inst) //NPC = CTR & 0xfffffffc; MOV(32, R(EAX), M(&CTR)); if (inst.LK_3) - MOV(32, M(&LR), Imm32(js.compilerPC + 4)); // LR = PC + 4; + MOV(32, M(&LR), Imm32(js.compilerPC + 4)); // LR = PC + 4; AND(32, R(EAX), Imm32(0xFFFFFFFC)); WriteExitDestInEAX(); } @@ -186,7 +186,7 @@ void Jit64::bcctrx(UGeckoInstruction inst) AND(32, R(EAX), Imm32(0xFFFFFFFC)); //MOV(32, M(&PC), R(EAX)); => Already done in WriteExitDestInEAX() if (inst.LK_3) - MOV(32, M(&LR), Imm32(js.compilerPC + 4)); // LR = PC + 4; + MOV(32, M(&LR), Imm32(js.compilerPC + 4)); // LR = PC + 4; WriteExitDestInEAX(); // Would really like to continue the block here, but it ends. TODO. SetJumpTarget(b); diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp index 6b15af18c6..9607e9a0c4 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp @@ -225,9 +225,9 @@ void Jit64::fcmpx(UGeckoInstruction inst) } //bool ordered = inst.SUBOP10 == 32; - int a = inst.FA; - int b = inst.FB; - int crf = inst.CRFD; + int a = inst.FA; + int b = inst.FB; + int crf = inst.CRFD; fpr.Lock(a,b); fpr.BindToRegister(b, true); @@ -245,7 +245,7 @@ void Jit64::fcmpx(UGeckoInstruction inst) } // if (B != B) or (A != A), goto NaN's jump target - pNaN = J_CC(CC_P); + pNaN = J_CC(CC_P); if (a != b) { diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp index 60fcc796d3..177708bf00 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp @@ -254,7 +254,8 @@ void Jit64::reg_imm(UGeckoInstruction inst) } break; case 15: - if (a == 0) { // lis + if (a == 0) // lis + { // Merge with next instruction if loading a 32-bits immediate value (lis + addi, lis + ori) if (!js.isLastInstruction && !Core::g_CoreStartupParameter.bEnableDebugging) { @@ -349,7 +350,7 @@ void Jit64::cmpXX(UGeckoInstruction inst) } else { - signedCompare = false; // silence compiler warning + signedCompare = false; // silence compiler warning PanicAlert("cmpXX"); } } diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp index 14fa4cf08f..4ebe583004 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp @@ -107,11 +107,11 @@ void Jit64::psq_l(UGeckoInstruction inst) CALLptr(MScaled(EDX, addr_scale, (u32)(u64)asm_routines.pairedLoadQuantized)); ABI_RestoreStack(0); -// MEMCHECK_START // FIXME: MMU does not work here because of unsafe memory access + // MEMCHECK_START // FIXME: MMU does not work here because of unsafe memory access CVTPS2PD(fpr.RX(inst.RS), R(XMM0)); -// MEMCHECK_END + // MEMCHECK_END gpr.UnlockAll(); gpr.UnlockAllX(); diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp index e5aa46e749..690d3d8ca8 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp @@ -93,7 +93,7 @@ void Jit64::mfspr(UGeckoInstruction inst) void Jit64::mtmsr(UGeckoInstruction inst) { INSTRUCTION_START - // Don't interpret this, if we do we get thrown out + // Don't interpret this, if we do we get thrown out //JITDISABLE(bJITSystemRegistersOff) if (!gpr.R(inst.RS).IsImm()) { diff --git a/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp index 6d1723b0fe..60ef5290ca 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp @@ -425,8 +425,9 @@ static void regMarkMemAddress(RegInfo& RI, InstLoc I, InstLoc AI, unsigned OpNum } // in 64-bit build, this returns a completely bizarre address sometimes! -static std::pair<OpArg, u32> regBuildMemAddress(RegInfo& RI, InstLoc I, - InstLoc AI, unsigned OpNum, unsigned Size, X64Reg* dest) { +static std::pair<OpArg, u32> regBuildMemAddress(RegInfo& RI, InstLoc I, InstLoc AI, + unsigned OpNum, unsigned Size, X64Reg* dest) +{ if (isImm(*AI)) { unsigned addr = RI.Build->GetImmValue(AI); if (Memory::IsRAMAddress(addr)) { diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp index 9d17b58f92..bd4a38fdcb 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp @@ -154,10 +154,10 @@ static inline uint64_t __rdtsc() return (uint64_t)hi << 32 | lo; #else __asm__ __volatile__ ( - "xor %%eax,%%eax;" - "push %%ebx;" + "xor %%eax,%%eax;" + "push %%ebx;" "cpuid;" - "pop %%ebx;" + "pop %%ebx;" ::: "%eax", "%ecx", "%edx"); __asm__ __volatile__ ("rdtsc" : "=a" (lo), "=d" (hi)); #endif @@ -315,7 +315,7 @@ void JitIL::WriteCallInterpreter(UGeckoInstruction inst) void JitIL::unknown_instruction(UGeckoInstruction inst) { - // CCPU::Break(); + // CCPU::Break(); PanicAlert("unknown_instruction %08x - Fix me ;)", inst.hex); } @@ -365,7 +365,6 @@ static void ImHere() return; } DEBUG_LOG(DYNA_REC, "I'm here - PC = %08x , LR = %08x", PC, LR); - // printf("I'm here - PC = %08x , LR = %08x", PC, LR); been_here[PC] = 1; } diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp b/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp index a9ed852452..0ed40947f6 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL_Tables.cpp @@ -46,7 +46,7 @@ static GekkoOPTemplate primarytable[] = {17, &JitIL::sc}, //"sc", OPTYPE_SYSTEM, FL_ENDBLOCK, 1}}, {7, &JitIL::mulli}, //"mulli", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_RC_BIT, 2}}, - {8, &JitIL::subfic}, //"subfic", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA}}, + {8, &JitIL::subfic}, //"subfic", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA}}, {10, &JitIL::cmpXX}, //"cmpli", OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn}}, {11, &JitIL::cmpXX}, //"cmpi", OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn}}, {12, &JitIL::reg_imm}, //"addic", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA}}, diff --git a/Source/Core/Core/PowerPC/JitArm32/Jit.cpp b/Source/Core/Core/PowerPC/JitArm32/Jit.cpp index e84c8d9f36..6b8e76eb9d 100644 --- a/Source/Core/Core/PowerPC/JitArm32/Jit.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/Jit.cpp @@ -497,7 +497,7 @@ const u8* JitArm::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlo } if (memory_exception) BKPT(0x500); - if (broken_block) + if (broken_block) { printf("Broken Block going to 0x%08x\n", nextPC); WriteExit(nextPC); diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_Branch.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_Branch.cpp index eac488a5b0..6d8ed81097 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_Branch.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_Branch.cpp @@ -66,9 +66,9 @@ void JitArm::rfi(UGeckoInstruction inst) gpr.Flush(); fpr.Flush(); - // See Interpreter rfi for details + // See Interpreter rfi for details const u32 mask = 0x87C0FFFF; - const u32 clearMSR13 = 0xFFFBFFFF; // Mask used to clear the bit MSR[13] + const u32 clearMSR13 = 0xFFFBFFFF; // Mask used to clear the bit MSR[13] // MSR = ((MSR & ~mask) | (SRR1 & mask)) & clearMSR13; // R0 = MSR location // R1 = MSR contents @@ -134,18 +134,18 @@ void JitArm::bx(UGeckoInstruction inst) destination = SignExt26(inst.LI << 2); else destination = js.compilerPC + SignExt26(inst.LI << 2); - #ifdef ACID_TEST - if (inst.LK) - { - MOV(R14, 0); - STRB(R14, R9, PPCSTATE_OFF(cr_fast[0])); - } - #endif - if (destination == js.compilerPC) +#ifdef ACID_TEST + if (inst.LK) + { + MOV(R14, 0); + STRB(R14, R9, PPCSTATE_OFF(cr_fast[0])); + } +#endif + if (destination == js.compilerPC) { - //PanicAlert("Idle loop detected at %08x", destination); - // CALL(ProtectFunction(&CoreTiming::Idle, 0)); - // JMP(Asm::testExceptions, true); + //PanicAlert("Idle loop detected at %08x", destination); + // CALL(ProtectFunction(&CoreTiming::Idle, 0)); + // JMP(Asm::testExceptions, true); // make idle loops go faster MOVI2R(R14, (u32)&CoreTiming::Idle); BL(R14); diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_Integer.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_Integer.cpp index 5b72bc0c2b..21d653d31b 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_Integer.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_Integer.cpp @@ -1005,7 +1005,7 @@ void JitArm::twx(UGeckoInstruction inst) SetJumpTarget(take5); LDR(RA, R9, PPCSTATE_OFF(Exceptions)); - MOVI2R(RB, EXCEPTION_PROGRAM); // XXX: Can be optimized + MOVI2R(RB, EXCEPTION_PROGRAM); // XXX: Can be optimized ORR(RA, RA, RB); STR(RA, R9, PPCSTATE_OFF(Exceptions)); WriteExceptionExit(); diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_SystemRegisters.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_SystemRegisters.cpp index 62b15e1d5e..bc0ded7d53 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_SystemRegisters.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_SystemRegisters.cpp @@ -197,7 +197,7 @@ void JitArm::mcrxr(UGeckoInstruction inst) void JitArm::mtmsr(UGeckoInstruction inst) { INSTRUCTION_START - // Don't interpret this, if we do we get thrown out + // Don't interpret this, if we do we get thrown out //JITDISABLE(bJITSystemRegistersOff) STR(gpr.R(inst.RS), R9, PPCSTATE_OFF(msr)); @@ -256,40 +256,40 @@ void JitArm::crXXX(UGeckoInstruction inst) // Compute combined bit switch(inst.SUBOP10) { - case 33: // crnor + case 33: // crnor ORR(rA, rA, rB); MVN(rA, rA); break; - case 129: // crandc + case 129: // crandc MVN(rB, rB); AND(rA, rA, rB); break; - case 193: // crxor + case 193: // crxor EOR(rA, rA, rB); break; - case 225: // crnand + case 225: // crnand AND(rA, rA, rB); MVN(rA, rA); break; - case 257: // crand + case 257: // crand AND(rA, rA, rB); break; - case 289: // creqv + case 289: // creqv EOR(rA, rA, rB); MVN(rA, rA); break; - case 417: // crorc + case 417: // crorc MVN(rA, rA); ORR(rA, rA, rB); break; - case 449: // cror + case 449: // cror ORR(rA, rA, rB); break; } diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_Tables.cpp index 7729cf498b..a999f449d2 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_Tables.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_Tables.cpp @@ -59,7 +59,7 @@ static GekkoOPTemplate primarytable[] = {17, &JitArm::sc}, //"sc", OPTYPE_SYSTEM, FL_ENDBLOCK, 1}}, {7, &JitArm::arith}, //"mulli", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_RC_BIT, 2}}, - {8, &JitArm::subfic}, //"subfic", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA}}, + {8, &JitArm::subfic}, //"subfic", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA}}, {10, &JitArm::cmpli}, //"cmpli", OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn}}, {11, &JitArm::cmpi}, //"cmpi", OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn}}, {12, &JitArm::arith}, //"addic", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA}}, diff --git a/Source/Core/Core/PowerPC/JitArm32/JitAsm.cpp b/Source/Core/Core/PowerPC/JitArm32/JitAsm.cpp index 2d619ceea3..33a2a1a70f 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitAsm.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitAsm.cpp @@ -43,42 +43,42 @@ JitArmAsmRoutineManager asm_routines; static const float GC_ALIGNED16(m_quantizeTableS[]) = { - (1 << 0), (1 << 1), (1 << 2), (1 << 3), - (1 << 4), (1 << 5), (1 << 6), (1 << 7), - (1 << 8), (1 << 9), (1 << 10), (1 << 11), - (1 << 12), (1 << 13), (1 << 14), (1 << 15), - (1 << 16), (1 << 17), (1 << 18), (1 << 19), - (1 << 20), (1 << 21), (1 << 22), (1 << 23), - (1 << 24), (1 << 25), (1 << 26), (1 << 27), - (1 << 28), (1 << 29), (1 << 30), (1 << 31), - 1.0 / (1ULL << 32), 1.0 / (1 << 31), 1.0 / (1 << 30), 1.0 / (1 << 29), - 1.0 / (1 << 28), 1.0 / (1 << 27), 1.0 / (1 << 26), 1.0 / (1 << 25), - 1.0 / (1 << 24), 1.0 / (1 << 23), 1.0 / (1 << 22), 1.0 / (1 << 21), - 1.0 / (1 << 20), 1.0 / (1 << 19), 1.0 / (1 << 18), 1.0 / (1 << 17), - 1.0 / (1 << 16), 1.0 / (1 << 15), 1.0 / (1 << 14), 1.0 / (1 << 13), - 1.0 / (1 << 12), 1.0 / (1 << 11), 1.0 / (1 << 10), 1.0 / (1 << 9), - 1.0 / (1 << 8), 1.0 / (1 << 7), 1.0 / (1 << 6), 1.0 / (1 << 5), - 1.0 / (1 << 4), 1.0 / (1 << 3), 1.0 / (1 << 2), 1.0 / (1 << 1), + (1 << 0), (1 << 1), (1 << 2), (1 << 3), + (1 << 4), (1 << 5), (1 << 6), (1 << 7), + (1 << 8), (1 << 9), (1 << 10), (1 << 11), + (1 << 12), (1 << 13), (1 << 14), (1 << 15), + (1 << 16), (1 << 17), (1 << 18), (1 << 19), + (1 << 20), (1 << 21), (1 << 22), (1 << 23), + (1 << 24), (1 << 25), (1 << 26), (1 << 27), + (1 << 28), (1 << 29), (1 << 30), (1 << 31), + 1.0 / (1ULL << 32), 1.0 / (1 << 31), 1.0 / (1 << 30), 1.0 / (1 << 29), + 1.0 / (1 << 28), 1.0 / (1 << 27), 1.0 / (1 << 26), 1.0 / (1 << 25), + 1.0 / (1 << 24), 1.0 / (1 << 23), 1.0 / (1 << 22), 1.0 / (1 << 21), + 1.0 / (1 << 20), 1.0 / (1 << 19), 1.0 / (1 << 18), 1.0 / (1 << 17), + 1.0 / (1 << 16), 1.0 / (1 << 15), 1.0 / (1 << 14), 1.0 / (1 << 13), + 1.0 / (1 << 12), 1.0 / (1 << 11), 1.0 / (1 << 10), 1.0 / (1 << 9), + 1.0 / (1 << 8), 1.0 / (1 << 7), 1.0 / (1 << 6), 1.0 / (1 << 5), + 1.0 / (1 << 4), 1.0 / (1 << 3), 1.0 / (1 << 2), 1.0 / (1 << 1), }; static const float GC_ALIGNED16(m_dequantizeTableS[]) = { - 1.0 / (1 << 0), 1.0 / (1 << 1), 1.0 / (1 << 2), 1.0 / (1 << 3), - 1.0 / (1 << 4), 1.0 / (1 << 5), 1.0 / (1 << 6), 1.0 / (1 << 7), - 1.0 / (1 << 8), 1.0 / (1 << 9), 1.0 / (1 << 10), 1.0 / (1 << 11), - 1.0 / (1 << 12), 1.0 / (1 << 13), 1.0 / (1 << 14), 1.0 / (1 << 15), - 1.0 / (1 << 16), 1.0 / (1 << 17), 1.0 / (1 << 18), 1.0 / (1 << 19), - 1.0 / (1 << 20), 1.0 / (1 << 21), 1.0 / (1 << 22), 1.0 / (1 << 23), - 1.0 / (1 << 24), 1.0 / (1 << 25), 1.0 / (1 << 26), 1.0 / (1 << 27), - 1.0 / (1 << 28), 1.0 / (1 << 29), 1.0 / (1 << 30), 1.0 / (1 << 31), - (1ULL << 32), (1 << 31), (1 << 30), (1 << 29), - (1 << 28), (1 << 27), (1 << 26), (1 << 25), - (1 << 24), (1 << 23), (1 << 22), (1 << 21), - (1 << 20), (1 << 19), (1 << 18), (1 << 17), - (1 << 16), (1 << 15), (1 << 14), (1 << 13), - (1 << 12), (1 << 11), (1 << 10), (1 << 9), - (1 << 8), (1 << 7), (1 << 6), (1 << 5), - (1 << 4), (1 << 3), (1 << 2), (1 << 1), + 1.0 / (1 << 0), 1.0 / (1 << 1), 1.0 / (1 << 2), 1.0 / (1 << 3), + 1.0 / (1 << 4), 1.0 / (1 << 5), 1.0 / (1 << 6), 1.0 / (1 << 7), + 1.0 / (1 << 8), 1.0 / (1 << 9), 1.0 / (1 << 10), 1.0 / (1 << 11), + 1.0 / (1 << 12), 1.0 / (1 << 13), 1.0 / (1 << 14), 1.0 / (1 << 15), + 1.0 / (1 << 16), 1.0 / (1 << 17), 1.0 / (1 << 18), 1.0 / (1 << 19), + 1.0 / (1 << 20), 1.0 / (1 << 21), 1.0 / (1 << 22), 1.0 / (1 << 23), + 1.0 / (1 << 24), 1.0 / (1 << 25), 1.0 / (1 << 26), 1.0 / (1 << 27), + 1.0 / (1 << 28), 1.0 / (1 << 29), 1.0 / (1 << 30), 1.0 / (1 << 31), + (1ULL << 32), (1 << 31), (1 << 30), (1 << 29), + (1 << 28), (1 << 27), (1 << 26), (1 << 25), + (1 << 24), (1 << 23), (1 << 22), (1 << 21), + (1 << 20), (1 << 19), (1 << 18), (1 << 17), + (1 << 16), (1 << 15), (1 << 14), (1 << 13), + (1 << 12), (1 << 11), (1 << 10), (1 << 9), + (1 << 8), (1 << 7), (1 << 6), (1 << 5), + (1 << 4), (1 << 3), (1 << 2), (1 << 1), }; static void WriteDual32(u32 value1, u32 value2, u32 address) diff --git a/Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp b/Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp index 0802266bf4..79fde16224 100644 --- a/Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp +++ b/Source/Core/Core/PowerPC/JitArmIL/JitIL.cpp @@ -50,7 +50,7 @@ void JitArmIL::Shutdown() } void JitArmIL::unknown_instruction(UGeckoInstruction inst) { - // CCPU::Break(); + // CCPU::Break(); PanicAlert("unknown_instruction %08x - Fix me ;)", inst.hex); } @@ -348,7 +348,7 @@ const u8* JitArmIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitB } if (memory_exception) BKPT(0x500); - if (broken_block) + if (broken_block) { printf("Broken Block going to 0x%08x\n", nextPC); WriteExit(nextPC); diff --git a/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.cpp b/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.cpp index bc8272f48c..db77323401 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.cpp @@ -77,42 +77,42 @@ static const u8 GC_ALIGNED16(pbswapShuffle2x4[16]) = {3, 2, 1, 0, 7, 6, 5, 4, 8, static const float GC_ALIGNED16(m_quantizeTableS[]) = { - (1 << 0), (1 << 1), (1 << 2), (1 << 3), - (1 << 4), (1 << 5), (1 << 6), (1 << 7), - (1 << 8), (1 << 9), (1 << 10), (1 << 11), - (1 << 12), (1 << 13), (1 << 14), (1 << 15), - (1 << 16), (1 << 17), (1 << 18), (1 << 19), - (1 << 20), (1 << 21), (1 << 22), (1 << 23), - (1 << 24), (1 << 25), (1 << 26), (1 << 27), - (1 << 28), (1 << 29), (1 << 30), (1 << 31), - 1.0 / (1ULL << 32), 1.0 / (1 << 31), 1.0 / (1 << 30), 1.0 / (1 << 29), - 1.0 / (1 << 28), 1.0 / (1 << 27), 1.0 / (1 << 26), 1.0 / (1 << 25), - 1.0 / (1 << 24), 1.0 / (1 << 23), 1.0 / (1 << 22), 1.0 / (1 << 21), - 1.0 / (1 << 20), 1.0 / (1 << 19), 1.0 / (1 << 18), 1.0 / (1 << 17), - 1.0 / (1 << 16), 1.0 / (1 << 15), 1.0 / (1 << 14), 1.0 / (1 << 13), - 1.0 / (1 << 12), 1.0 / (1 << 11), 1.0 / (1 << 10), 1.0 / (1 << 9), - 1.0 / (1 << 8), 1.0 / (1 << 7), 1.0 / (1 << 6), 1.0 / (1 << 5), - 1.0 / (1 << 4), 1.0 / (1 << 3), 1.0 / (1 << 2), 1.0 / (1 << 1), + (1 << 0), (1 << 1), (1 << 2), (1 << 3), + (1 << 4), (1 << 5), (1 << 6), (1 << 7), + (1 << 8), (1 << 9), (1 << 10), (1 << 11), + (1 << 12), (1 << 13), (1 << 14), (1 << 15), + (1 << 16), (1 << 17), (1 << 18), (1 << 19), + (1 << 20), (1 << 21), (1 << 22), (1 << 23), + (1 << 24), (1 << 25), (1 << 26), (1 << 27), + (1 << 28), (1 << 29), (1 << 30), (1 << 31), + 1.0 / (1ULL << 32), 1.0 / (1 << 31), 1.0 / (1 << 30), 1.0 / (1 << 29), + 1.0 / (1 << 28), 1.0 / (1 << 27), 1.0 / (1 << 26), 1.0 / (1 << 25), + 1.0 / (1 << 24), 1.0 / (1 << 23), 1.0 / (1 << 22), 1.0 / (1 << 21), + 1.0 / (1 << 20), 1.0 / (1 << 19), 1.0 / (1 << 18), 1.0 / (1 << 17), + 1.0 / (1 << 16), 1.0 / (1 << 15), 1.0 / (1 << 14), 1.0 / (1 << 13), + 1.0 / (1 << 12), 1.0 / (1 << 11), 1.0 / (1 << 10), 1.0 / (1 << 9), + 1.0 / (1 << 8), 1.0 / (1 << 7), 1.0 / (1 << 6), 1.0 / (1 << 5), + 1.0 / (1 << 4), 1.0 / (1 << 3), 1.0 / (1 << 2), 1.0 / (1 << 1), }; static const float GC_ALIGNED16(m_dequantizeTableS[]) = { - 1.0 / (1 << 0), 1.0 / (1 << 1), 1.0 / (1 << 2), 1.0 / (1 << 3), - 1.0 / (1 << 4), 1.0 / (1 << 5), 1.0 / (1 << 6), 1.0 / (1 << 7), - 1.0 / (1 << 8), 1.0 / (1 << 9), 1.0 / (1 << 10), 1.0 / (1 << 11), - 1.0 / (1 << 12), 1.0 / (1 << 13), 1.0 / (1 << 14), 1.0 / (1 << 15), - 1.0 / (1 << 16), 1.0 / (1 << 17), 1.0 / (1 << 18), 1.0 / (1 << 19), - 1.0 / (1 << 20), 1.0 / (1 << 21), 1.0 / (1 << 22), 1.0 / (1 << 23), - 1.0 / (1 << 24), 1.0 / (1 << 25), 1.0 / (1 << 26), 1.0 / (1 << 27), - 1.0 / (1 << 28), 1.0 / (1 << 29), 1.0 / (1 << 30), 1.0 / (1 << 31), - (1ULL << 32), (1 << 31), (1 << 30), (1 << 29), - (1 << 28), (1 << 27), (1 << 26), (1 << 25), - (1 << 24), (1 << 23), (1 << 22), (1 << 21), - (1 << 20), (1 << 19), (1 << 18), (1 << 17), - (1 << 16), (1 << 15), (1 << 14), (1 << 13), - (1 << 12), (1 << 11), (1 << 10), (1 << 9), - (1 << 8), (1 << 7), (1 << 6), (1 << 5), - (1 << 4), (1 << 3), (1 << 2), (1 << 1), + 1.0 / (1 << 0), 1.0 / (1 << 1), 1.0 / (1 << 2), 1.0 / (1 << 3), + 1.0 / (1 << 4), 1.0 / (1 << 5), 1.0 / (1 << 6), 1.0 / (1 << 7), + 1.0 / (1 << 8), 1.0 / (1 << 9), 1.0 / (1 << 10), 1.0 / (1 << 11), + 1.0 / (1 << 12), 1.0 / (1 << 13), 1.0 / (1 << 14), 1.0 / (1 << 15), + 1.0 / (1 << 16), 1.0 / (1 << 17), 1.0 / (1 << 18), 1.0 / (1 << 19), + 1.0 / (1 << 20), 1.0 / (1 << 21), 1.0 / (1 << 22), 1.0 / (1 << 23), + 1.0 / (1 << 24), 1.0 / (1 << 25), 1.0 / (1 << 26), 1.0 / (1 << 27), + 1.0 / (1 << 28), 1.0 / (1 << 29), 1.0 / (1 << 30), 1.0 / (1 << 31), + (1ULL << 32), (1 << 31), (1 << 30), (1 << 29), + (1 << 28), (1 << 27), (1 << 26), (1 << 25), + (1 << 24), (1 << 23), (1 << 22), (1 << 21), + (1 << 20), (1 << 19), (1 << 18), (1 << 17), + (1 << 16), (1 << 15), (1 << 14), (1 << 13), + (1 << 12), (1 << 11), (1 << 10), (1 << 9), + (1 << 8), (1 << 7), (1 << 6), (1 << 5), + (1 << 4), (1 << 3), (1 << 2), (1 << 1), }; static float GC_ALIGNED16(psTemp[4]); @@ -440,9 +440,9 @@ void CommonAsmRoutines::GenQuantizedLoads() RET(); const u8* loadPairedU8One = AlignCode4(); - UnsafeLoadRegToRegNoSwap(ECX, ECX, 8, 0); // ECX = 0x000000xx + UnsafeLoadRegToRegNoSwap(ECX, ECX, 8, 0); // ECX = 0x000000xx MOVD_xmm(XMM0, R(ECX)); - CVTDQ2PS(XMM0, R(XMM0)); // Is CVTSI2SS better? + CVTDQ2PS(XMM0, R(XMM0)); // Is CVTSI2SS better? SHR(32, R(EAX), Imm8(6)); MOVSS(XMM1, MDisp(EAX, (u32)(u64)m_dequantizeTableS)); MULSS(XMM0, R(XMM1)); diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/PowerPC/JitCommon/JitBase.h index 920d4611e3..a2625eb5fb 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitBase.h +++ b/Source/Core/Core/PowerPC/JitCommon/JitBase.h @@ -91,7 +91,7 @@ public: virtual void Jit(u32 em_address) = 0; - virtual const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx) = 0; + virtual const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx) = 0; virtual const CommonAsmRoutinesBase *GetAsmRoutines() = 0; diff --git a/Source/Core/Core/PowerPC/JitCommon/JitCache.h b/Source/Core/Core/PowerPC/JitCommon/JitCache.h index b1d7d9b6d7..143d62ea89 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitCache.h +++ b/Source/Core/Core/PowerPC/JitCommon/JitCache.h @@ -52,9 +52,9 @@ struct JitBlock #ifdef _WIN32 // we don't really need to save start and stop // TODO (mb2): ticStart and ticStop -> "local var" mean "in block" ... low priority ;) - u64 ticStart; // for profiling - time. - u64 ticStop; // for profiling - time. - u64 ticCounter; // for profiling - time. + u64 ticStart; // for profiling - time. + u64 ticStop; // for profiling - time. + u64 ticCounter; // for profiling - time. #endif #ifdef USE_VTUNE diff --git a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp index 49a83e1831..cd739acc8c 100644 --- a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp @@ -382,7 +382,7 @@ void EmuCodeBlock::SafeWriteFloatToReg(X64Reg xmm_value, X64Reg reg_addr, u32 re void EmuCodeBlock::WriteToConstRamAddress(int accessSize, const Gen::OpArg& arg, u32 address) { #ifdef _M_X64 - MOV(accessSize, MDisp(RBX, address & 0x3FFFFFFF), arg); + MOV(accessSize, MDisp(RBX, address & 0x3FFFFFFF), arg); #else MOV(accessSize, M((void*)(Memory::base + (address & Memory::MEMVIEW32_MASK))), arg); #endif diff --git a/Source/Core/Core/PowerPC/JitILCommon/IR.cpp b/Source/Core/Core/PowerPC/JitILCommon/IR.cpp index 3a4866f2f8..745b547a05 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/IR.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/IR.cpp @@ -77,38 +77,41 @@ integer code are more aggresively combining blocks and dead condition register elimination, which should be very helpful for small blocks. TODO (in no particular order): -JIT for misc remaining FP instructions -JIT for bcctrx -Misc optimizations for FP instructions -Inter-block dead register elimination; this seems likely to have large - performance benefits, although I'm not completely sure. -Inter-block inlining; also likely to have large performance benefits. - The tricky parts are deciding which blocks to inline, and that the - IR can't really deal with branches whose destination is in the - the middle of a generated block. -Specialized slw/srw/sraw; I think there are some tricks that could - have a non-trivial effect, and there are significantly shorter - implementations for 64-bit involving abusing 64-bit shifts. -64-bit compat (it should only be a few tweaks to register allocation and - the load/store code) -Scheduling to reduce register pressure: PowerPC compilers like to push - uses far away from definitions, but it's rather unfriendly to modern - x86 processors, which are short on registers and extremely good at - instruction reordering. -Common subexpression elimination -Optimize load/store of sum using complex addressing (partially implemented) -Loop optimizations (loop-carried registers, LICM) -Code refactoring/cleanup -Investigate performance of the JIT itself; this doesn't affect - framerates significantly, but it does take a visible amount - of time for a complicated piece of code like a video decoder - to compile. -Fix profiled loads/stores to work safely. On 32-bit, one solution is to - use a spare segment register, and expand the backpatch solution - to work in all the relevant situations. On 64-bit, the existing - fast memory solution should basically work. An alternative - would be to figure out a heuristic for what loads actually - vary their "type", and special-case them. +- JIT for misc remaining FP instructions +- JIT for bcctrx +- Misc optimizations for FP instructions +- Inter-block dead register elimination; this seems likely to have large + performance benefits, although I'm not completely sure. + +- Inter-block inlining; also likely to have large performance benefits. + The tricky parts are deciding which blocks to inline, and that the + IR can't really deal with branches whose destination is in the + the middle of a generated block. + +- Specialized slw/srw/sraw; I think there are some tricks that could + have a non-trivial effect, and there are significantly shorter + implementations for 64-bit involving abusing 64-bit shifts. + 64-bit compat (it should only be a few tweaks to register allocation and the load/store code) + +- Scheduling to reduce register pressure: PowerPCcompilers like to push + uses far away from definitions, but it's rather unfriendly to modern + x86 processors, which are short on registers and extremely good at instruction reordering. + +- Common subexpression elimination +- Optimize load/store of sum using complex addressing (partially implemented) +- Loop optimizations (loop-carried registers, LICM) +- Code refactoring/cleanup + +- Investigate performance of the JIT itself; this doesn't affect + framerates significantly, but it does take a visible amount + of time for a complicated piece of code like a video decoder to compile. + +- Fix profiled loads/stores to work safely. On 32-bit, one solution is to + use a spare segment register, and expand the backpatch solution + to work in all the relevant situations. On 64-bit, the existing + fast memory solution should basically work. An alternative + would be to figure out a heuristic for what loads actually + vary their "type", and special-case them. */ diff --git a/Source/Core/Core/PowerPC/JitILCommon/IR.h b/Source/Core/Core/PowerPC/JitILCommon/IR.h index 49a1e4e341..bf0822f85f 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/IR.h +++ b/Source/Core/Core/PowerPC/JitILCommon/IR.h @@ -65,14 +65,14 @@ enum Opcode { ICmpCRUnsigned, // CR for unsigned int compare ICmpEq, // One if equal, zero otherwise ICmpNe, - ICmpUgt, // One if op1 > op2, zero otherwise + ICmpUgt, // One if op1 > op2, zero otherwise ICmpUlt, ICmpUge, ICmpUle, - ICmpSgt, // One if op1 > op2, zero otherwise + ICmpSgt, // One if op1 > op2, zero otherwise ICmpSlt, ICmpSge, - ICmpSle, // Opposite of sgt + ICmpSle, // Opposite of sgt // Memory store operators Store8, Store16, @@ -147,9 +147,9 @@ enum Opcode { RFIExit, InterpreterBranch, - IdleBranch, // branch operation belonging to idle loop + IdleBranch, // branch operation belonging to idle loop ShortIdleLoop, // Idle loop seen in homebrew like wii mahjong, - // just a branch + // just a branch // used for exception checking, at least until someone // has a better idea of integrating it @@ -573,7 +573,7 @@ private: InstLoc isNeg(InstLoc I) const; std::vector<Inst> InstList; // FIXME: We must ensure this is continuous! - std::vector<bool> MarkUsed; // Used for IRWriter + std::vector<bool> MarkUsed; // Used for IRWriter std::vector<unsigned> ConstList; InstLoc curReadPtr; InstLoc GRegCache[32]; diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h b/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h index e92e27cfd0..1bc3d25f5f 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h @@ -31,7 +31,7 @@ public: virtual void Jit(u32 em_address) = 0; - virtual const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx) = 0; + virtual const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx) = 0; virtual const CommonAsmRoutinesBase *GetAsmRoutines() = 0; diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStorePaired.cpp index 9c1e3eb45b..cd2b17f758 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStorePaired.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStorePaired.cpp @@ -32,7 +32,7 @@ void JitILBase::psq_l(UGeckoInstruction inst) addr = ibuild.EmitAdd(addr, ibuild.EmitLoadGReg(inst.RA)); if (inst.OPCD == 57) ibuild.EmitStoreGReg(addr, inst.RA); - val = ibuild.EmitLoadPaired(addr, inst.I | (inst.W << 3)); // The lower 3 bits is for GQR index. The next 1 bit is for inst.W + val = ibuild.EmitLoadPaired(addr, inst.I | (inst.W << 3)); // The lower 3 bits is for GQR index. The next 1 bit is for inst.W val = ibuild.EmitExpandPackedToMReg(val); ibuild.EmitStoreFReg(val, inst.RD); } diff --git a/Source/Core/Core/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/PowerPC/PPCAnalyst.cpp index 67c92eaef0..b1fddf0514 100644 --- a/Source/Core/Core/PowerPC/PPCAnalyst.cpp +++ b/Source/Core/Core/PowerPC/PPCAnalyst.cpp @@ -287,7 +287,7 @@ u32 Flatten(u32 address, int *realsize, BlockStats *st, BlockRegStats *gpa, // Disabled the following optimization in preference of FAST_ICACHE //UGeckoInstruction previnst = Memory::Read_Opcode_JIT_LC(address - 4); //if (previnst.hex == 0x4e800020) - // st->isFirstBlockOfFunction = true; + // st->isFirstBlockOfFunction = true; gpa->any = true; fpa->any = false; diff --git a/Source/Core/Core/PowerPC/PPCTables.cpp b/Source/Core/Core/PowerPC/PPCTables.cpp index ce7d299f92..bda18339d5 100644 --- a/Source/Core/Core/PowerPC/PPCTables.cpp +++ b/Source/Core/Core/PowerPC/PPCTables.cpp @@ -88,24 +88,24 @@ bool UsesFPU(UGeckoInstruction _inst) { switch (_inst.OPCD) { - case 04: // PS + case 04: // PS return _inst.SUBOP10 != 1014; - case 48: // lfs - case 49: // lfsu - case 50: // lfd - case 51: // lfdu - case 52: // stfs - case 53: // stfsu - case 54: // stfd - case 55: // stfdu - case 56: // psq_l - case 57: // psq_lu - - case 59: // FPU-sgl - case 60: // psq_st - case 61: // psq_stu - case 63: // FPU-dbl + case 48: // lfs + case 49: // lfsu + case 50: // lfd + case 51: // lfdu + case 52: // stfs + case 53: // stfsu + case 54: // stfd + case 55: // stfdu + case 56: // psq_l + case 57: // psq_lu + + case 59: // FPU-sgl + case 60: // psq_st + case 61: // psq_stu + case 63: // FPU-dbl return true; case 31: diff --git a/Source/Core/Core/PowerPC/PowerPC.cpp b/Source/Core/Core/PowerPC/PowerPC.cpp index 2401f0bb65..00ecfaf443 100644 --- a/Source/Core/Core/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/PowerPC/PowerPC.cpp @@ -62,13 +62,13 @@ void DoState(PointerWrap &p) // it changes registers even in MODE_MEASURE (which is suspicious and seems like it could cause desyncs) // and because the values it's changing have been added to CoreTiming::DoState, so it might conflict to mess with them here. -// rSPR(SPR_DEC) = SystemTimers::GetFakeDecrementer(); -// *((u64 *)&TL) = SystemTimers::GetFakeTimeBase(); //works since we are little endian and TL comes first :) + // rSPR(SPR_DEC) = SystemTimers::GetFakeDecrementer(); + // *((u64 *)&TL) = SystemTimers::GetFakeTimeBase(); //works since we are little endian and TL comes first :) p.DoPOD(ppcState); -// SystemTimers::DecrementerSet(); -// SystemTimers::TimeBaseSet(); + // SystemTimers::DecrementerSet(); + // SystemTimers::TimeBaseSet(); JitInterface::DoState(p); } @@ -357,7 +357,7 @@ void CheckExceptions() else if (exceptions & EXCEPTION_FPU_UNAVAILABLE) { //This happens a lot - Gamecube OS uses deferred FPU context switching - SRR0 = PC; // re-execute the instruction + SRR0 = PC; // re-execute the instruction SRR1 = MSR & 0x87C0FFFF; MSR |= (MSR >> 16) & 1; MSR &= ~0x04EF36; diff --git a/Source/Core/Core/PowerPC/PowerPC.h b/Source/Core/Core/PowerPC/PowerPC.h index 2b5c58f09e..745181c8af 100644 --- a/Source/Core/Core/PowerPC/PowerPC.h +++ b/Source/Core/Core/PowerPC/PowerPC.h @@ -108,7 +108,7 @@ void OnIdleIL(); void UpdatePerformanceMonitor(u32 cycles, u32 num_load_stores, u32 num_fp_inst); - // Easy register access macros. +// Easy register access macros. #define HID0 ((UReg_HID0&)PowerPC::ppcState.spr[SPR_HID0]) #define HID2 ((UReg_HID2&)PowerPC::ppcState.spr[SPR_HID2]) #define HID4 ((UReg_HID4&)PowerPC::ppcState.spr[SPR_HID4]) @@ -126,7 +126,7 @@ void UpdatePerformanceMonitor(u32 cycles, u32 num_load_stores, u32 num_fp_inst); #define rSPR(i) PowerPC::ppcState.spr[i] #define LR PowerPC::ppcState.spr[SPR_LR] #define CTR PowerPC::ppcState.spr[SPR_CTR] -#define rDEC PowerPC::ppcState.spr[SPR_DEC] +#define rDEC PowerPC::ppcState.spr[SPR_DEC] #define SRR0 PowerPC::ppcState.spr[SPR_SRR0] #define SRR1 PowerPC::ppcState.spr[SPR_SRR1] #define SPRG0 PowerPC::ppcState.spr[SPR_SPRG0] @@ -134,10 +134,10 @@ void UpdatePerformanceMonitor(u32 cycles, u32 num_load_stores, u32 num_fp_inst); #define SPRG2 PowerPC::ppcState.spr[SPR_SPRG2] #define SPRG3 PowerPC::ppcState.spr[SPR_SPRG3] #define GQR(x) PowerPC::ppcState.spr[SPR_GQR0+x] -#define TL PowerPC::ppcState.spr[SPR_TL] -#define TU PowerPC::ppcState.spr[SPR_TU] +#define TL PowerPC::ppcState.spr[SPR_TL] +#define TU PowerPC::ppcState.spr[SPR_TU] -#define rPS0(i) (*(double*)(&PowerPC::ppcState.ps[i][0])) +#define rPS0(i) (*(double*)(&PowerPC::ppcState.ps[i][0])) #define rPS1(i) (*(double*)(&PowerPC::ppcState.ps[i][1])) #define riPS0(i) (*(u64*)(&PowerPC::ppcState.ps[i][0])) diff --git a/Source/Core/Core/PowerPC/Profiler.h b/Source/Core/Core/PowerPC/Profiler.h index 420b4244d4..771dc37a1e 100644 --- a/Source/Core/Core/PowerPC/Profiler.h +++ b/Source/Core/Core/PowerPC/Profiler.h @@ -8,24 +8,24 @@ #ifdef _WIN32 #ifdef _M_IX86 -#define PROFILER_QUERY_PERFORMANCE_COUNTER(pt) \ - LEA(32, EAX, M(pt)); PUSH(EAX); \ - CALL(QueryPerformanceCounter) +#define PROFILER_QUERY_PERFORMANCE_COUNTER(pt) \ + LEA(32, EAX, M(pt)); PUSH(EAX); \ + CALL(QueryPerformanceCounter) // TODO: r64 way // asm write : (u64) dt += t1-t0 -#define PROFILER_ADD_DIFF_LARGE_INTEGER(pdt, pt1, pt0) \ - MOV(32, R(EAX), M(pt1)); \ - SUB(32, R(EAX), M(pt0)); \ - MOV(32, R(ECX), M(((u8*)pt1) + 4)); \ - SBB(32, R(ECX), M(((u8*)pt0) + 4)); \ - ADD(32, R(EAX), M(pdt)); \ - MOV(32, R(EDX), M(((u8*)pdt) + 4)); \ - ADC(32, R(EDX), R(ECX)); \ - MOV(32, M(pdt), R(EAX)); \ - MOV(32, M(((u8*)pdt) + 4), R(EDX)) - -#define PROFILER_VPUSH PUSH(EAX);PUSH(ECX);PUSH(EDX) -#define PROFILER_VPOP POP(EDX);POP(ECX);POP(EAX) +#define PROFILER_ADD_DIFF_LARGE_INTEGER(pdt, pt1, pt0) \ + MOV(32, R(EAX), M(pt1)); \ + SUB(32, R(EAX), M(pt0)); \ + MOV(32, R(ECX), M(((u8*)pt1) + 4)); \ + SBB(32, R(ECX), M(((u8*)pt0) + 4)); \ + ADD(32, R(EAX), M(pdt)); \ + MOV(32, R(EDX), M(((u8*)pdt) + 4)); \ + ADC(32, R(EDX), R(ECX)); \ + MOV(32, M(pdt), R(EAX)); \ + MOV(32, M(((u8*)pdt) + 4), R(EDX)) + +#define PROFILER_VPUSH PUSH(EAX);PUSH(ECX);PUSH(EDX) +#define PROFILER_VPOP POP(EDX);POP(ECX);POP(EAX) #else diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp index dca68caeea..bc1069abc3 100644 --- a/Source/Core/Core/State.cpp +++ b/Source/Core/Core/State.cpp @@ -252,7 +252,7 @@ void CompressAndDumpState(CompressAndDumpState_args save_args) f.WriteArray(&header, 1); - if (0 != header.size) // non-zero header size means the state is compressed + if (header.size != 0) // non-zero header size means the state is compressed { lzo_uint i = 0; while (true) @@ -282,7 +282,7 @@ void CompressAndDumpState(CompressAndDumpState_args save_args) i += cur_len; } } - else // uncompressed + else // uncompressed { f.WriteBytes(buffer_data, buffer_size); } @@ -374,7 +374,7 @@ void LoadFileStateData(const std::string& filename, std::vector<u8>& ret_data) std::vector<u8> buffer; - if (0 != header.size) // non-zero size means the state is compressed + if (header.size != 0) // non-zero size means the state is compressed { Core::DisplayMessage("Decompressing State...", 500); @@ -402,7 +402,7 @@ void LoadFileStateData(const std::string& filename, std::vector<u8>& ret_data) i += new_len; } } - else // uncompressed + else // uncompressed { const size_t size = (size_t)(f.GetSize() - sizeof(StateHeader)); buffer.resize(size); diff --git a/Source/Core/Core/ec_wii.h b/Source/Core/Core/ec_wii.h index 0874fe5cef..56d09ae0b4 100644 --- a/Source/Core/Core/ec_wii.h +++ b/Source/Core/Core/ec_wii.h @@ -11,12 +11,12 @@ * * Structs for keys.bin taken from: * - * mini - a Free Software replacement for the Nintendo/BroadOn IOS. - * crypto hardware support + * mini - a Free Software replacement for the Nintendo/BroadOn IOS. + * crypto hardware support * - * Copyright (C) 2008, 2009 Haxx Enterprises <bushing@gmail.com> - * Copyright (C) 2008, 2009 Sven Peter <svenpeter@gmail.com> - * Copyright (C) 2008, 2009 Hector Martin "marcan" <marcan@marcansoft.com> + * Copyright (C) 2008, 2009 Haxx Enterprises <bushing@gmail.com> + * Copyright (C) 2008, 2009 Sven Peter <svenpeter@gmail.com> + * Copyright (C) 2008, 2009 Hector Martin "marcan" <marcan@marcansoft.com> * * # This code is licensed to you under the terms of the GNU GPL, version 2; * # see file COPYING or http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt diff --git a/Source/Core/Core/stdafx.h b/Source/Core/Core/stdafx.h index bc5046304d..167fccc549 100644 --- a/Source/Core/Core/stdafx.h +++ b/Source/Core/Core/stdafx.h @@ -9,6 +9,6 @@ #define _WIN32_IE 0x0500 // Default value is 0x0400 #endif -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #include <algorithm> diff --git a/Source/Core/DiscIO/DiscScrubber.cpp b/Source/Core/DiscIO/DiscScrubber.cpp index 445f25bfb1..a992d23a3a 100644 --- a/Source/Core/DiscIO/DiscScrubber.cpp +++ b/Source/Core/DiscIO/DiscScrubber.cpp @@ -238,7 +238,7 @@ bool ParseDisc() for (auto& rPartition : PartitionGroup[x].PartitionsVec) { - const SPartitionHeader& rHeader = rPartition.Header; + const SPartitionHeader& rHeader = rPartition.Header; MarkAsUsed(rPartition.Offset, 0x2c0); diff --git a/Source/Core/DiscIO/NANDContentLoader.cpp b/Source/Core/DiscIO/NANDContentLoader.cpp index e5b36c54d5..5f2f9af19e 100644 --- a/Source/Core/DiscIO/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/NANDContentLoader.cpp @@ -92,7 +92,7 @@ public: virtual ~CNANDContentLoader(); - bool IsValid() const override { return m_Valid; } + bool IsValid() const override { return m_Valid; } void RemoveTitle(void) const override; u64 GetTitleID() const override { return m_TitleID; } u16 GetIosVersion() const override { return m_IosVersion; } diff --git a/Source/Core/DiscIO/VolumeDirectory.cpp b/Source/Core/DiscIO/VolumeDirectory.cpp index 6a20db54a5..6f8141af13 100644 --- a/Source/Core/DiscIO/VolumeDirectory.cpp +++ b/Source/Core/DiscIO/VolumeDirectory.cpp @@ -240,8 +240,8 @@ std::string CVolumeDirectory::ExtractDirectoryName(const std::string& _rDirector if(lastSep != directoryName.size() - 1) { // TODO: This assumes that file names will always have a dot in them - // and directory names never will; both assumptions are often - // right but in general wrong. + // and directory names never will; both assumptions are often + // right but in general wrong. size_t extensionStart = directoryName.find_last_of('.'); if(extensionStart != std::string::npos && extensionStart > lastSep) { @@ -344,7 +344,7 @@ void CVolumeDirectory::BuildFST() // read data from physical disk to rootEntry u32 totalEntries = AddDirectoryEntries(m_rootDirectory, rootEntry) + 1; - m_fstNameOffset = totalEntries * ENTRY_SIZE; // offset in FST nameTable + m_fstNameOffset = totalEntries * ENTRY_SIZE; // offset in FST nameTable m_fstSize = m_fstNameOffset + m_totalNameSize; m_FSTData = new u8[(u32)m_fstSize]; diff --git a/Source/Core/DiscIO/VolumeGC.h b/Source/Core/DiscIO/VolumeGC.h index 3ed802cffb..0ace9eaaa7 100644 --- a/Source/Core/DiscIO/VolumeGC.h +++ b/Source/Core/DiscIO/VolumeGC.h @@ -11,7 +11,7 @@ namespace DiscIO { -class CVolumeGC : public IVolume +class CVolumeGC : public IVolume { public: CVolumeGC(IBlobReader* _pReader); diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.h b/Source/Core/DiscIO/VolumeWiiCrypted.h index 9ff9b999b3..04401778d7 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.h +++ b/Source/Core/DiscIO/VolumeWiiCrypted.h @@ -12,7 +12,7 @@ namespace DiscIO { -class CVolumeWiiCrypted : public IVolume +class CVolumeWiiCrypted : public IVolume { public: CVolumeWiiCrypted(IBlobReader* _pReader, u64 _VolumeOffset, const unsigned char* _pVolumeKey); diff --git a/Source/Core/DolphinWX/ARCodeAddEdit.cpp b/Source/Core/DolphinWX/ARCodeAddEdit.cpp index d3dacf5fdf..fd6b9add77 100644 --- a/Source/Core/DolphinWX/ARCodeAddEdit.cpp +++ b/Source/Core/DolphinWX/ARCodeAddEdit.cpp @@ -44,9 +44,9 @@ CARCodeAddEdit::CARCodeAddEdit(int _selection, wxWindow* parent, wxWindowID id, UpdateTextCtrl(tempEntries); sgEntry->Add(EditCheatNameText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER|wxALL, 5); - sgEntry->Add(EditCheatName, wxGBPosition(0, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5); - sgEntry->Add(EntrySelection, wxGBPosition(0, 2), wxGBSpan(2, 1), wxEXPAND|wxALL, 5); - sgEntry->Add(EditCheatCode, wxGBPosition(1, 0), wxGBSpan(1, 2), wxEXPAND|wxALL, 5); + sgEntry->Add(EditCheatName, wxGBPosition(0, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5); + sgEntry->Add(EntrySelection, wxGBPosition(0, 2), wxGBSpan(2, 1), wxEXPAND|wxALL, 5); + sgEntry->Add(EditCheatCode, wxGBPosition(1, 0), wxGBSpan(1, 2), wxEXPAND|wxALL, 5); sgEntry->AddGrowableCol(1); sgEntry->AddGrowableRow(1); sbEntry->Add(sgEntry, 1, wxEXPAND|wxALL); diff --git a/Source/Core/DolphinWX/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Android/ButtonManager.cpp index 7d4fb97f3d..257237252f 100644 --- a/Source/Core/DolphinWX/Android/ButtonManager.cpp +++ b/Source/Core/DolphinWX/Android/ButtonManager.cpp @@ -25,26 +25,28 @@ namespace ButtonManager std::map<std::pair<int, int>, Button*> m_buttons; std::map<std::pair<int, int>, Axis*> m_axises; std::unordered_map<std::string, InputDevice*> m_controllers; - const char* configStrings[] = { "InputA", - "InputB", - "InputStart", - "InputX", - "InputY", - "InputZ", - "DPadUp", - "DPadDown", - "DPadLeft", - "DPadRight", - "MainUp", - "MainDown", - "MainLeft", - "MainRight", - "CStickUp", - "CStickDown", - "CStickLeft", - "CStickRight", - "InputL", - "InputR" }; + const char* configStrings[] = { + "InputA", + "InputB", + "InputStart", + "InputX", + "InputY", + "InputZ", + "DPadUp", + "DPadDown", + "DPadLeft", + "DPadRight", + "MainUp", + "MainDown", + "MainLeft", + "MainRight", + "CStickUp", + "CStickDown", + "CStickLeft", + "CStickRight", + "InputL", + "InputR" + }; const int configStringNum = 20; void AddBind(std::string dev, sBind *bind) diff --git a/Source/Core/DolphinWX/CheatsWindow.cpp b/Source/Core/DolphinWX/CheatsWindow.cpp index 8bea682734..a1ed7c6fe5 100644 --- a/Source/Core/DolphinWX/CheatsWindow.cpp +++ b/Source/Core/DolphinWX/CheatsWindow.cpp @@ -14,7 +14,7 @@ #include "Frame.h" #include "WxUtils.h" -#define MAX_CHEAT_SEARCH_RESULTS_DISPLAY 256 +#define MAX_CHEAT_SEARCH_RESULTS_DISPLAY 256 extern std::vector<ActionReplay::ARCode> arCodes; extern CFrame* main_frame; @@ -424,7 +424,7 @@ void CheatSearchTab::FilterCheatSearchResults(wxCommandEvent&) const int filters[] = {7, 6, 1, 2, 4}; int filter_mask = filters[search_type->GetSelection()]; - if (value_x_radiobtn.rad_oldvalue->GetValue()) // using old value comparison + if (value_x_radiobtn.rad_oldvalue->GetValue()) // using old value comparison { for (; i!=e; ++i) { @@ -442,7 +442,7 @@ void CheatSearchTab::FilterCheatSearchResults(wxCommandEvent&) } } } - else // using user entered x value comparison + else // using user entered x value comparison { u32 user_x_val; @@ -638,7 +638,7 @@ void CreateCodeDialog::PressOK(wxCommandEvent& ev) arCodes.push_back(new_cheat); // save the gameini isoprops.SaveGameConfig(); - isoprops.ActionReplayList_Load(); // loads the new arcodes + isoprops.ActionReplayList_Load(); // loads the new arcodes //ActionReplay::UpdateActiveList(); } diff --git a/Source/Core/DolphinWX/CheatsWindow.h b/Source/Core/DolphinWX/CheatsWindow.h index 6ebbbad1a1..a4a654d601 100644 --- a/Source/Core/DolphinWX/CheatsWindow.h +++ b/Source/Core/DolphinWX/CheatsWindow.h @@ -60,13 +60,13 @@ protected: u32 old_value; }; - std::vector<CheatSearchResult> search_results; + std::vector<CheatSearchResult> search_results; unsigned int search_type_size; wxChoice* search_type; - wxListBox* lbox_search_results; + wxListBox* lbox_search_results; wxStaticText* label_results_count; - wxTextCtrl* textctrl_value_x; + wxTextCtrl* textctrl_value_x; wxButton *btnInitScan, *btnNextScan; struct diff --git a/Source/Core/DolphinWX/ConfigMain.cpp b/Source/Core/DolphinWX/ConfigMain.cpp index 75f0d17d94..4bf477d4fe 100644 --- a/Source/Core/DolphinWX/ConfigMain.cpp +++ b/Source/Core/DolphinWX/ConfigMain.cpp @@ -84,23 +84,23 @@ static const wxLanguage langIds[] = }; // Strings for Device Selections -#define DEV_NONE_STR _trans("<Nothing>") -#define DEV_DUMMY_STR _trans("Dummy") - -#define SIDEV_STDCONT_STR _trans("Standard Controller") -#define SIDEV_STEERING_STR _trans("Steering Wheel") -#define SIDEV_DANCEMAT_STR _trans("Dance Mat") -#define SIDEV_BONGO_STR _trans("TaruKonga (Bongos)") -#define SIDEV_GBA_STR "GBA" -#define SIDEV_AM_BB_STR _trans("AM-Baseboard") - -#define EXIDEV_MEMCARD_STR _trans("Memory Card") -#define EXIDEV_MIC_STR _trans("Mic") -#define EXIDEV_BBA_STR "BBA" -#define EXIDEV_AM_BB_STR _trans("AM-Baseboard") -#define EXIDEV_GECKO_STR "USBGecko" - -#define WXSTR_TRANS(a) wxString(wxGetTranslation(wxT(a))) +#define DEV_NONE_STR _trans("<Nothing>") +#define DEV_DUMMY_STR _trans("Dummy") + +#define SIDEV_STDCONT_STR _trans("Standard Controller") +#define SIDEV_STEERING_STR _trans("Steering Wheel") +#define SIDEV_DANCEMAT_STR _trans("Dance Mat") +#define SIDEV_BONGO_STR _trans("TaruKonga (Bongos)") +#define SIDEV_GBA_STR "GBA" +#define SIDEV_AM_BB_STR _trans("AM-Baseboard") + +#define EXIDEV_MEMCARD_STR _trans("Memory Card") +#define EXIDEV_MIC_STR _trans("Mic") +#define EXIDEV_BBA_STR "BBA" +#define EXIDEV_AM_BB_STR _trans("AM-Baseboard") +#define EXIDEV_GECKO_STR "USBGecko" + +#define WXSTR_TRANS(a) wxString(wxGetTranslation(wxT(a))) #ifdef WIN32 //only used with xgettext to be picked up as translatable string. //win32 does not have wx on its path, the provided wxALL_FILES @@ -246,7 +246,7 @@ void CConfigMain::InitializeGUILists() arrayStringFor_Framelimit.Add(_("Off")); arrayStringFor_Framelimit.Add(_("Auto")); arrayStringFor_Framelimit.Add(_("Audio")); - for (int i = 10; i <= 120; i += 5) // from 10 to 120 + for (int i = 10; i <= 120; i += 5) // from 10 to 120 arrayStringFor_Framelimit.Add(wxString::Format(wxT("%i"), i)); // Emulator Engine @@ -1090,7 +1090,7 @@ void CConfigMain::ChooseMemcardPath(std::string& strMemcard, bool isSlotA) ExpansionInterface::ChangeDevice( isSlotA ? 0 : 1, // SlotA: channel 0, SlotB channel 1 EXIDEVICE_MEMORYCARD, - 0); // SP1 is device 2, slots are device 0 + 0); // SP1 is device 2, slots are device 0 } } else @@ -1159,9 +1159,9 @@ void CConfigMain::ChooseEXIDevice(wxString deviceName, int deviceNum) { // Change plugged device! :D ExpansionInterface::ChangeDevice( - (deviceNum == 1) ? 1 : 0, // SlotB is on channel 1, slotA and SP1 are on 0 - tempType, // The device enum to change to - (deviceNum == 2) ? 2 : 0); // SP1 is device 2, slots are device 0 + (deviceNum == 1) ? 1 : 0, // SlotB is on channel 1, slotA and SP1 are on 0 + tempType, // The device enum to change to + (deviceNum == 2) ? 2 : 0); // SP1 is device 2, slots are device 0 } } @@ -1311,7 +1311,7 @@ inline u8 CConfigMain::GetSADRCountryCode(int language) case 1: //English countrycode = 49; // United States break; - case 2: //German + case 2: //German countrycode = 78; //Germany break; case 3: //French @@ -1323,7 +1323,7 @@ inline u8 CConfigMain::GetSADRCountryCode(int language) case 5: //Italian countrycode = 83; //Italy break; - case 6: //Dutch + case 6: //Dutch countrycode = 94; //Netherlands break; case 7: //Simplified Chinese diff --git a/Source/Core/DolphinWX/ConfigMain.h b/Source/Core/DolphinWX/ConfigMain.h index 04ccc965fe..93c545d87a 100644 --- a/Source/Core/DolphinWX/ConfigMain.h +++ b/Source/Core/DolphinWX/ConfigMain.h @@ -135,13 +135,13 @@ private: // Audio wxBoxSizer* sAudioPage; // GC settings wxRadioBox* DSPEngine; - wxSlider* VolumeSlider; + wxSlider* VolumeSlider; wxStaticText* VolumeText; - wxCheckBox* DumpAudio; - wxCheckBox* DPL2Decoder; + wxCheckBox* DumpAudio; + wxCheckBox* DPL2Decoder; wxArrayString wxArrayBackends; - wxChoice* BackendSelection; - wxSpinCtrl* Latency; + wxChoice* BackendSelection; + wxSpinCtrl* Latency; // Interface wxCheckBox* ConfirmStop; diff --git a/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp b/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp index ed00fd2fdf..a83db3abe0 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp @@ -26,12 +26,9 @@ public: { SetToolBitmapSize(wxSize(24, 24)); - m_Bitmaps[Toolbar_Delete] = - wxBitmap(wxGetBitmapFromMemory(toolbar_delete_png).ConvertToImage().Rescale(24, 24)); - m_Bitmaps[Toolbar_Add_BP] = - wxBitmap(wxGetBitmapFromMemory(toolbar_add_breakpoint_png).ConvertToImage().Rescale(24, 24)); - m_Bitmaps[Toolbar_Add_MC] = - wxBitmap(wxGetBitmapFromMemory(toolbar_add_memcheck_png).ConvertToImage().Rescale(24, 24)); + m_Bitmaps[Toolbar_Delete] = wxBitmap(wxGetBitmapFromMemory(toolbar_delete_png).ConvertToImage().Rescale(24, 24)); + m_Bitmaps[Toolbar_Add_BP] = wxBitmap(wxGetBitmapFromMemory(toolbar_add_breakpoint_png).ConvertToImage().Rescale(24, 24)); + m_Bitmaps[Toolbar_Add_MC] = wxBitmap(wxGetBitmapFromMemory(toolbar_add_memcheck_png).ConvertToImage().Rescale(24, 24)); AddTool(ID_DELETE, wxT("Delete"), m_Bitmaps[Toolbar_Delete]); Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::OnDelete, parent, ID_DELETE); @@ -85,8 +82,8 @@ BEGIN_EVENT_TABLE(CBreakPointWindow, wxPanel) END_EVENT_TABLE() CBreakPointWindow::CBreakPointWindow(CCodeWindow* _pCodeWindow, wxWindow* parent, - wxWindowID id, const wxString& title, const wxPoint& position, - const wxSize& size, long style) + wxWindowID id, const wxString& title, const wxPoint& position, + const wxSize& size, long style) : wxPanel(parent, id, position, size, style, title) , m_pCodeWindow(_pCodeWindow) { diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp index 2094455cec..1720dcb887 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp @@ -59,12 +59,12 @@ BEGIN_EVENT_TABLE(CCodeWindow, wxPanel) EVT_TEXT(IDM_ADDRBOX, CCodeWindow::OnAddrBoxChange) // Other - EVT_LISTBOX(ID_SYMBOLLIST, CCodeWindow::OnSymbolListChange) - EVT_LISTBOX(ID_CALLSTACKLIST, CCodeWindow::OnCallstackListChange) - EVT_LISTBOX(ID_CALLERSLIST, CCodeWindow::OnCallersListChange) - EVT_LISTBOX(ID_CALLSLIST, CCodeWindow::OnCallsListChange) + EVT_LISTBOX(ID_SYMBOLLIST, CCodeWindow::OnSymbolListChange) + EVT_LISTBOX(ID_CALLSTACKLIST, CCodeWindow::OnCallstackListChange) + EVT_LISTBOX(ID_CALLERSLIST, CCodeWindow::OnCallersListChange) + EVT_LISTBOX(ID_CALLSLIST, CCodeWindow::OnCallsListChange) - EVT_HOST_COMMAND(wxID_ANY, CCodeWindow::OnHostMessage) + EVT_HOST_COMMAND(wxID_ANY, CCodeWindow::OnHostMessage) END_EVENT_TABLE() @@ -562,12 +562,12 @@ void CCodeWindow::PopulateToolbar(wxAuiToolBar* toolBar) h = m_Bitmaps[0].GetHeight(); toolBar->SetToolBitmapSize(wxSize(w, h)); - toolBar->AddTool(IDM_STEP, _("Step"), m_Bitmaps[Toolbar_Step]); - toolBar->AddTool(IDM_STEPOVER, _("Step Over"), m_Bitmaps[Toolbar_StepOver]); - toolBar->AddTool(IDM_SKIP, _("Skip"), m_Bitmaps[Toolbar_Skip]); + toolBar->AddTool(IDM_STEP, _("Step"), m_Bitmaps[Toolbar_Step]); + toolBar->AddTool(IDM_STEPOVER, _("Step Over"), m_Bitmaps[Toolbar_StepOver]); + toolBar->AddTool(IDM_SKIP, _("Skip"), m_Bitmaps[Toolbar_Skip]); toolBar->AddSeparator(); - toolBar->AddTool(IDM_GOTOPC, _("Show PC"), m_Bitmaps[Toolbar_GotoPC]); - toolBar->AddTool(IDM_SETPC, _("Set PC"), m_Bitmaps[Toolbar_SetPC]); + toolBar->AddTool(IDM_GOTOPC, _("Show PC"), m_Bitmaps[Toolbar_GotoPC]); + toolBar->AddTool(IDM_SETPC, _("Set PC"), m_Bitmaps[Toolbar_SetPC]); toolBar->AddSeparator(); toolBar->AddControl(new wxTextCtrl(toolBar, IDM_ADDRBOX, _T(""))); diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.h b/Source/Core/DolphinWX/Debugger/CodeWindow.h index 59ad2bb2c8..5ab2c90258 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.h +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.h @@ -57,8 +57,7 @@ class CCodeWindow void Update(); void NotifyMapLoaded(); - void CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParameter, - wxMenuBar *pMenuBar); + void CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParameter, wxMenuBar *pMenuBar); void CreateMenuOptions(wxMenu *pMenu); void CreateMenuSymbols(wxMenuBar *pMenuBar); void RecreateToolbar(wxAuiToolBar*); diff --git a/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp index c4233b02ce..14a1e3e1e8 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp @@ -94,8 +94,7 @@ void CCodeWindow::Save() IniFile ini; ini.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX)); - ini.Set("General", "DebuggerFont", - WxStrToStr(DebuggerFont.GetNativeFontInfoUserDesc())); + ini.Set("General", "DebuggerFont", WxStrToStr(DebuggerFont.GetNativeFontInfoUserDesc())); // Boot to pause or not ini.Set("General", "AutomaticStart", GetMenuBar()->IsChecked(IDM_AUTOMATICSTART)); @@ -352,7 +351,7 @@ void CCodeWindow::NotifyMapLoaded() g_symbolDB.FillInCallers(); //symbols->Show(false); // hide it for faster filling - symbols->Freeze(); // HyperIris: wx style fast filling + symbols->Freeze(); // HyperIris: wx style fast filling symbols->Clear(); for (const auto& symbol : g_symbolDB.Symbols()) { @@ -426,8 +425,8 @@ void CCodeWindow::ToggleCodeWindow(bool bShow) { if (bShow) Parent->DoAddPage(this, - iNbAffiliation[IDM_CODEWINDOW - IDM_LOGWINDOW], - Parent->bFloatWindow[IDM_CODEWINDOW - IDM_LOGWINDOW]); + iNbAffiliation[IDM_CODEWINDOW - IDM_LOGWINDOW], + Parent->bFloatWindow[IDM_CODEWINDOW - IDM_LOGWINDOW]); else // Hide Parent->DoRemovePage(this); } @@ -438,10 +437,10 @@ void CCodeWindow::ToggleRegisterWindow(bool bShow) if (bShow) { if (!m_RegisterWindow) - m_RegisterWindow = new CRegisterWindow(Parent, IDM_REGISTERWINDOW); + m_RegisterWindow = new CRegisterWindow(Parent, IDM_REGISTERWINDOW); Parent->DoAddPage(m_RegisterWindow, - iNbAffiliation[IDM_REGISTERWINDOW - IDM_LOGWINDOW], - Parent->bFloatWindow[IDM_REGISTERWINDOW - IDM_LOGWINDOW]); + iNbAffiliation[IDM_REGISTERWINDOW - IDM_LOGWINDOW], + Parent->bFloatWindow[IDM_REGISTERWINDOW - IDM_LOGWINDOW]); } else // Close { @@ -456,10 +455,10 @@ void CCodeWindow::ToggleBreakPointWindow(bool bShow) if (bShow) { if (!m_BreakpointWindow) - m_BreakpointWindow = new CBreakPointWindow(this, Parent, IDM_BREAKPOINTWINDOW); + m_BreakpointWindow = new CBreakPointWindow(this, Parent, IDM_BREAKPOINTWINDOW); Parent->DoAddPage(m_BreakpointWindow, - iNbAffiliation[IDM_BREAKPOINTWINDOW - IDM_LOGWINDOW], - Parent->bFloatWindow[IDM_BREAKPOINTWINDOW - IDM_LOGWINDOW]); + iNbAffiliation[IDM_BREAKPOINTWINDOW - IDM_LOGWINDOW], + Parent->bFloatWindow[IDM_BREAKPOINTWINDOW - IDM_LOGWINDOW]); } else // Close { @@ -474,10 +473,10 @@ void CCodeWindow::ToggleMemoryWindow(bool bShow) if (bShow) { if (!m_MemoryWindow) - m_MemoryWindow = new CMemoryWindow(Parent, IDM_MEMORYWINDOW); + m_MemoryWindow = new CMemoryWindow(Parent, IDM_MEMORYWINDOW); Parent->DoAddPage(m_MemoryWindow, - iNbAffiliation[IDM_MEMORYWINDOW - IDM_LOGWINDOW], - Parent->bFloatWindow[IDM_MEMORYWINDOW - IDM_LOGWINDOW]); + iNbAffiliation[IDM_MEMORYWINDOW - IDM_LOGWINDOW], + Parent->bFloatWindow[IDM_MEMORYWINDOW - IDM_LOGWINDOW]); } else // Close { @@ -492,10 +491,10 @@ void CCodeWindow::ToggleJitWindow(bool bShow) if (bShow) { if (!m_JitWindow) - m_JitWindow = new CJitWindow(Parent, IDM_JITWINDOW); + m_JitWindow = new CJitWindow(Parent, IDM_JITWINDOW); Parent->DoAddPage(m_JitWindow, - iNbAffiliation[IDM_JITWINDOW - IDM_LOGWINDOW], - Parent->bFloatWindow[IDM_JITWINDOW - IDM_LOGWINDOW]); + iNbAffiliation[IDM_JITWINDOW - IDM_LOGWINDOW], + Parent->bFloatWindow[IDM_JITWINDOW - IDM_LOGWINDOW]); } else // Close { @@ -511,10 +510,10 @@ void CCodeWindow::ToggleSoundWindow(bool bShow) if (bShow) { if (!m_SoundWindow) - m_SoundWindow = new DSPDebuggerLLE(Parent, IDM_SOUNDWINDOW); + m_SoundWindow = new DSPDebuggerLLE(Parent, IDM_SOUNDWINDOW); Parent->DoAddPage(m_SoundWindow, - iNbAffiliation[IDM_SOUNDWINDOW - IDM_LOGWINDOW], - Parent->bFloatWindow[IDM_SOUNDWINDOW - IDM_LOGWINDOW]); + iNbAffiliation[IDM_SOUNDWINDOW - IDM_LOGWINDOW], + Parent->bFloatWindow[IDM_SOUNDWINDOW - IDM_LOGWINDOW]); } else // Close { @@ -529,10 +528,10 @@ void CCodeWindow::ToggleVideoWindow(bool bShow) if (bShow) { if (!m_VideoWindow) - m_VideoWindow = new GFXDebuggerPanel(Parent, IDM_VIDEOWINDOW); + m_VideoWindow = new GFXDebuggerPanel(Parent, IDM_VIDEOWINDOW); Parent->DoAddPage(m_VideoWindow, - iNbAffiliation[IDM_VIDEOWINDOW - IDM_LOGWINDOW], - Parent->bFloatWindow[IDM_VIDEOWINDOW - IDM_LOGWINDOW]); + iNbAffiliation[IDM_VIDEOWINDOW - IDM_LOGWINDOW], + Parent->bFloatWindow[IDM_VIDEOWINDOW - IDM_LOGWINDOW]); } else // Close { diff --git a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp index 48435c73a2..3a120cacb8 100644 --- a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp @@ -203,7 +203,7 @@ void DSPDebuggerLLE::UpdateSymbolMap() if (g_dsp.dram == NULL) return; - m_SymbolList->Freeze(); // HyperIris: wx style fast filling + m_SymbolList->Freeze(); // HyperIris: wx style fast filling m_SymbolList->Clear(); for (const auto& symbol : DSPSymbols::g_dsp_symbol_db.Symbols()) { diff --git a/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp b/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp index 3eb7d3515b..d37ca2e6d1 100644 --- a/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp +++ b/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp @@ -104,26 +104,26 @@ static PauseEventMap* pauseEventMap; void GFXDebuggerPanel::CreateGUIControls() { static PauseEventMap map[] = { - {NEXT_FRAME, _("Frame")}, - {NEXT_FLUSH, _("Flush")}, + {NEXT_FRAME, _("Frame")}, + {NEXT_FLUSH, _("Flush")}, - {NEXT_PIXEL_SHADER_CHANGE, _("Pixel Shader")}, - {NEXT_VERTEX_SHADER_CHANGE, _("Vertex Shader")}, - {NEXT_TEXTURE_CHANGE, _("Texture")}, - {NEXT_NEW_TEXTURE, _("New Texture")}, + {NEXT_PIXEL_SHADER_CHANGE, _("Pixel Shader")}, + {NEXT_VERTEX_SHADER_CHANGE, _("Vertex Shader")}, + {NEXT_TEXTURE_CHANGE, _("Texture")}, + {NEXT_NEW_TEXTURE, _("New Texture")}, - {NEXT_XFB_CMD, _("XFB Cmd")}, - {NEXT_EFB_CMD, _("EFB Cmd")}, + {NEXT_XFB_CMD, _("XFB Cmd")}, + {NEXT_EFB_CMD, _("EFB Cmd")}, - {NEXT_MATRIX_CMD, _("Matrix Cmd")}, - {NEXT_VERTEX_CMD, _("Vertex Cmd")}, - {NEXT_TEXTURE_CMD, _("Texture Cmd")}, - {NEXT_LIGHT_CMD, _("Light Cmd")}, - {NEXT_FOG_CMD, _("Fog Cmd")}, + {NEXT_MATRIX_CMD, _("Matrix Cmd")}, + {NEXT_VERTEX_CMD, _("Vertex Cmd")}, + {NEXT_TEXTURE_CMD, _("Texture Cmd")}, + {NEXT_LIGHT_CMD, _("Light Cmd")}, + {NEXT_FOG_CMD, _("Fog Cmd")}, - {NEXT_SET_TLUT, _("TLUT Cmd")}, + {NEXT_SET_TLUT, _("TLUT Cmd")}, - {NEXT_ERROR, _("Error")} + {NEXT_ERROR, _("Error")} }; pauseEventMap = map; const int numPauseEventMap = sizeof(map)/sizeof(PauseEventMap); diff --git a/Source/Core/DolphinWX/Debugger/DebuggerPanel.h b/Source/Core/DolphinWX/Debugger/DebuggerPanel.h index 3d9e65ef2b..3cc55746fd 100644 --- a/Source/Core/DolphinWX/Debugger/DebuggerPanel.h +++ b/Source/Core/DolphinWX/Debugger/DebuggerPanel.h @@ -37,21 +37,21 @@ public: private: DECLARE_EVENT_TABLE(); - wxPanel *m_MainPanel; - - wxButton *m_pButtonPause; - wxButton *m_pButtonPauseAtNext; - wxButton *m_pButtonPauseAtNextFrame; - wxButton *m_pButtonCont; - wxChoice *m_pPauseAtList; - wxButton *m_pButtonDump; - wxChoice *m_pDumpList; - wxButton *m_pButtonUpdateScreen; - wxButton *m_pButtonClearScreen; - wxButton *m_pButtonClearTextureCache; - wxButton *m_pButtonClearVertexShaderCache; - wxButton *m_pButtonClearPixelShaderCache; - wxTextCtrl *m_pCount; + wxPanel* m_MainPanel; + + wxButton* m_pButtonPause; + wxButton* m_pButtonPauseAtNext; + wxButton* m_pButtonPauseAtNextFrame; + wxButton* m_pButtonCont; + wxChoice* m_pPauseAtList; + wxButton* m_pButtonDump; + wxChoice* m_pDumpList; + wxButton* m_pButtonUpdateScreen; + wxButton* m_pButtonClearScreen; + wxButton* m_pButtonClearTextureCache; + wxButton* m_pButtonClearVertexShaderCache; + wxButton* m_pButtonClearPixelShaderCache; + wxTextCtrl* m_pCount; // TODO: Prefix with GFX_ diff --git a/Source/Core/DolphinWX/Debugger/JitWindow.cpp b/Source/Core/DolphinWX/Debugger/JitWindow.cpp index b323f794f2..cb3c263660 100644 --- a/Source/Core/DolphinWX/Debugger/JitWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/JitWindow.cpp @@ -59,11 +59,11 @@ CJitWindow::CJitWindow(wxWindow* parent, wxWindowID id, const wxPoint& pos, wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT | wxLC_SINGLE_SEL | wxLC_SORT_ASCENDING), 0, wxEXPAND); sizerBig->Add(sizerSplit, 2, wxEXPAND); -// sizerBig->Add(memview, 5, wxEXPAND); -// sizerBig->Add(sizerRight, 0, wxEXPAND | wxALL, 3); + // sizerBig->Add(memview, 5, wxEXPAND); + // sizerBig->Add(sizerRight, 0, wxEXPAND | wxALL, 3); sizerBig->Add(button_refresh = new wxButton(this, IDM_REFRESH_LIST, _("&Refresh"))); -// sizerRight->Add(addrbox = new wxTextCtrl(this, IDM_ADDRBOX, _T(""))); -// sizerRight->Add(new wxButton(this, IDM_SETPC, _("S&et PC"))); + // sizerRight->Add(addrbox = new wxTextCtrl(this, IDM_ADDRBOX, _T(""))); + // sizerRight->Add(new wxButton(this, IDM_SETPC, _("S&et PC"))); SetSizer(sizerBig); diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.h b/Source/Core/DolphinWX/Debugger/MemoryView.h index 327efc6c42..b6fcc2fae6 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryView.h +++ b/Source/Core/DolphinWX/Debugger/MemoryView.h @@ -27,8 +27,8 @@ public: curAddress = addr; Refresh(); } - int dataType; // u8,u16,u32 - int curAddress; // Will be accessed by parent + int dataType; // u8,u16,u32 + int curAddress; // Will be accessed by parent private: int YToAddress(int y); diff --git a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp index e49512afea..6c351b77a5 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp @@ -44,19 +44,19 @@ enum }; BEGIN_EVENT_TABLE(CMemoryWindow, wxPanel) - EVT_TEXT(IDM_MEM_ADDRBOX, CMemoryWindow::OnAddrBoxChange) - EVT_LISTBOX(IDM_SYMBOLLIST, CMemoryWindow::OnSymbolListChange) - EVT_HOST_COMMAND(wxID_ANY, CMemoryWindow::OnHostMessage) - EVT_BUTTON(IDM_SETVALBUTTON, CMemoryWindow::SetMemoryValue) - EVT_BUTTON(IDM_DUMP_MEMORY, CMemoryWindow::OnDumpMemory) - EVT_BUTTON(IDM_DUMP_MEM2, CMemoryWindow::OnDumpMem2) - EVT_BUTTON(IDM_DUMP_FAKEVMEM, CMemoryWindow::OnDumpFakeVMEM) - EVT_CHECKBOX(IDM_U8, CMemoryWindow::U8) - EVT_CHECKBOX(IDM_U16, CMemoryWindow::U16) - EVT_CHECKBOX(IDM_U32, CMemoryWindow::U32) - EVT_BUTTON(IDM_SEARCH, CMemoryWindow::onSearch) - EVT_CHECKBOX(IDM_ASCII, CMemoryWindow::onAscii) - EVT_CHECKBOX(IDM_HEX, CMemoryWindow::onHex) + EVT_TEXT(IDM_MEM_ADDRBOX, CMemoryWindow::OnAddrBoxChange) + EVT_LISTBOX(IDM_SYMBOLLIST, CMemoryWindow::OnSymbolListChange) + EVT_HOST_COMMAND(wxID_ANY, CMemoryWindow::OnHostMessage) + EVT_BUTTON(IDM_SETVALBUTTON, CMemoryWindow::SetMemoryValue) + EVT_BUTTON(IDM_DUMP_MEMORY, CMemoryWindow::OnDumpMemory) + EVT_BUTTON(IDM_DUMP_MEM2, CMemoryWindow::OnDumpMem2) + EVT_BUTTON(IDM_DUMP_FAKEVMEM, CMemoryWindow::OnDumpFakeVMEM) + EVT_CHECKBOX(IDM_U8, CMemoryWindow::U8) + EVT_CHECKBOX(IDM_U16, CMemoryWindow::U16) + EVT_CHECKBOX(IDM_U32, CMemoryWindow::U32) + EVT_BUTTON(IDM_SEARCH, CMemoryWindow::onSearch) + EVT_CHECKBOX(IDM_ASCII, CMemoryWindow::onAscii) + EVT_CHECKBOX(IDM_HEX, CMemoryWindow::onHex) END_EVENT_TABLE() CMemoryWindow::CMemoryWindow(wxWindow* parent, wxWindowID id, @@ -71,7 +71,7 @@ CMemoryWindow::CMemoryWindow(wxWindow* parent, wxWindowID id, DebugInterface* di = &PowerPC::debug_interface; //symbols = new wxListBox(this, IDM_SYMBOLLIST, wxDefaultPosition, - // wxSize(20, 100), 0, NULL, wxLB_SORT); + // wxSize(20, 100), 0, NULL, wxLB_SORT); //sizerLeft->Add(symbols, 1, wxEXPAND); memview = new CMemoryView(di, this); memview->dataType = 0; diff --git a/Source/Core/DolphinWX/Debugger/RegisterView.cpp b/Source/Core/DolphinWX/Debugger/RegisterView.cpp index d059a908ae..310b6077c5 100644 --- a/Source/Core/DolphinWX/Debugger/RegisterView.cpp +++ b/Source/Core/DolphinWX/Debugger/RegisterView.cpp @@ -57,7 +57,7 @@ wxString CRegTable::GetValue(int row, int col) { switch (col) { - case 0: return StrToWxStr(special_reg_names[row - 32]); + case 0: return StrToWxStr(special_reg_names[row - 32]); case 1: return wxString::Format(wxT("%08x"), GetSpecialRegValue(row - 32)); default: return wxEmptyString; } @@ -79,9 +79,9 @@ static void SetSpecialRegValue(int reg, u32 value) case 6: PowerPC::ppcState.spr[SPR_SRR0] = value; break; case 7: PowerPC::ppcState.spr[SPR_SRR1] = value; break; case 8: PowerPC::ppcState.Exceptions = value; break; -// Should we just change the value, or use ProcessorInterface::SetInterrupt() to make the system aware? -// case 9: return ProcessorInterface::GetMask(); -// case 10: return ProcessorInterface::GetCause(); + // Should we just change the value, or use ProcessorInterface::SetInterrupt() to make the system aware? + // case 9: return ProcessorInterface::GetMask(); + // case 10: return ProcessorInterface::GetCause(); default: return; } } diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 98e4580ef9..c86d035a1f 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -100,7 +100,7 @@ CPanel::CPanel( #endif CRenderFrame::CRenderFrame(wxFrame* parent, wxWindowID id, const wxString& title, - const wxPoint& pos, const wxSize& size, long style) + const wxPoint& pos, const wxSize& size, long style) : wxFrame(parent, id, title, pos, size, style) { // Give it an icon @@ -707,12 +707,12 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event)) SConfig::GetInstance().m_ListTaiwan && SConfig::GetInstance().m_ListUnknown))) { - SConfig::GetInstance().m_ListGC = SConfig::GetInstance().m_ListWii = - SConfig::GetInstance().m_ListWad = SConfig::GetInstance().m_ListJap = - SConfig::GetInstance().m_ListUsa = SConfig::GetInstance().m_ListPal = - SConfig::GetInstance().m_ListFrance = SConfig::GetInstance().m_ListItaly = - SConfig::GetInstance().m_ListKorea = SConfig::GetInstance().m_ListTaiwan = - SConfig::GetInstance().m_ListUnknown= true; + SConfig::GetInstance().m_ListGC = SConfig::GetInstance().m_ListWii = + SConfig::GetInstance().m_ListWad = SConfig::GetInstance().m_ListJap = + SConfig::GetInstance().m_ListUsa = SConfig::GetInstance().m_ListPal = + SConfig::GetInstance().m_ListFrance = SConfig::GetInstance().m_ListItaly = + SConfig::GetInstance().m_ListKorea = SConfig::GetInstance().m_ListTaiwan = + SConfig::GetInstance().m_ListUnknown = true; GetMenuBar()->FindItem(IDM_LISTGC)->Check(true); GetMenuBar()->FindItem(IDM_LISTWII)->Check(true); diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 3417b3f8ec..b54524f2a6 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -475,8 +475,8 @@ void CFrame::PopulateToolbarAui(wxAuiToolBar* ToolBar) h = m_Bitmaps[Toolbar_FileOpen].GetHeight(); ToolBar->SetToolBitmapSize(wxSize(w, h)); - ToolBar->AddTool(IDM_SAVE_PERSPECTIVE, _("Save"), g_pCodeWindow->m_Bitmaps[Toolbar_GotoPC], _("Save current perspective")); - ToolBar->AddTool(IDM_EDIT_PERSPECTIVES, _("Edit"), g_pCodeWindow->m_Bitmaps[Toolbar_GotoPC], _("Edit current perspective")); + ToolBar->AddTool(IDM_SAVE_PERSPECTIVE, _("Save"), g_pCodeWindow->m_Bitmaps[Toolbar_GotoPC], _("Save current perspective")); + ToolBar->AddTool(IDM_EDIT_PERSPECTIVES, _("Edit"), g_pCodeWindow->m_Bitmaps[Toolbar_GotoPC], _("Edit current perspective")); ToolBar->SetToolDropDown(IDM_SAVE_PERSPECTIVE, true); ToolBar->SetToolDropDown(IDM_EDIT_PERSPECTIVES, true); @@ -574,7 +574,7 @@ void CFrame::BootGame(const std::string& filename) bootfile = m_GameListCtrl->GetSelectedISO()->GetFileName(); } else if (!StartUp.m_strDefaultGCM.empty() - && wxFileExists(wxSafeConvertMB2WX(StartUp.m_strDefaultGCM.c_str()))) + && wxFileExists(wxSafeConvertMB2WX(StartUp.m_strDefaultGCM.c_str()))) { bootfile = StartUp.m_strDefaultGCM; } @@ -1185,7 +1185,7 @@ void CFrame::OnConfigPAD(wxCommandEvent& WXUNUSED (event)) { InputPlugin *const pad_plugin = Pad::GetPlugin(); bool was_init = false; - if (g_controller_interface.IsInit()) // check if game is running + if (g_controller_interface.IsInit()) // check if game is running { was_init = true; } @@ -1203,7 +1203,7 @@ void CFrame::OnConfigPAD(wxCommandEvent& WXUNUSED (event)) InputConfigDialog m_ConfigFrame(this, *pad_plugin, _trans("Dolphin GCPad Configuration")); m_ConfigFrame.ShowModal(); m_ConfigFrame.Destroy(); - if (!was_init) // if game isn't running + if (!was_init) // if game isn't running { Pad::Shutdown(); } @@ -1213,7 +1213,7 @@ void CFrame::OnConfigWiimote(wxCommandEvent& WXUNUSED (event)) { InputPlugin *const wiimote_plugin = Wiimote::GetPlugin(); bool was_init = false; - if (g_controller_interface.IsInit()) // check if game is running + if (g_controller_interface.IsInit()) // check if game is running { was_init = true; } @@ -1231,7 +1231,7 @@ void CFrame::OnConfigWiimote(wxCommandEvent& WXUNUSED (event)) WiimoteConfigDiag m_ConfigFrame(this, *wiimote_plugin); m_ConfigFrame.ShowModal(); m_ConfigFrame.Destroy(); - if (!was_init) // if game isn't running + if (!was_init) // if game isn't running { Wiimote::Shutdown(); } diff --git a/Source/Core/DolphinWX/GLInterface/AGL.cpp b/Source/Core/DolphinWX/GLInterface/AGL.cpp index ffe3b68dd2..bd0fcc562b 100644 --- a/Source/Core/DolphinWX/GLInterface/AGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/AGL.cpp @@ -19,7 +19,7 @@ void cInterfaceAGL::Swap() } // Create rendering window. -// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() +// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() bool cInterfaceAGL::Create(void *&window_handle) { int _tx, _ty, _twidth, _theight; diff --git a/Source/Core/DolphinWX/GLInterface/EGL.cpp b/Source/Core/DolphinWX/GLInterface/EGL.cpp index 3b3779d3df..d8342ce599 100644 --- a/Source/Core/DolphinWX/GLInterface/EGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/EGL.cpp @@ -58,7 +58,8 @@ void cInterfaceEGL::DetectMode() EGL_NONE }; // Get how many configs there are - if (!eglChooseConfig( GLWin.egl_dpy, attribs, NULL, 0, &num_configs)) { + if (!eglChooseConfig( GLWin.egl_dpy, attribs, NULL, 0, &num_configs)) + { INFO_LOG(VIDEO, "Error: couldn't get an EGL visual config\n"); goto err_exit; } @@ -101,7 +102,7 @@ err_exit: } // Create rendering window. -// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() +// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() bool cInterfaceEGL::Create(void *&window_handle) { const char *s; @@ -112,14 +113,16 @@ bool cInterfaceEGL::Create(void *&window_handle) GLWin.egl_dpy = Platform.EGLGetDisplay(); - if (!GLWin.egl_dpy) { + if (!GLWin.egl_dpy) + { INFO_LOG(VIDEO, "Error: eglGetDisplay() failed\n"); return false; } GLWin.platform = Platform.platform; - if (!eglInitialize(GLWin.egl_dpy, &egl_major, &egl_minor)) { + if (!eglInitialize(GLWin.egl_dpy, &egl_major, &egl_minor)) + { INFO_LOG(VIDEO, "Error: eglInitialize() failed\n"); return false; } @@ -147,7 +150,7 @@ bool cInterfaceEGL::Create(void *&window_handle) { case MODE_OPENGL: attribs[1] = EGL_OPENGL_BIT; - ctx_attribs[0] = EGL_NONE; + ctx_attribs[0] = EGL_NONE; break; case MODE_OPENGLES2: attribs[1] = EGL_OPENGL_ES2_BIT; @@ -163,7 +166,8 @@ bool cInterfaceEGL::Create(void *&window_handle) break; } - if (!eglChooseConfig( GLWin.egl_dpy, attribs, &config, 1, &num_configs)) { + if (!eglChooseConfig( GLWin.egl_dpy, attribs, &config, 1, &num_configs)) + { INFO_LOG(VIDEO, "Error: couldn't get an EGL visual config\n"); exit(1); } @@ -189,16 +193,17 @@ bool cInterfaceEGL::Create(void *&window_handle) INFO_LOG(VIDEO, "EGL_CLIENT_APIS = %s\n", s); GLWin.egl_ctx = eglCreateContext(GLWin.egl_dpy, config, EGL_NO_CONTEXT, ctx_attribs ); - if (!GLWin.egl_ctx) { + if (!GLWin.egl_ctx) + { INFO_LOG(VIDEO, "Error: eglCreateContext failed\n"); exit(1); } GLWin.native_window = Platform.CreateWindow(); - GLWin.egl_surf = eglCreateWindowSurface(GLWin.egl_dpy, config, - GLWin.native_window, NULL); - if (!GLWin.egl_surf) { + GLWin.egl_surf = eglCreateWindowSurface(GLWin.egl_dpy, config, GLWin.native_window, NULL); + if (!GLWin.egl_surf) + { INFO_LOG(VIDEO, "Error: eglCreateWindowSurface failed\n"); exit(1); } diff --git a/Source/Core/DolphinWX/GLInterface/GLX.cpp b/Source/Core/DolphinWX/GLInterface/GLX.cpp index d124b1dbda..bd4da61b4b 100644 --- a/Source/Core/DolphinWX/GLInterface/GLX.cpp +++ b/Source/Core/DolphinWX/GLInterface/GLX.cpp @@ -36,7 +36,7 @@ void cInterfaceGLX::Swap() } // Create rendering window. -// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() +// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() bool cInterfaceGLX::Create(void *&window_handle) { int _tx, _ty, _twidth, _theight; diff --git a/Source/Core/DolphinWX/GLInterface/WGL.cpp b/Source/Core/DolphinWX/GLInterface/WGL.cpp index f8878a587b..d98410f561 100644 --- a/Source/Core/DolphinWX/GLInterface/WGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/WGL.cpp @@ -63,7 +63,7 @@ void cInterfaceWGL::UpdateFPSDisplay(const char *text) } // Create rendering window. -// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() +// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() bool cInterfaceWGL::Create(void *&window_handle) { int _tx, _ty, _twidth, _theight; diff --git a/Source/Core/DolphinWX/GLInterface/Wayland_Util.h b/Source/Core/DolphinWX/GLInterface/Wayland_Util.h index db38c5c953..af18fb0e70 100644 --- a/Source/Core/DolphinWX/GLInterface/Wayland_Util.h +++ b/Source/Core/DolphinWX/GLInterface/Wayland_Util.h @@ -9,9 +9,9 @@ #include <wayland-cursor.h> #include <xkbcommon/xkbcommon.h> -#define MOD_SHIFT_MASK 0x01 -#define MOD_ALT_MASK 0x02 -#define MOD_CONTROL_MASK 0x04 +#define MOD_SHIFT_MASK 0x01 +#define MOD_ALT_MASK 0x02 +#define MOD_CONTROL_MASK 0x04 class cWaylandInterface diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index 3cbc86ccdc..f89cdc9514 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -50,7 +50,7 @@ bool sorted = false; extern CFrame* main_frame; static int CompareGameListItems(const GameListItem* iso1, const GameListItem* iso2, - long sortData = CGameListCtrl::COLUMN_TITLE) + long sortData = CGameListCtrl::COLUMN_TITLE) { int t = 1; @@ -70,8 +70,8 @@ static int CompareGameListItems(const GameListItem* iso1, const GameListItem* is { indexOne = SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.LNG"); } - else - { // GC + else // GC + { indexOne = SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage; } @@ -79,8 +79,8 @@ static int CompareGameListItems(const GameListItem* iso1, const GameListItem* is { indexOther = SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.LNG"); } - else - { // GC + else // GC + { indexOther = SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage; } diff --git a/Source/Core/DolphinWX/GameListCtrl.h b/Source/Core/DolphinWX/GameListCtrl.h index 114f1484bc..342df3f64b 100644 --- a/Source/Core/DolphinWX/GameListCtrl.h +++ b/Source/Core/DolphinWX/GameListCtrl.h @@ -59,7 +59,7 @@ private: void ClearIsoFiles() { - while (!m_ISOFiles.empty()) // so lazy + while (!m_ISOFiles.empty()) // so lazy { delete m_ISOFiles.back(); m_ISOFiles.pop_back(); diff --git a/Source/Core/DolphinWX/GeckoCodeDiag.cpp b/Source/Core/DolphinWX/GeckoCodeDiag.cpp index fc1e62896e..bf10bb20c1 100644 --- a/Source/Core/DolphinWX/GeckoCodeDiag.cpp +++ b/Source/Core/DolphinWX/GeckoCodeDiag.cpp @@ -94,7 +94,7 @@ void CodeConfigPanel::LoadCodes(const IniFile& globalIni, const IniFile& localIn void CodeConfigPanel::ToggleCode(wxCommandEvent& evt) { - const int sel = evt.GetInt(); // this right? + const int sel = evt.GetInt(); // this right? if (sel > -1) m_gcodes[sel].enabled = m_listbox_gcodes->IsChecked(sel); } @@ -115,7 +115,7 @@ void CodeConfigPanel::UpdateInfoBox(wxCommandEvent&) notes_end = m_gcodes[sel].notes.end(); for (; notes_iter!=notes_end; ++notes_iter) m_infobox.textctrl_notes->AppendText(StrToWxStr(*notes_iter)); - m_infobox.textctrl_notes->ScrollLines(-99); // silly + m_infobox.textctrl_notes->ScrollLines(-99); // silly m_infobox.label_creator->SetLabel(wxGetTranslation(wxstr_creator) + StrToWxStr(m_gcodes[sel].creator)); @@ -134,11 +134,6 @@ void CodeConfigPanel::UpdateInfoBox(wxCommandEvent&) } } -//void CodeConfigPanel::ApplyChanges(wxCommandEvent&) -//{ -// Gecko::SetActiveCodes(m_gcodes); -//} - void CodeConfigPanel::DownloadCodes(wxCommandEvent&) { if (m_gameid.empty()) @@ -170,7 +165,7 @@ void CodeConfigPanel::DownloadCodes(wxCommandEvent&) if (sf::Http::Response::Ok == resp.GetStatus()) { // temp vector containing parsed codes - std::vector<GeckoCode> gcodes; + std::vector<GeckoCode> gcodes; // parse the codes std::istringstream ss(resp.GetBody()); @@ -184,7 +179,7 @@ void CodeConfigPanel::DownloadCodes(wxCommandEvent&) // eh w/e //std::getline(ss, line); //if (line != m_gameid) - // PanicAlert("Bad code file."); + // PanicAlert("Bad code file."); // seek past the header, get to the first code std::getline(ss, line); @@ -197,7 +192,7 @@ void CodeConfigPanel::DownloadCodes(wxCommandEvent&) while ((std::getline(ss, line).good())) { // empty line - if (0 == line.size() || line == "\r" || line == "\n") // \r\n checks might not be needed + if (0 == line.size() || line == "\r" || line == "\n") // \r\n checks might not be needed { // add the code if (gcode.codes.size()) @@ -241,7 +236,7 @@ void CodeConfigPanel::DownloadCodes(wxCommandEvent&) else { gcode.notes.push_back(line); - read_state = 2; // start reading comments + read_state = 2; // start reading comments } } diff --git a/Source/Core/DolphinWX/GeckoCodeDiag.h b/Source/Core/DolphinWX/GeckoCodeDiag.h index 356e1c747f..6ed7d7aefc 100644 --- a/Source/Core/DolphinWX/GeckoCodeDiag.h +++ b/Source/Core/DolphinWX/GeckoCodeDiag.h @@ -36,12 +36,12 @@ private: std::string m_gameid; // wxwidgets stuff - wxCheckListBox *m_listbox_gcodes; + wxCheckListBox* m_listbox_gcodes; struct { - wxStaticText *label_name, *label_notes, *label_creator; - wxTextCtrl *textctrl_notes; - wxListBox *listbox_codes; + wxStaticText* label_name, *label_notes, *label_creator; + wxTextCtrl* textctrl_notes; + wxListBox* listbox_codes; } m_infobox; wxButton* btn_download; }; diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp index 8899a5441b..1b873de492 100644 --- a/Source/Core/DolphinWX/ISOProperties.cpp +++ b/Source/Core/DolphinWX/ISOProperties.cpp @@ -582,9 +582,9 @@ void CISOProperties::CreateGUIControls(bool IsWad) // Filesystem icons wxImageList * const m_iconList = new wxImageList(16, 16); - m_iconList->Add(wxBitmap(disc_xpm), wxNullBitmap); // 0 - m_iconList->Add(wxBitmap(folder_xpm), wxNullBitmap); // 1 - m_iconList->Add(wxBitmap(file_xpm), wxNullBitmap); // 2 + m_iconList->Add(wxBitmap(disc_xpm), wxNullBitmap); // 0 + m_iconList->Add(wxBitmap(folder_xpm), wxNullBitmap); // 1 + m_iconList->Add(wxBitmap(file_xpm), wxNullBitmap); // 2 // Filesystem tree m_Treectrl = new wxTreeCtrl(m_Filesystem, ID_TREECTRL, diff --git a/Source/Core/DolphinWX/InputConfigDiag.cpp b/Source/Core/DolphinWX/InputConfigDiag.cpp index ee54c3824b..350edcddd3 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.cpp +++ b/Source/Core/DolphinWX/InputConfigDiag.cpp @@ -118,7 +118,7 @@ ControlDialog::ControlDialog(GamepadPage* const parent, InputPlugin& plugin, Con szr->Add(d_szr, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5); szr->Add(control_chooser, 1, wxEXPAND|wxALL, 5); - SetSizerAndFit(szr); // needed + SetSizerAndFit(szr); // needed UpdateGUI(); SetFocus(); @@ -965,7 +965,7 @@ GamepadPage::GamepadPage(wxWindow* parent, InputPlugin& plugin, const unsigned i UpdateGUI(); - SetSizerAndFit(mapping); // needed + SetSizerAndFit(mapping); // needed Layout(); }; diff --git a/Source/Core/DolphinWX/InputConfigDiag.h b/Source/Core/DolphinWX/InputConfigDiag.h index f84adc36ac..7c5e10e3a5 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.h +++ b/Source/Core/DolphinWX/InputConfigDiag.h @@ -4,12 +4,12 @@ #pragma once -#define SLIDER_TICK_COUNT 100 -#define DETECT_WAIT_TIME 1500 -#define PREVIEW_UPDATE_TIME 25 +#define SLIDER_TICK_COUNT 100 +#define DETECT_WAIT_TIME 1500 +#define PREVIEW_UPDATE_TIME 25 // might have to change this setup for wiimote -#define PROFILES_PATH "Profiles/" +#define PROFILES_PATH "Profiles/" #include <wx/wx.h> #include <wx/listbox.h> @@ -42,7 +42,7 @@ public: virtual ~PadSetting() {} - wxControl* const wxcontrol; + wxControl* const wxcontrol; }; class PadSettingExtension : public PadSetting @@ -52,7 +52,7 @@ public: void UpdateGUI(); void UpdateValue(); - ControllerEmu::Extension* const extension; + ControllerEmu::Extension* const extension; }; class PadSettingSpin : public PadSetting @@ -61,7 +61,7 @@ public: PadSettingSpin(wxWindow* const parent, ControllerEmu::ControlGroup::Setting* const setting) : PadSetting(new wxSpinCtrl(parent, -1, wxEmptyString, wxDefaultPosition , wxSize(54, -1), 0, setting->low, setting->high, (int)(setting->value * 100))) - , value(setting->value) {} + , value(setting->value) {} void UpdateGUI(); void UpdateValue(); @@ -76,7 +76,7 @@ public: void UpdateGUI(); void UpdateValue(); - ControlState& value; + ControlState& value; }; class GamepadPage; @@ -101,19 +101,19 @@ public: void SetSelectedControl(wxCommandEvent& event); void AppendControl(wxCommandEvent& event); - ControllerInterface::ControlReference* const control_reference; - InputPlugin& m_plugin; - wxComboBox* device_cbox; + ControllerInterface::ControlReference* const control_reference; + InputPlugin& m_plugin; + wxComboBox* device_cbox; - wxTextCtrl* textctrl; - wxListBox* control_lbox; - wxSlider* range_slider; + wxTextCtrl* textctrl; + wxListBox* control_lbox; + wxSlider* range_slider; private: - GamepadPage* const m_parent; - wxStaticText* m_bound_label; - wxStaticText* m_error_label; - DeviceQualifier m_devq; + GamepadPage* const m_parent; + wxStaticText* m_bound_label; + wxStaticText* m_error_label; + DeviceQualifier m_devq; bool GetExpressionForSelectedControl(wxString &expr); }; @@ -124,7 +124,7 @@ public: : wxButton(parent, -1, _("Configure"), wxDefaultPosition) , extension(ext) {} - ControllerEmu::Extension* const extension; + ControllerEmu::Extension* const extension; }; class ControlButton : public wxButton @@ -132,7 +132,7 @@ class ControlButton : public wxButton public: ControlButton(wxWindow* const parent, ControllerInterface::ControlReference* const _ref, const unsigned int width, const std::string& label = ""); - ControllerInterface::ControlReference* const control_reference; + ControllerInterface::ControlReference* const control_reference; }; class UDPConfigButton : public wxButton @@ -151,11 +151,11 @@ public: ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWindow* const parent, GamepadPage* const eventsink); ~ControlGroupBox(); - std::vector<PadSetting*> options; + std::vector<PadSetting*> options; - ControllerEmu::ControlGroup* const control_group; - wxStaticBitmap* static_bitmap; - std::vector<ControlButton*> control_buttons; + ControllerEmu::ControlGroup* const control_group; + wxStaticBitmap* static_bitmap; + std::vector<ControlButton*> control_buttons; }; class ControlGroupsSizer : public wxBoxSizer @@ -200,19 +200,19 @@ public: void GetProfilePath(std::string& path); - wxComboBox* profile_cbox; - wxComboBox* device_cbox; + wxComboBox* profile_cbox; + wxComboBox* device_cbox; - std::vector<ControlGroupBox*> control_groups; + std::vector<ControlGroupBox*> control_groups; protected: - ControllerEmu* const controller; + ControllerEmu* const controller; private: - ControlDialog* m_control_dialog; - InputConfigDialog* const m_config_dialog; + ControlDialog* m_control_dialog; + InputConfigDialog* const m_config_dialog; InputPlugin &m_plugin; }; @@ -234,8 +234,8 @@ public: private: - wxNotebook* m_pad_notebook; - std::vector<GamepadPage*> m_padpages; - InputPlugin& m_plugin; - wxTimer* m_update_timer; + wxNotebook* m_pad_notebook; + std::vector<GamepadPage*> m_padpages; + InputPlugin& m_plugin; + wxTimer* m_update_timer; }; diff --git a/Source/Core/DolphinWX/LogWindow.cpp b/Source/Core/DolphinWX/LogWindow.cpp index bd5e03081d..92702e2b3f 100644 --- a/Source/Core/DolphinWX/LogWindow.cpp +++ b/Source/Core/DolphinWX/LogWindow.cpp @@ -215,19 +215,17 @@ void CLogWindow::OnWrapLineCheck(wxCommandEvent& event) #else wxString Text; // Unfortunately wrapping styles can only be changed dynamically with wxGTK - // Notice: To retain the colors when changing word wrapping we need to - // loop through every letter with GetStyle and then reapply them letter by letter + // Notice: To retain the colors when changing word wrapping we need to + // loop through every letter with GetStyle and then reapply them letter by letter // Prevent m_Log access while it's being destroyed m_LogAccess = false; UnPopulateBottom(); Text = m_Log->GetValue(); m_Log->Destroy(); if (event.IsChecked()) - m_Log = CreateTextCtrl(this, IDM_LOG, - wxTE_RICH | wxTE_MULTILINE | wxTE_READONLY | wxTE_WORDWRAP); + m_Log = CreateTextCtrl(this, IDM_LOG, wxTE_RICH | wxTE_MULTILINE | wxTE_READONLY | wxTE_WORDWRAP); else - m_Log = CreateTextCtrl(this, IDM_LOG, - wxTE_RICH | wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP); + m_Log = CreateTextCtrl(this, IDM_LOG, wxTE_RICH | wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP); m_Log->SetDefaultStyle(wxTextAttr(*wxWHITE)); m_Log->AppendText(Text); PopulateBottom(); @@ -301,7 +299,7 @@ void CLogWindow::UpdateLog() } msgQueue.pop(); } - } // unlock log + } // unlock log // m_LogTimer->Start(UPDATETIME); m_ignoreLogTimer = false; diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp index be794cce4e..cfd5b22c9f 100644 --- a/Source/Core/DolphinWX/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/MainNoGUI.cpp @@ -92,7 +92,7 @@ void Host_GetRenderWindowSize(int& x, int& y, int& width, int& height) void Host_RequestRenderWindowSize(int width, int height) {} void Host_SetStartupDebuggingParameters() { - SCoreStartupParameter& StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter; + SCoreStartupParameter& StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter; StartUp.bEnableDebugging = false; StartUp.bBootToPause = false; } @@ -118,10 +118,12 @@ void Host_SysMessage(const char *fmt, ...) va_end(list); size_t len = strlen(msg); - if (msg[len - 1] != '\n') { + if (msg[len - 1] != '\n') + { msg[len - 1] = '\n'; msg[len] = '\0'; } + fprintf(stderr, "%s", msg); } @@ -289,14 +291,16 @@ int main(int argc, char* argv[]) #endif int ch, help = 0; struct option longopts[] = { - { "exec", no_argument, NULL, 'e' }, - { "help", no_argument, NULL, 'h' }, - { "version", no_argument, NULL, 'v' }, - { NULL, 0, NULL, 0 } + { "exec", no_argument, NULL, 'e' }, + { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, 'v' }, + { NULL, 0, NULL, 0 } }; - while ((ch = getopt_long(argc, argv, "eh?v", longopts, 0)) != -1) { - switch (ch) { + while ((ch = getopt_long(argc, argv, "eh?v", longopts, 0)) != -1) + { + switch (ch) + { case 'e': break; case 'h': @@ -309,13 +313,14 @@ int main(int argc, char* argv[]) } } - if (help == 1 || argc == optind) { + if (help == 1 || argc == optind) + { fprintf(stderr, "%s\n\n", scm_rev_str); fprintf(stderr, "A multi-platform Gamecube/Wii emulator\n\n"); fprintf(stderr, "Usage: %s [-e <file>] [-h] [-v]\n", argv[0]); - fprintf(stderr, " -e, --exec Load the specified file\n"); - fprintf(stderr, " -h, --help Show this help message\n"); - fprintf(stderr, " -v, --help Print version and exit\n"); + fprintf(stderr, " -e, --exec Load the specified file\n"); + fprintf(stderr, " -h, --help Show this help message\n"); + fprintf(stderr, " -v, --help Print version and exit\n"); return 1; } @@ -346,7 +351,8 @@ int main(int argc, char* argv[]) #endif #if HAVE_X11 #if USE_EGL - if (GLWin.platform == EGL_PLATFORM_X11) { + if (GLWin.platform == EGL_PLATFORM_X11) + { #endif XInitThreads(); X11_MainLoop(); diff --git a/Source/Core/DolphinWX/MemcardManager.cpp b/Source/Core/DolphinWX/MemcardManager.cpp index 9b345c3469..cd9df68cbb 100644 --- a/Source/Core/DolphinWX/MemcardManager.cpp +++ b/Source/Core/DolphinWX/MemcardManager.cpp @@ -160,7 +160,7 @@ bool CMemcardManager::SaveSettings() iniMemcardSection->Set("cBanner", mcmSettings.column[COLUMN_BANNER], true); iniMemcardSection->Set("cTitle", mcmSettings.column[COLUMN_TITLE], true); iniMemcardSection->Set("cComment", mcmSettings.column[COLUMN_COMMENT], true); - iniMemcardSection->Set("cIcon", mcmSettings.column[COLUMN_ICON], true); + iniMemcardSection->Set("cIcon", mcmSettings.column[COLUMN_ICON], true); iniMemcardSection->Set("cBlocks", mcmSettings.column[COLUMN_BLOCKS], true); iniMemcardSection->Set("cFirst Block", mcmSettings.column[COLUMN_FIRSTBLOCK], true); @@ -179,13 +179,13 @@ void CMemcardManager::CreateGUIControls() for (int slot = SLOT_A; slot <= SLOT_B; slot++) { - m_CopyFrom[slot] = new wxButton(this, ID_COPYFROM_A + slot, + m_CopyFrom[slot] = new wxButton(this, ID_COPYFROM_A + slot, wxString::Format(_("%1$sCopy%1$s"), ARROW[slot ? 0 : 1])); - m_SaveImport[slot] = new wxButton(this, ID_SAVEIMPORT_A + slot, + m_SaveImport[slot] = new wxButton(this, ID_SAVEIMPORT_A + slot, wxString::Format(_("%sImport GCI%s"), ARROWS)); - m_SaveExport[slot] = new wxButton(this, ID_SAVEEXPORT_A + slot, + m_SaveExport[slot] = new wxButton(this, ID_SAVEEXPORT_A + slot, wxString::Format(_("%sExport GCI%s"), ARROWS)); - m_Delete[slot] = new wxButton(this, ID_DELETE_A + slot, + m_Delete[slot] = new wxButton(this, ID_DELETE_A + slot, wxString::Format(_("%sDelete%s"), ARROWS)); @@ -389,8 +389,8 @@ void CMemcardManager::OnMenuChange(wxCommandEvent& event) break; } - if (memoryCard[SLOT_A]) ReloadMemcard(WxStrToStr(m_MemcardPath[SLOT_A]->GetPath()).c_str(), SLOT_A); - if (memoryCard[SLOT_B]) ReloadMemcard(WxStrToStr(m_MemcardPath[SLOT_B]->GetPath()).c_str(), SLOT_B); + if (memoryCard[SLOT_A]) ReloadMemcard(WxStrToStr(m_MemcardPath[SLOT_A]->GetPath()).c_str(), SLOT_A); + if (memoryCard[SLOT_B]) ReloadMemcard(WxStrToStr(m_MemcardPath[SLOT_B]->GetPath()).c_str(), SLOT_B); } bool CMemcardManager::CopyDeleteSwitch(u32 error, int slot) { @@ -684,7 +684,7 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card) } } - int pagesMax = (mcmSettings.usePages) ? + int pagesMax = (mcmSettings.usePages) ? (page[card] + 1) * itemsPerPage : 128; for (j = page[card] * itemsPerPage; (j < nFiles) && (j < pagesMax); j++) @@ -718,7 +718,7 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card) wxBlock.Printf(wxT("%10d"), blocks); m_MemcardList[card]->SetItem(index,COLUMN_BLOCKS, wxBlock); firstblock = memoryCard[card]->DEntry_FirstBlock(fileIndex); - //if (firstblock == 0xFFFF) firstblock = 3; // to make firstblock -1 + //if (firstblock == 0xFFFF) firstblock = 3; // to make firstblock -1 wxFirstBlock.Printf(wxT("%15d"), firstblock); m_MemcardList[card]->SetItem(index, COLUMN_FIRSTBLOCK, wxFirstBlock); m_MemcardList[card]->SetItem(index, COLUMN_ICON, wxEmptyString); @@ -808,14 +808,14 @@ void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event) popupMenu->AppendSeparator(); -// popupMenu->AppendCheckItem(COLUMN_BANNER, _("Show save banner")); + // popupMenu->AppendCheckItem(COLUMN_BANNER, _("Show save banner")); popupMenu->AppendCheckItem(COLUMN_TITLE, _("Show save title")); popupMenu->AppendCheckItem(COLUMN_COMMENT, _("Show save comment")); popupMenu->AppendCheckItem(COLUMN_ICON, _("Show save icon")); popupMenu->AppendCheckItem(COLUMN_BLOCKS, _("Show save blocks")); popupMenu->AppendCheckItem(COLUMN_FIRSTBLOCK, _("Show first block")); -// for (int i = COLUMN_BANNER; i <= COLUMN_FIRSTBLOCK; i++) + // for (int i = COLUMN_BANNER; i <= COLUMN_FIRSTBLOCK; i++) for (int i = COLUMN_TITLE; i <= COLUMN_FIRSTBLOCK; i++) { popupMenu->FindItem(i)->Check(__mcmSettings.column[i]); diff --git a/Source/Core/DolphinWX/MemcardManager.h b/Source/Core/DolphinWX/MemcardManager.h index df05e9245a..371ffa07fe 100644 --- a/Source/Core/DolphinWX/MemcardManager.h +++ b/Source/Core/DolphinWX/MemcardManager.h @@ -36,28 +36,28 @@ class CMemcardManager : public wxDialog private: DECLARE_EVENT_TABLE(); - int page[2], - itemsPerPage, - maxPages; - std::string DefaultMemcard[2], - DefaultIOPath; + int page[2]; + int itemsPerPage; + int maxPages; + std::string DefaultMemcard[2]; + std::string DefaultIOPath; IniFile MemcardManagerIni; IniFile::Section* iniMemcardSection; - wxButton *m_CopyFrom[2], - *m_SaveImport[2], - *m_SaveExport[2], - *m_Delete[2], - *m_NextPage[2], - *m_PrevPage[2], - *m_ConvertToGci; + wxButton* m_CopyFrom[2]; + wxButton* m_SaveImport[2]; + wxButton* m_SaveExport[2]; + wxButton* m_Delete[2]; + wxButton* m_NextPage[2]; + wxButton* m_PrevPage[2]; + wxButton* m_ConvertToGci; wxFilePickerCtrl *m_MemcardPath[2]; wxStaticText *t_Status[2]; enum { - ID_COPYFROM_A = 1000, // Do not rearrange these items, - ID_COPYFROM_B, // ID_..._B must be 1 more than ID_..._A + ID_COPYFROM_A = 1000, // Do not rearrange these items, + ID_COPYFROM_B, // ID_..._B must be 1 more than ID_..._A ID_FIXCHECKSUM_A, ID_FIXCHECKSUM_B, ID_DELETE_A, @@ -142,8 +142,8 @@ class CMemcardManager : public wxDialog Unbind(wxEVT_RIGHT_DOWN, &CMemcardListCtrl::OnRightClick, this); } _mcmSettings & __mcmSettings; - bool prevPage, - nextPage; + bool prevPage; + bool nextPage; private: void OnRightClick(wxMouseEvent& event); }; diff --git a/Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.cpp b/Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.cpp index 0d1a8960ab..d89a702102 100644 --- a/Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.cpp +++ b/Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.cpp @@ -18,15 +18,19 @@ static Common::replace_v replacements; -const u8 SDKey[16] = {0xAB, 0x01, 0xB9, 0xD8, 0xE1, 0x62, 0x2B, 0x08, - 0xAF, 0xBA, 0xD8, 0x4D, 0xBF, 0xC2, 0xA5, 0x5D}; -const u8 MD5_BLANKER[0x10] = {0x0E, 0x65, 0x37, 0x81, 0x99, 0xBE, 0x45, 0x17, - 0xAB, 0x06, 0xEC, 0x22, 0x45, 0x1A, 0x57, 0x93}; +const u8 SDKey[16] = { + 0xAB, 0x01, 0xB9, 0xD8, 0xE1, 0x62, 0x2B, 0x08, + 0xAF, 0xBA, 0xD8, 0x4D, 0xBF, 0xC2, 0xA5, 0x5D +}; +const u8 MD5_BLANKER[0x10] = { + 0x0E, 0x65, 0x37, 0x81, 0x99, 0xBE, 0x45, 0x17, + 0xAB, 0x06, 0xEC, 0x22, 0x45, 0x1A, 0x57, 0x93 +}; const u32 NG_id = 0x0403AC68; bool CWiiSaveCrypted::ImportWiiSave(const char* FileName) { - CWiiSaveCrypted saveFile(FileName); + CWiiSaveCrypted saveFile(FileName); return saveFile.b_valid; } @@ -147,8 +151,8 @@ void CWiiSaveCrypted::ReadHDR() m_TitleID = Common::swap64(_header.hdr.SaveGameTitle); - u8 md5_file[16], - md5_calc[16]; + u8 md5_file[16]; + u8 md5_calc[16]; memcpy(md5_file, _header.hdr.Md5, 0x10); memcpy(_header.hdr.Md5, MD5_BLANKER, 0x10); md5((u8*)&_header, HEADER_SZ, md5_calc); @@ -195,7 +199,7 @@ void CWiiSaveCrypted::WriteHDR() // remove nocopy flag _header.BNR[7] &= ~1; - u8 md5_calc[16]; + u8 md5_calc[16]; md5((u8*)&_header, HEADER_SZ, md5_calc); memcpy(_header.hdr.Md5, md5_calc, 0x10); @@ -450,13 +454,17 @@ void CWiiSaveCrypted::do_sig() u32 NG_key_id = 0x6AAB8C59; - u8 NG_priv[30] = { 0, 0xAB, 0xEE, 0xC1, 0xDD, 0xB4, 0xA6, 0x16, 0x6B, 0x70, 0xFD, 0x7E, 0x56, 0x67, 0x70, - 0x57, 0x55, 0x27, 0x38, 0xA3, 0x26, 0xC5, 0x46, 0x16, 0xF7, 0x62, 0xC9, 0xED, 0x73, 0xF2}; + u8 NG_priv[30] = { + 0, 0xAB, 0xEE, 0xC1, 0xDD, 0xB4, 0xA6, 0x16, 0x6B, 0x70, 0xFD, 0x7E, 0x56, 0x67, 0x70, + 0x57, 0x55, 0x27, 0x38, 0xA3, 0x26, 0xC5, 0x46, 0x16, 0xF7, 0x62, 0xC9, 0xED, 0x73, 0xF2 + }; - u8 NG_sig[0x3C] = {0, 0xD8, 0x81, 0x63, 0xB2, 0x00, 0x6B, 0x0B, 0x54, 0x82, 0x88, 0x63, 0x81, 0x1C, 0x00, - 0x71, 0x12, 0xED, 0xB7, 0xFD, 0x21, 0xAB, 0x0E, 0x50, 0x0E, 0x1F, 0xBF, 0x78, 0xAD, 0x37, - 0x00, 0x71, 0x8D, 0x82, 0x41, 0xEE, 0x45, 0x11, 0xC7, 0x3B, 0xAC, 0x08, 0xB6, 0x83, 0xDC, - 0x05, 0xB8, 0xA8, 0x90, 0x1F, 0xA8, 0x2A, 0x0E, 0x4E, 0x76, 0xEF, 0x44, 0x72, 0x99, 0xF8}; + u8 NG_sig[0x3C] = { + 0, 0xD8, 0x81, 0x63, 0xB2, 0x00, 0x6B, 0x0B, 0x54, 0x82, 0x88, 0x63, 0x81, 0x1C, 0x00, + 0x71, 0x12, 0xED, 0xB7, 0xFD, 0x21, 0xAB, 0x0E, 0x50, 0x0E, 0x1F, 0xBF, 0x78, 0xAD, 0x37, + 0x00, 0x71, 0x8D, 0x82, 0x41, 0xEE, 0x45, 0x11, 0xC7, 0x3B, 0xAC, 0x08, 0xB6, 0x83, 0xDC, + 0x05, 0xB8, 0xA8, 0x90, 0x1F, 0xA8, 0x2A, 0x0E, 0x4E, 0x76, 0xEF, 0x44, 0x72, 0x99, 0xF8 + }; sprintf(signer, "Root-CA00000001-MS00000002"); sprintf(name, "NG%08x", NG_id); @@ -466,7 +474,7 @@ void CWiiSaveCrypted::do_sig() memset(ap_priv, 0, sizeof ap_priv); ap_priv[10] = 1; - memset(ap_sig, 81, sizeof ap_sig); // temp + memset(ap_sig, 81, sizeof ap_sig); // temp sprintf(signer, "Root-CA00000001-MS00000002-NG%08x", NG_id); sprintf(name, "AP%08x%08x", 1, 2); diff --git a/Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.h b/Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.h index b2a3f7ee51..ba1affec0b 100644 --- a/Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.h +++ b/Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.h @@ -96,8 +96,8 @@ private: struct BK_Header // Not encrypted { u32 size; // 0x00000070 -// u16 magic; // 'Bk' -// u16 magic2; // or version (0x0001) + // u16 magic; // 'Bk' + // u16 magic2; // or version (0x0001) u32 magic; // 0x426B0001 u32 NGid; u32 numberOfFiles; diff --git a/Source/Core/DolphinWX/NetWindow.cpp b/Source/Core/DolphinWX/NetWindow.cpp index 1e7b93d17b..2f81de3341 100644 --- a/Source/Core/DolphinWX/NetWindow.cpp +++ b/Source/Core/DolphinWX/NetWindow.cpp @@ -16,7 +16,7 @@ #include <sstream> #include <string> -#define NETPLAY_TITLEBAR "Dolphin NetPlay" +#define NETPLAY_TITLEBAR "Dolphin NetPlay" #define INITIAL_PAD_BUFFER_SIZE 20 BEGIN_EVENT_TABLE(NetPlayDiag, wxFrame) diff --git a/Source/Core/DolphinWX/NetWindow.h b/Source/Core/DolphinWX/NetWindow.h index a645c0a9bf..bd59585512 100644 --- a/Source/Core/DolphinWX/NetWindow.h +++ b/Source/Core/DolphinWX/NetWindow.h @@ -43,14 +43,14 @@ private: void MakeNetPlayDiag(int port, const std::string &game, bool is_hosting); - wxTextCtrl *m_nickname_text, - *m_host_port_text, - *m_connect_port_text, - *m_connect_ip_text; + wxTextCtrl* m_nickname_text; + wxTextCtrl* m_host_port_text; + wxTextCtrl* m_connect_port_text; + wxTextCtrl* m_connect_ip_text; - wxListBox* m_game_lbox; + wxListBox* m_game_lbox; #ifdef USE_UPNP - wxCheckBox* m_upnp_chk; + wxCheckBox* m_upnp_chk; #endif const CGameListCtrl* const m_game_list; @@ -63,7 +63,7 @@ public: , const std::string& game, const bool is_hosting = false); ~NetPlayDiag(); - Common::FifoQueue<std::string> chat_msgs; + Common::FifoQueue<std::string> chat_msgs; void OnStart(wxCommandEvent& event); @@ -94,17 +94,17 @@ private: void GetNetSettings(NetSettings &settings); std::string FindGame(); - wxListBox* m_player_lbox; - wxTextCtrl* m_chat_text; - wxTextCtrl* m_chat_msg_text; - wxCheckBox* m_memcard_write; - wxCheckBox* m_record_chkbox; + wxListBox* m_player_lbox; + wxTextCtrl* m_chat_text; + wxTextCtrl* m_chat_msg_text; + wxCheckBox* m_memcard_write; + wxCheckBox* m_record_chkbox; - std::string m_selected_game; - wxButton* m_game_btn; - wxButton* m_start_btn; + std::string m_selected_game; + wxButton* m_game_btn; + wxButton* m_start_btn; - std::vector<int> m_playerids; + std::vector<int> m_playerids; const CGameListCtrl* const m_game_list; @@ -119,8 +119,8 @@ public: private: void OnPick(wxCommandEvent& event); - wxListBox* m_game_lbox; - wxString& m_game_name; + wxListBox* m_game_lbox; + wxString& m_game_name; }; class PadMapDiag : public wxDialog @@ -131,7 +131,7 @@ public: private: void OnAdjust(wxCommandEvent& event); - wxChoice* m_map_cbox[8]; + wxChoice* m_map_cbox[8]; PadMapping* const m_mapping; PadMapping* const m_wiimapping; std::vector<const Player *>& m_player_list; diff --git a/Source/Core/DolphinWX/TASInputDlg.h b/Source/Core/DolphinWX/TASInputDlg.h index 7d5b183e18..391db0858e 100644 --- a/Source/Core/DolphinWX/TASInputDlg.h +++ b/Source/Core/DolphinWX/TASInputDlg.h @@ -75,7 +75,7 @@ class TASInputDlg : public wxDialog wxCheckBox *wx_up_button, *wx_down_button, *wx_left_button, *wx_right_button, *wx_a_button, *wx_b_button, *wx_x_button, *wx_y_button, *wx_l_button, *wx_r_button, *wx_z_button, *wx_start_button; wxTextCtrl *wx_mainX_t, *wx_mainY_t, *wx_cX_t, *wx_cY_t, *wx_l_t, *wx_r_t; wxMemoryDC dc_main, dc_c; - wxStaticBitmap* static_bitmap_main, *static_bitmap_c; + wxStaticBitmap* static_bitmap_main, *static_bitmap_c; wxBitmap bitmap; bool A_turbo,B_turbo, X_turbo, Y_turbo, Z_turbo, L_turbo, R_turbo, START_turbo,DL_turbo,DR_turbo,DD_turbo,DU_turbo; bool A_cont,B_cont, X_cont, Y_cont, Z_cont, L_cont, L_button_cont, R_cont, R_button_cont, START_cont,DL_cont,DR_cont,DD_cont,DU_cont,mstickx,msticky,cstickx,csticky; diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp index d8af788d97..afe3b45161 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp @@ -489,7 +489,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con group_xfb->Add(virtual_xfb, 0, wxRIGHT, 5); group_xfb->Add(real_xfb, 0, wxRIGHT, 5); szr_hacks->Add(group_xfb, 0, wxEXPAND | wxALL, 5); - } // xfb + } // xfb // - other hacks { diff --git a/Source/Core/DolphinWX/WXInputBase.cpp b/Source/Core/DolphinWX/WXInputBase.cpp index fc05479752..267f41e35b 100644 --- a/Source/Core/DolphinWX/WXInputBase.cpp +++ b/Source/Core/DolphinWX/WXInputBase.cpp @@ -11,119 +11,120 @@ const wxString WXKeyToString(int keycode) { switch (keycode) { - case WXK_BACK: return _("Back"); - case WXK_TAB: return _("Tab"); - case WXK_RETURN: return _("Return"); - case WXK_ESCAPE: return _("Escape"); - case WXK_SPACE: return _("Space"); - case WXK_DELETE: return _("Delete"); + case WXK_BACK: return _("Back"); + case WXK_TAB: return _("Tab"); + case WXK_RETURN: return _("Return"); + case WXK_ESCAPE: return _("Escape"); + case WXK_SPACE: return _("Space"); + case WXK_DELETE: return _("Delete"); // Undocumented wx keycodes - case 167: return _("Paragraph"); - case 177: return _("Plus-Minus"); + case 167: return _("Paragraph"); + case 177: return _("Plus-Minus"); - case WXK_START: return _("Start"); - case WXK_LBUTTON: return _("L Button"); - case WXK_RBUTTON: return _("R Button"); - case WXK_CANCEL: return _("Cancel"); - case WXK_MBUTTON: return _("M Button"); - case WXK_CLEAR: return _("Clear"); - case WXK_SHIFT: return wxT("Shift"); - case WXK_ALT: return wxT("Alt"); - case WXK_RAW_CONTROL: return _("Control"); + case WXK_START: return _("Start"); + case WXK_LBUTTON: return _("L Button"); + case WXK_RBUTTON: return _("R Button"); + case WXK_CANCEL: return _("Cancel"); + case WXK_MBUTTON: return _("M Button"); + case WXK_CLEAR: return _("Clear"); + case WXK_SHIFT: return wxT("Shift"); + case WXK_ALT: return wxT("Alt"); + case WXK_RAW_CONTROL: return _("Control"); #ifdef __WXOSX__ - case WXK_COMMAND: return _("Command"); + case WXK_COMMAND: return _("Command"); #endif - case WXK_MENU: return _("Menu"); - case WXK_PAUSE: return _("Pause"); - case WXK_CAPITAL: return _("Caps Lock"); - case WXK_END: return _("End"); - case WXK_HOME: return _("Home"); - case WXK_LEFT: return _("Left"); - case WXK_UP: return _("Up"); - case WXK_RIGHT: return _("Right"); - case WXK_DOWN: return _("Down"); - case WXK_SELECT: return _("Select"); - case WXK_PRINT: return _("Print"); - case WXK_EXECUTE: return _("Execute"); - case WXK_SNAPSHOT: return _("Snapshot"); - case WXK_INSERT: return _("Insert"); - case WXK_HELP: return _("Help"); - case WXK_NUMPAD0: return wxT("NP 0"); - case WXK_NUMPAD1: return wxT("NP 1"); - case WXK_NUMPAD2: return wxT("NP 2"); - case WXK_NUMPAD3: return wxT("NP 3"); - case WXK_NUMPAD4: return wxT("NP 4"); - case WXK_NUMPAD5: return wxT("NP 5"); - case WXK_NUMPAD6: return wxT("NP 6"); - case WXK_NUMPAD7: return wxT("NP 7"); - case WXK_NUMPAD8: return wxT("NP 8"); - case WXK_NUMPAD9: return wxT("NP 9"); - case WXK_MULTIPLY: return _("Multiply"); - case WXK_ADD: return _("Add"); - case WXK_SEPARATOR: return _("Separator"); - case WXK_SUBTRACT: return _("Subtract"); - case WXK_DECIMAL: return _("Decimal"); - case WXK_DIVIDE: return _("Divide"); - case WXK_F1: return wxT("F1"); - case WXK_F2: return wxT("F2"); - case WXK_F3: return wxT("F3"); - case WXK_F4: return wxT("F4"); - case WXK_F5: return wxT("F5"); - case WXK_F6: return wxT("F6"); - case WXK_F7: return wxT("F7"); - case WXK_F8: return wxT("F8"); - case WXK_F9: return wxT("F9"); - case WXK_F10: return wxT("F10"); - case WXK_F11: return wxT("F11"); - case WXK_F12: return wxT("F12"); - case WXK_F13: return wxT("F13"); - case WXK_F14: return wxT("F14"); - case WXK_F15: return wxT("F15"); - case WXK_F16: return wxT("F16"); - case WXK_F17: return wxT("F17"); - case WXK_F18: return wxT("F19"); - case WXK_F19: return wxT("F20"); - case WXK_F20: return wxT("F21"); - case WXK_F21: return wxT("F22"); - case WXK_F22: return wxT("F23"); - case WXK_F23: return wxT("F24"); - case WXK_F24: return wxT("F25"); - case WXK_NUMLOCK: return _("Num Lock"); - case WXK_SCROLL: return _("Scroll Lock"); - case WXK_PAGEUP: return _("Page Up"); - case WXK_PAGEDOWN: return _("Page Down"); - case WXK_NUMPAD_SPACE: return _("NP Space"); - case WXK_NUMPAD_TAB: return _("NP Tab"); - case WXK_NUMPAD_ENTER: return _("NP Enter"); - case WXK_NUMPAD_F1: return wxT("NP F1"); - case WXK_NUMPAD_F2: return wxT("NP F2"); - case WXK_NUMPAD_F3: return wxT("NP F3"); - case WXK_NUMPAD_F4: return wxT("NP F4"); - case WXK_NUMPAD_HOME: return _("NP Home"); - case WXK_NUMPAD_LEFT: return _("NP Left"); - case WXK_NUMPAD_UP: return _("NP Up"); - case WXK_NUMPAD_RIGHT: return _("NP Right"); - case WXK_NUMPAD_DOWN: return _("NP Down"); - case WXK_NUMPAD_PAGEUP: return _("NP Page Up"); - case WXK_NUMPAD_PAGEDOWN: return _("NP Page Down"); - case WXK_NUMPAD_END: return _("NP End"); - case WXK_NUMPAD_BEGIN: return _("NP Begin"); - case WXK_NUMPAD_INSERT: return _("NP Insert"); - case WXK_NUMPAD_DELETE: return _("NP Delete"); - case WXK_NUMPAD_EQUAL: return _("NP Equal"); - case WXK_NUMPAD_MULTIPLY: return _("NP Multiply"); - case WXK_NUMPAD_ADD: return _("NP Add"); - case WXK_NUMPAD_SEPARATOR: return _("NP Separator"); - case WXK_NUMPAD_SUBTRACT: return _("NP Subtract"); - case WXK_NUMPAD_DECIMAL: return _("NP Decimal"); - case WXK_NUMPAD_DIVIDE: return _("NP Divide"); - case WXK_WINDOWS_LEFT: return _("Windows Left"); - case WXK_WINDOWS_RIGHT: return _("Windows Right"); - case WXK_WINDOWS_MENU: return _("Windows Menu"); + case WXK_MENU: return _("Menu"); + case WXK_PAUSE: return _("Pause"); + case WXK_CAPITAL: return _("Caps Lock"); + case WXK_END: return _("End"); + case WXK_HOME: return _("Home"); + case WXK_LEFT: return _("Left"); + case WXK_UP: return _("Up"); + case WXK_RIGHT: return _("Right"); + case WXK_DOWN: return _("Down"); + case WXK_SELECT: return _("Select"); + case WXK_PRINT: return _("Print"); + case WXK_EXECUTE: return _("Execute"); + case WXK_SNAPSHOT: return _("Snapshot"); + case WXK_INSERT: return _("Insert"); + case WXK_HELP: return _("Help"); + case WXK_NUMPAD0: return wxT("NP 0"); + case WXK_NUMPAD1: return wxT("NP 1"); + case WXK_NUMPAD2: return wxT("NP 2"); + case WXK_NUMPAD3: return wxT("NP 3"); + case WXK_NUMPAD4: return wxT("NP 4"); + case WXK_NUMPAD5: return wxT("NP 5"); + case WXK_NUMPAD6: return wxT("NP 6"); + case WXK_NUMPAD7: return wxT("NP 7"); + case WXK_NUMPAD8: return wxT("NP 8"); + case WXK_NUMPAD9: return wxT("NP 9"); + case WXK_MULTIPLY: return _("Multiply"); + case WXK_ADD: return _("Add"); + case WXK_SEPARATOR: return _("Separator"); + case WXK_SUBTRACT: return _("Subtract"); + case WXK_DECIMAL: return _("Decimal"); + case WXK_DIVIDE: return _("Divide"); + case WXK_F1: return wxT("F1"); + case WXK_F2: return wxT("F2"); + case WXK_F3: return wxT("F3"); + case WXK_F4: return wxT("F4"); + case WXK_F5: return wxT("F5"); + case WXK_F6: return wxT("F6"); + case WXK_F7: return wxT("F7"); + case WXK_F8: return wxT("F8"); + case WXK_F9: return wxT("F9"); + case WXK_F10: return wxT("F10"); + case WXK_F11: return wxT("F11"); + case WXK_F12: return wxT("F12"); + case WXK_F13: return wxT("F13"); + case WXK_F14: return wxT("F14"); + case WXK_F15: return wxT("F15"); + case WXK_F16: return wxT("F16"); + case WXK_F17: return wxT("F17"); + case WXK_F18: return wxT("F19"); + case WXK_F19: return wxT("F20"); + case WXK_F20: return wxT("F21"); + case WXK_F21: return wxT("F22"); + case WXK_F22: return wxT("F23"); + case WXK_F23: return wxT("F24"); + case WXK_F24: return wxT("F25"); + case WXK_NUMLOCK: return _("Num Lock"); + case WXK_SCROLL: return _("Scroll Lock"); + case WXK_PAGEUP: return _("Page Up"); + case WXK_PAGEDOWN: return _("Page Down"); + case WXK_NUMPAD_SPACE: return _("NP Space"); + case WXK_NUMPAD_TAB: return _("NP Tab"); + case WXK_NUMPAD_ENTER: return _("NP Enter"); + case WXK_NUMPAD_F1: return wxT("NP F1"); + case WXK_NUMPAD_F2: return wxT("NP F2"); + case WXK_NUMPAD_F3: return wxT("NP F3"); + case WXK_NUMPAD_F4: return wxT("NP F4"); + case WXK_NUMPAD_HOME: return _("NP Home"); + case WXK_NUMPAD_LEFT: return _("NP Left"); + case WXK_NUMPAD_UP: return _("NP Up"); + case WXK_NUMPAD_RIGHT: return _("NP Right"); + case WXK_NUMPAD_DOWN: return _("NP Down"); + case WXK_NUMPAD_PAGEUP: return _("NP Page Up"); + case WXK_NUMPAD_PAGEDOWN: return _("NP Page Down"); + case WXK_NUMPAD_END: return _("NP End"); + case WXK_NUMPAD_BEGIN: return _("NP Begin"); + case WXK_NUMPAD_INSERT: return _("NP Insert"); + case WXK_NUMPAD_DELETE: return _("NP Delete"); + case WXK_NUMPAD_EQUAL: return _("NP Equal"); + case WXK_NUMPAD_MULTIPLY: return _("NP Multiply"); + case WXK_NUMPAD_ADD: return _("NP Add"); + case WXK_NUMPAD_SEPARATOR: return _("NP Separator"); + case WXK_NUMPAD_SUBTRACT: return _("NP Subtract"); + case WXK_NUMPAD_DECIMAL: return _("NP Decimal"); + case WXK_NUMPAD_DIVIDE: return _("NP Divide"); + case WXK_WINDOWS_LEFT: return _("Windows Left"); + case WXK_WINDOWS_RIGHT: return _("Windows Right"); + case WXK_WINDOWS_MENU: return _("Windows Menu"); } - if (keycode > WXK_SPACE && keycode < WXK_DELETE) { + if (keycode > WXK_SPACE && keycode < WXK_DELETE) + { return wxString((wxChar)keycode, 1); } diff --git a/Source/Core/DolphinWX/WiimoteConfigDiag.h b/Source/Core/DolphinWX/WiimoteConfigDiag.h index 9329c571ac..7d7acc9784 100644 --- a/Source/Core/DolphinWX/WiimoteConfigDiag.h +++ b/Source/Core/DolphinWX/WiimoteConfigDiag.h @@ -65,7 +65,7 @@ public: private: void Cancel(wxCommandEvent& event); - InputPlugin& m_plugin; + InputPlugin& m_plugin; std::map<wxWindowID, unsigned int> m_wiimote_index_from_ctrl_id; unsigned int m_orig_wiimote_sources[MAX_BBMOTES]; diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp index 7f107812ec..b9f483da4d 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp @@ -17,12 +17,6 @@ namespace ciface namespace DInput { -//BOOL CALLBACK DIEnumEffectsCallback(LPCDIEFFECTINFO pdei, LPVOID pvRef) -//{ -// ((std::list<DIEFFECTINFO>*)pvRef)->push_back(*pdei); -// return DIENUM_CONTINUE; -//} - BOOL CALLBACK DIEnumDeviceObjectsCallback(LPCDIDEVICEOBJECTINSTANCE lpddoi, LPVOID pvRef) { ((std::list<DIDEVICEOBJECTINSTANCE>*)pvRef)->push_back(*lpddoi); diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp index 8b11bb181f..07e439e4eb 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp @@ -17,7 +17,7 @@ namespace ciface namespace DInput { -#define DATA_BUFFER_SIZE 32 +#define DATA_BUFFER_SIZE 32 //----------------------------------------------------------------------------- // Modified some MSDN code to get all the XInput device GUID.Data1 values in a vector, @@ -130,7 +130,7 @@ void InitJoystick(IDirectInput8* const idi8, std::vector<Core::Device*>& devices // this is used to number the joysticks // multiple joysticks with the same name shall get unique ids starting at 0 - std::map< std::basic_string<TCHAR>, int> name_counts; + std::map< std::basic_string<TCHAR>, int> name_counts; std::vector<DWORD> xinput_guids; GetXInputGUIDS( xinput_guids ); diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp index c79f4e3365..4b17574d7b 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp @@ -218,12 +218,12 @@ bool KeyboardMouse::UpdateOutput() { bool want_on = false; if (m_state_out[i]) - want_on = m_state_out[i] > GetTickCount() % 255 ; // light should flash when output is 0.5 + want_on = m_state_out[i] > GetTickCount() % 255 ; // light should flash when output is 0.5 // lights are set to their original state when output is zero if (want_on ^ m_current_state_out[i]) { - kbinputs.push_back(KInput(named_lights[i].code)); // press + kbinputs.push_back(KInput(named_lights[i].code)); // press kbinputs.push_back(KInput(named_lights[i].code, true)); // release m_current_state_out[i] ^= 1; diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp index 0c4f026a9e..ff96aabb4b 100644 --- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp @@ -61,7 +61,7 @@ bool ForceFeedbackDevice::InitForceFeedback(const LPDIRECTINPUTDEVICE8 device, i memset(&eff, 0, sizeof(eff)); eff.dwSize = sizeof(DIEFFECT); eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS; - eff.dwDuration = INFINITE; // (4 * DI_SECONDS) + eff.dwDuration = INFINITE; // (4 * DI_SECONDS) eff.dwSamplePeriod = 0; eff.dwGain = DI_FFNOMINALMAX; eff.dwTriggerButton = DIEB_NOTRIGGER; @@ -175,7 +175,7 @@ void ForceFeedbackDevice::ForceConstant::SetState(const ControlState state) if (val != new_val) { val = new_val; - m_state.params = ¶ms; // tells UpdateOutput the state has changed + m_state.params = ¶ms; // tells UpdateOutput the state has changed // tells UpdateOutput to either start or stop the force m_state.size = new_val ? sizeof(params) : 0; @@ -190,7 +190,7 @@ void ForceFeedbackDevice::ForceRamp::SetState(const ControlState state) if (params.lStart != new_val) { params.lStart = params.lEnd = new_val; - m_state.params = ¶ms; // tells UpdateOutput the state has changed + m_state.params = ¶ms; // tells UpdateOutput the state has changed // tells UpdateOutput to either start or stop the force m_state.size = new_val ? sizeof(params) : 0; @@ -206,9 +206,9 @@ void ForceFeedbackDevice::ForcePeriodic::SetState(const ControlState state) if (val != new_val) { val = new_val; - //params.dwPeriod = 0;//DWORD(0.05 * DI_SECONDS); // zero is working fine for me + //params.dwPeriod = 0;//DWORD(0.05 * DI_SECONDS); // zero is working fine for me - m_state.params = ¶ms; // tells UpdateOutput the state has changed + m_state.params = ¶ms; // tells UpdateOutput the state has changed // tells UpdateOutput to either start or stop the force m_state.size = new_val ? sizeof(params) : 0; diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h index 72087f82a7..3ad20ad039 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h @@ -25,33 +25,36 @@ private: : m_element(element), m_device(device) {} ControlState GetState() const; private: - const IOHIDElementRef m_element; - const IOHIDDeviceRef m_device; + const IOHIDElementRef m_element; + const IOHIDDeviceRef m_device; }; class Axis : public Input { public: - enum direction { + enum direction + { positive = 0, negative }; std::string GetName() const; Axis(IOHIDElementRef element, IOHIDDeviceRef device, direction dir); ControlState GetState() const; + private: - const IOHIDElementRef m_element; - const IOHIDDeviceRef m_device; - std::string m_name; - const direction m_direction; - float m_neutral; - float m_scale; + const IOHIDElementRef m_element; + const IOHIDDeviceRef m_device; + std::string m_name; + const direction m_direction; + float m_neutral; + float m_scale; }; class Hat : public Input { public: - enum direction { + enum direction + { up = 0, right, down, @@ -60,11 +63,12 @@ private: std::string GetName() const; Hat(IOHIDElementRef element, IOHIDDeviceRef device, direction dir); ControlState GetState() const; + private: - const IOHIDElementRef m_element; - const IOHIDDeviceRef m_device; - const char* m_name; - const direction m_direction; + const IOHIDElementRef m_element; + const IOHIDDeviceRef m_device; + const char* m_name; + const direction m_direction; }; public: @@ -78,9 +82,9 @@ public: int GetId() const; private: - const IOHIDDeviceRef m_device; - const std::string m_device_name; - const int m_index; + const IOHIDDeviceRef m_device; + const std::string m_device_name; + const int m_index; ForceFeedback::FFDeviceAdapterReference m_ff_device; }; diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp index 23d247d704..074308305c 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp @@ -31,7 +31,7 @@ void Init( std::vector<Core::Device*>& devices ) { // this is used to number the joysticks // multiple joysticks with the same name shall get unique ids starting at 0 - std::map<std::string, int> name_counts; + std::map<std::string, int> name_counts; if (SDL_Init( SDL_INIT_FLAGS ) >= 0) { @@ -335,7 +335,7 @@ bool Joystick::UpdateOutput() { if (i.effect.type) // if ouputstate >0 { - SDL_HapticUpdateEffect(m_haptic, i.id, &i.effect); // update the effect + SDL_HapticUpdateEffect(m_haptic, i.id, &i.effect); // update the effect } else { diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h index 2d0c1c20ea..f9ed688932 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h @@ -16,9 +16,9 @@ #ifdef USE_SDL_HAPTIC #include <SDL_haptic.h> - #define SDL_INIT_FLAGS SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC + #define SDL_INIT_FLAGS SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC #else - #define SDL_INIT_FLAGS SDL_INIT_JOYSTICK + #define SDL_INIT_FLAGS SDL_INIT_JOYSTICK #endif namespace ciface diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp index 0aa639aae8..a5b382e1ff 100644 --- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp +++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp @@ -121,7 +121,7 @@ Device::Device(const XINPUT_CAPABILITIES& caps, u8 index) // get supported triggers for (int i = 0; i != sizeof(named_triggers)/sizeof(*named_triggers); ++i) { - //BYTE val = (&caps.Gamepad.bLeftTrigger)[i]; // should be max value / MSDN lies + //BYTE val = (&caps.Gamepad.bLeftTrigger)[i]; // should be max value / MSDN lies if ((&caps.Gamepad.bLeftTrigger)[i]) AddInput(new Trigger(i, (&m_state_in.Gamepad.bLeftTrigger)[i], 255 )); } @@ -143,7 +143,7 @@ Device::Device(const XINPUT_CAPABILITIES& caps, u8 index) // get supported motors for (int i = 0; i != sizeof(named_motors)/sizeof(*named_motors); ++i) { - //WORD val = (&caps.Vibration.wLeftMotorSpeed)[i]; // should be max value / nope, more lies + //WORD val = (&caps.Vibration.wLeftMotorSpeed)[i]; // should be max value / nope, more lies if ((&caps.Vibration.wLeftMotorSpeed)[i]) AddOutput(new Motor(i, (&m_state_out.wLeftMotorSpeed)[i], 65535)); } diff --git a/Source/Core/InputCommon/UDPWiimote.cpp b/Source/Core/InputCommon/UDPWiimote.cpp index 35380a29b6..79b4fc020c 100644 --- a/Source/Core/InputCommon/UDPWiimote.cpp +++ b/Source/Core/InputCommon/UDPWiimote.cpp @@ -259,9 +259,9 @@ int UDPWiimote::pharsePacket(u8 * bf, size_t size) if (bf[0] != 0xde) return -1; //if (bf[1]==0) - // time=0; + // time=0; //if (bf[1]<time) //NOT LONGER NEEDED TO ALLOW MULTIPLE IPHONES ON A SINGLE PORT - // return -1; + // return -1; //time=bf[1]; u32 *p=(u32*)(&bf[3]); if (bf[2] & ACCEL_FLAG) diff --git a/Source/Core/InputCommon/stdafx.h b/Source/Core/InputCommon/stdafx.h index 498a15a12f..613c8995a2 100644 --- a/Source/Core/InputCommon/stdafx.h +++ b/Source/Core/InputCommon/stdafx.h @@ -9,6 +9,6 @@ #define _WIN32_IE 0x0500 // Default value is 0x0400 #endif */ -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #include <algorithm> diff --git a/Source/Core/VideoBackends/D3D/D3DUtil.h b/Source/Core/VideoBackends/D3D/D3DUtil.h index ff789a1cb9..653b32a273 100644 --- a/Source/Core/VideoBackends/D3D/D3DUtil.h +++ b/Source/Core/VideoBackends/D3D/D3DUtil.h @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#pragma once +#pragma once #include <d3d11.h> #include <MathUtil.h> diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index 4220e4c87d..f9b40dddbd 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/Render.cpp @@ -465,9 +465,9 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(), NULL); D3D::drawColorQuad(rgbaColor, (float)RectToLock.left * 2.f / (float)Renderer::GetTargetWidth() - 1.f, - - (float)RectToLock.top * 2.f / (float)Renderer::GetTargetHeight() + 1.f, - (float)RectToLock.right * 2.f / (float)Renderer::GetTargetWidth() - 1.f, - - (float)RectToLock.bottom * 2.f / (float)Renderer::GetTargetHeight() + 1.f); + - (float)RectToLock.top * 2.f / (float)Renderer::GetTargetHeight() + 1.f, + (float)RectToLock.right * 2.f / (float)Renderer::GetTargetWidth() - 1.f, + - (float)RectToLock.bottom * 2.f / (float)Renderer::GetTargetHeight() + 1.f); RestoreAPIState(); return 0; @@ -514,10 +514,9 @@ void Renderer::SetViewport() Ht = (Y + Ht <= GetTargetHeight()) ? Ht : (GetTargetHeight() - Y); // Some games set invalid values for z-min and z-max so fix them to the max and min allowed and let the shaders do this work - D3D11_VIEWPORT vp = CD3D11_VIEWPORT(X, Y, - Wd, Ht, - 0.f, // (xfregs.viewport.farZ - xfregs.viewport.zRange) / 16777216.0f; - 1.f); // xfregs.viewport.farZ / 16777216.0f; + D3D11_VIEWPORT vp = CD3D11_VIEWPORT(X, Y, Wd, Ht, + 0.f, // (xfregs.viewport.farZ - xfregs.viewport.zRange) / 16777216.0f; + 1.f); // xfregs.viewport.farZ / 16777216.0f; D3D::context->RSSetViewports(1, &vp); } diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp index 5716130276..44fea1b369 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp +++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp @@ -1571,9 +1571,9 @@ namespace GLExtensions bool _isES; u32 _GLVersion; std::unordered_map<std::string, bool> m_extension_list; - + // Private initialization functions - bool InitFunctionPointers(); + bool InitFunctionPointers(); // Initializes the extension list the old way void InitExtensionList21() @@ -1767,7 +1767,7 @@ namespace GLExtensions // Grab a few functions for initial checking // We need them to grab the extension list // Also to check if there is an error grabbing the version - // If it fails then the user's drivers don't support GL 3.0 + // If it fails then the user's drivers don't support GL 3.0 if (GetFuncAddress ("glGetIntegerv", (void**)&glGetIntegerv) == NULL) return false; if (GetFuncAddress("glGetString", (void**)&glGetString) == NULL) @@ -1781,7 +1781,7 @@ namespace GLExtensions InitExtensionList(); return InitFunctionPointers(); - } + } // Private initialization functions bool HasFeatures(const std::string& extensions) diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 8fe0f0931a..8a07165a13 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -924,15 +924,15 @@ void Renderer::UpdateEFBCache(EFBAccessType type, u32 cacheRectIdx, const EFBRec // and EFB pokes (which will change the color or depth of a pixel). // // The behavior of EFB peeks can only be modified by: -// - GX_PokeAlphaRead +// - GX_PokeAlphaRead // The behavior of EFB pokes can be modified by: -// - GX_PokeAlphaMode (TODO) -// - GX_PokeAlphaUpdate (TODO) -// - GX_PokeBlendMode (TODO) -// - GX_PokeColorUpdate (TODO) -// - GX_PokeDither (TODO) -// - GX_PokeDstAlpha (TODO) -// - GX_PokeZMode (TODO) +// - GX_PokeAlphaMode (TODO) +// - GX_PokeAlphaUpdate (TODO) +// - GX_PokeBlendMode (TODO) +// - GX_PokeColorUpdate (TODO) +// - GX_PokeDither (TODO) +// - GX_PokeDstAlpha (TODO) +// - GX_PokeZMode (TODO) u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) { u32 cacheRectIdx = (y / EFB_CACHE_RECT_SIZE) * EFB_CACHE_WIDTH diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/TextureConverter.cpp index bf36523929..08ebde398c 100644 --- a/Source/Core/VideoBackends/OGL/TextureConverter.cpp +++ b/Source/Core/VideoBackends/OGL/TextureConverter.cpp @@ -26,8 +26,8 @@ namespace TextureConverter using OGL::TextureCache; static GLuint s_texConvFrameBuffer[2] = {0,0}; -static GLuint s_srcTexture = 0; // for decoding from RAM -static GLuint s_dstTexture = 0; // for encoding to RAM +static GLuint s_srcTexture = 0; // for decoding from RAM +static GLuint s_dstTexture = 0; // for encoding to RAM const int renderBufferWidth = 1024; const int renderBufferHeight = 1024; diff --git a/Source/Core/VideoBackends/Software/BPMemLoader.cpp b/Source/Core/VideoBackends/Software/BPMemLoader.cpp index f6f810791d..946e792b3f 100644 --- a/Source/Core/VideoBackends/Software/BPMemLoader.cpp +++ b/Source/Core/VideoBackends/Software/BPMemLoader.cpp @@ -151,7 +151,7 @@ void SWBPWritten(int address, int newvalue) } } } - break; + break; case BPMEM_TEV_REGISTER_L: // Reg 1 case BPMEM_TEV_REGISTER_L+2: // Reg 2 diff --git a/Source/Core/VideoBackends/Software/EfbInterface.cpp b/Source/Core/VideoBackends/Software/EfbInterface.cpp index 8fdcb5fa04..c5c7724462 100644 --- a/Source/Core/VideoBackends/Software/EfbInterface.cpp +++ b/Source/Core/VideoBackends/Software/EfbInterface.cpp @@ -72,9 +72,9 @@ namespace EfbInterface u32 src = *(u32*)rgb; u32 *dst = (u32*)&efb[offset]; u32 val = *dst & 0xff00003f; - val |= (src >> 4) & 0x00000fc0; // blue - val |= (src >> 6) & 0x0003f000; // green - val |= (src >> 8) & 0x00fc0000; // red + val |= (src >> 4) & 0x00000fc0; // blue + val |= (src >> 6) & 0x0003f000; // green + val |= (src >> 8) & 0x00fc0000; // red *dst = val; } break; @@ -112,10 +112,10 @@ namespace EfbInterface u32 src = *(u32*)color; u32 *dst = (u32*)&efb[offset]; u32 val = *dst & 0xff000000; - val |= (src >> 2) & 0x0000003f; // alpha - val |= (src >> 4) & 0x00000fc0; // blue - val |= (src >> 6) & 0x0003f000; // green - val |= (src >> 8) & 0x00fc0000; // red + val |= (src >> 2) & 0x0000003f; // alpha + val |= (src >> 4) & 0x00000fc0; // blue + val |= (src >> 6) & 0x0003f000; // green + val |= (src >> 8) & 0x00fc0000; // red *dst = val; } break; diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp index 21f0a97abd..ea2b220d53 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp @@ -191,8 +191,8 @@ void DecodeStandard(u32 bufferSize) // zelda 4 swords calls it and checks the metrics registers after that break; - case GX_CMD_INVL_VC:// Invalidate (vertex cache?) - DEBUG_LOG(VIDEO, "Invalidate (vertex cache?)"); + case GX_CMD_INVL_VC:// Invalidate (vertex cache?) + DEBUG_LOG(VIDEO, "Invalidate (vertex cache?)"); break; case GX_LOAD_BP_REG: //0x61 diff --git a/Source/Core/VideoBackends/Software/SWPixelEngine.cpp b/Source/Core/VideoBackends/Software/SWPixelEngine.cpp index 335a9cb012..e32384982e 100644 --- a/Source/Core/VideoBackends/Software/SWPixelEngine.cpp +++ b/Source/Core/VideoBackends/Software/SWPixelEngine.cpp @@ -78,13 +78,13 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base) MMIO::ComplexWrite<u16>([](u32, u16 val) { UPECtrlReg tmpCtrl(val); - if (tmpCtrl.PEToken) g_bSignalTokenInterrupt = false; - if (tmpCtrl.PEFinish) g_bSignalFinishInterrupt = false; + if (tmpCtrl.PEToken) g_bSignalTokenInterrupt = false; + if (tmpCtrl.PEFinish) g_bSignalFinishInterrupt = false; pereg.ctrl.PETokenEnable = tmpCtrl.PETokenEnable; pereg.ctrl.PEFinishEnable = tmpCtrl.PEFinishEnable; - pereg.ctrl.PEToken = 0; // this flag is write only - pereg.ctrl.PEFinish = 0; // this flag is write only + pereg.ctrl.PEToken = 0; // this flag is write only + pereg.ctrl.PEFinish = 0; // this flag is write only UpdateInterrupts(); }) @@ -99,7 +99,7 @@ bool AllowIdleSkipping() void UpdateInterrupts() { // check if there is a token-interrupt - if (g_bSignalTokenInterrupt & pereg.ctrl.PETokenEnable) + if (g_bSignalTokenInterrupt & pereg.ctrl.PETokenEnable) ProcessorInterface::SetInterrupt(INT_CAUSE_PE_TOKEN, true); else ProcessorInterface::SetInterrupt(INT_CAUSE_PE_TOKEN, false); diff --git a/Source/Core/VideoBackends/Software/SWRenderer.h b/Source/Core/VideoBackends/Software/SWRenderer.h index 97b65566dd..83330d772a 100644 --- a/Source/Core/VideoBackends/Software/SWRenderer.h +++ b/Source/Core/VideoBackends/Software/SWRenderer.h @@ -9,7 +9,7 @@ #include "Thread.h" namespace SWRenderer -{ +{ void Init(); void Prepare(); void Shutdown(); diff --git a/Source/Core/VideoCommon/BPMemory.h b/Source/Core/VideoCommon/BPMemory.h index 72245d0a5f..749ae4d1c2 100644 --- a/Source/Core/VideoCommon/BPMemory.h +++ b/Source/Core/VideoCommon/BPMemory.h @@ -33,7 +33,7 @@ #define BPMEM_FIELDMASK 0x44 #define BPMEM_SETDRAWDONE 0x45 #define BPMEM_BUSCLOCK0 0x46 -#define BPMEM_PE_TOKEN_ID 0x47 +#define BPMEM_PE_TOKEN_ID 0x47 #define BPMEM_PE_TOKEN_INT_ID 0x48 #define BPMEM_EFB_TL 0x49 #define BPMEM_EFB_BR 0x4A diff --git a/Source/Core/VideoCommon/CommandProcessor.cpp b/Source/Core/VideoCommon/CommandProcessor.cpp index e3f6937b0e..3383d7f79a 100644 --- a/Source/Core/VideoCommon/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/CommandProcessor.cpp @@ -31,8 +31,8 @@ int et_UpdateInterrupts; // STATE_TO_SAVE SCPFifoStruct fifo; UCPStatusReg m_CPStatusReg; -UCPCtrlReg m_CPCtrlReg; -UCPClearReg m_CPClearReg; +UCPCtrlReg m_CPCtrlReg; +UCPClearReg m_CPClearReg; u16 m_bboxleft; u16 m_bboxtop; @@ -541,11 +541,11 @@ void SetCpControlRegister() // We don't emulate proper GP timing anyway at the moment, so this code would just slow down emulation. void SetCpClearRegister() { -// if (IsOnThread()) -// { -// if (!m_CPClearReg.ClearFifoUnderflow && m_CPClearReg.ClearFifoOverflow) -// bProcessFifoToLoWatermark = true; -// } + // if (IsOnThread()) + // { + // if (!m_CPClearReg.ClearFifoUnderflow && m_CPClearReg.ClearFifoOverflow) + // bProcessFifoToLoWatermark = true; + // } } void Update() diff --git a/Source/Core/VideoCommon/Debugger.cpp b/Source/Core/VideoCommon/Debugger.cpp index 321fed8291..e936060688 100644 --- a/Source/Core/VideoCommon/Debugger.cpp +++ b/Source/Core/VideoCommon/Debugger.cpp @@ -58,7 +58,7 @@ void GFXDebuggerCheckAndPause(bool update) { g_video_backend->UpdateFPSDisplay("Paused by Video Debugger"); - if (update) GFXDebuggerUpdateScreen(); + if (update) GFXDebuggerUpdateScreen(); SLEEP(5); } g_pdebugger->OnContinue(); diff --git a/Source/Core/VideoCommon/DriverDetails.cpp b/Source/Core/VideoCommon/DriverDetails.cpp index 7ecad228ba..b15c5cfbd4 100644 --- a/Source/Core/VideoCommon/DriverDetails.cpp +++ b/Source/Core/VideoCommon/DriverDetails.cpp @@ -32,10 +32,10 @@ namespace DriverDetails const u32 m_os = OS_ALL | OS_LINUX; #endif - Vendor m_vendor = VENDOR_UNKNOWN; - Driver m_driver = DRIVER_UNKNOWN; - s32 m_family = 0; - double m_version = 0.0; + Vendor m_vendor = VENDOR_UNKNOWN; + Driver m_driver = DRIVER_UNKNOWN; + s32 m_family = 0; + double m_version = 0.0; // This is a list of all known bugs for each vendor // We use this to check if the device and driver has a issue diff --git a/Source/Core/VideoCommon/OpcodeDecoding.cpp b/Source/Core/VideoCommon/OpcodeDecoding.cpp index 4211bd650d..cb47639b81 100644 --- a/Source/Core/VideoCommon/OpcodeDecoding.cpp +++ b/Source/Core/VideoCommon/OpcodeDecoding.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. //DL facts: -// Ikaruga uses (nearly) NO display lists! +// Ikaruga uses (nearly) NO display lists! // Zelda WW uses TONS of display lists // Zelda TP uses almost 100% display lists except menus (we like this!) // Super Mario Galaxy has nearly all geometry and more than half of the state in DLs (great!) diff --git a/Source/Core/VideoCommon/PixelEngine.cpp b/Source/Core/VideoCommon/PixelEngine.cpp index 9a5137a60e..de46dce77a 100644 --- a/Source/Core/VideoCommon/PixelEngine.cpp +++ b/Source/Core/VideoCommon/PixelEngine.cpp @@ -221,13 +221,13 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base) MMIO::ComplexWrite<u16>([](u32, u16 val) { UPECtrlReg tmpCtrl(val); - if (tmpCtrl.PEToken) g_bSignalTokenInterrupt = 0; - if (tmpCtrl.PEFinish) g_bSignalFinishInterrupt = 0; + if (tmpCtrl.PEToken) g_bSignalTokenInterrupt = 0; + if (tmpCtrl.PEFinish) g_bSignalFinishInterrupt = 0; m_Control.PETokenEnable = tmpCtrl.PETokenEnable; m_Control.PEFinishEnable = tmpCtrl.PEFinishEnable; - m_Control.PEToken = 0; // this flag is write only - m_Control.PEFinish = 0; // this flag is write only + m_Control.PEToken = 0; // this flag is write only + m_Control.PEFinish = 0; // this flag is write only DEBUG_LOG(PIXELENGINE, "(w16) CTRL_REGISTER: 0x%04x", val); UpdateInterrupts(); @@ -280,8 +280,8 @@ void UpdateFinishInterrupt(bool active) } // TODO(mb2): Refactor SetTokenINT_OnMainThread(u64 userdata, int cyclesLate). -// Think about the right order between tokenVal and tokenINT... one day maybe. -// Cleanup++ +// Think about the right order between tokenVal and tokenINT... one day maybe. +// Cleanup++ // Called only if BPMEM_PE_TOKEN_INT_ID is ack by GP void SetToken_OnMainThread(u64 userdata, int cyclesLate) diff --git a/Source/Core/VideoCommon/PixelShaderGen.h b/Source/Core/VideoCommon/PixelShaderGen.h index e1feb06ba8..8a30e35539 100644 --- a/Source/Core/VideoCommon/PixelShaderGen.h +++ b/Source/Core/VideoCommon/PixelShaderGen.h @@ -21,18 +21,18 @@ #define I_PMATERIALS "cPmtrl" // TODO: get rid of them as they aren't used -#define C_COLORMATRIX 0 // 0 -#define C_COLORS 0 // 0 -#define C_KCOLORS (C_COLORS + 4) // 4 -#define C_ALPHA (C_KCOLORS + 4) // 8 -#define C_TEXDIMS (C_ALPHA + 1) // 9 -#define C_ZBIAS (C_TEXDIMS + 8) //17 -#define C_INDTEXSCALE (C_ZBIAS + 2) //19 -#define C_INDTEXMTX (C_INDTEXSCALE + 2) //21 -#define C_FOG (C_INDTEXMTX + 6) //27 - -#define C_PLIGHTS (C_FOG + 3) -#define C_PMATERIALS (C_PLIGHTS + 40) +#define C_COLORMATRIX 0 // 0 +#define C_COLORS 0 // 0 +#define C_KCOLORS (C_COLORS + 4) // 4 +#define C_ALPHA (C_KCOLORS + 4) // 8 +#define C_TEXDIMS (C_ALPHA + 1) // 9 +#define C_ZBIAS (C_TEXDIMS + 8) //17 +#define C_INDTEXSCALE (C_ZBIAS + 2) //19 +#define C_INDTEXMTX (C_INDTEXSCALE + 2) //21 +#define C_FOG (C_INDTEXMTX + 6) //27 + +#define C_PLIGHTS (C_FOG + 3) +#define C_PMATERIALS (C_PLIGHTS + 40) #define C_PENVCONST_END (C_PMATERIALS + 4) // Different ways to achieve rendering with destination alpha diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 45bd870670..28e7893b09 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -441,7 +441,7 @@ void Renderer::UpdateDrawRectangle(int backbuffer_width, int backbuffer_height) // ----------------------------------------------------------------------- // Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10. - // Output: FloatGLWidth, FloatGLHeight, FloatXOffset, FloatYOffset + // Output: FloatGLWidth, FloatGLHeight, FloatXOffset, FloatYOffset // ------------------ if (g_ActiveConfig.iAspectRatio != ASPECT_STRETCH && g_ActiveConfig.bCrop) { diff --git a/Source/Core/VideoCommon/ShaderGenCommon.h b/Source/Core/VideoCommon/ShaderGenCommon.h index 9d2e8e1fa7..93f4f14ef3 100644 --- a/Source/Core/VideoCommon/ShaderGenCommon.h +++ b/Source/Core/VideoCommon/ShaderGenCommon.h @@ -144,7 +144,7 @@ public: { // TODO: Not ready for usage yet return true; -// return constant_usage[index]; + //return constant_usage[index]; } private: std::vector<bool> constant_usage; // TODO: Is vector<bool> appropriate here? diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp index 6903f778c7..6748228b2f 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/TextureCacheBase.cpp @@ -130,7 +130,7 @@ void TextureCache::Cleanup() TexCache::iterator tcend = textures.end(); while (iter != tcend) { - if ( frameCount > TEXTURE_KILL_THRESHOLD + iter->second->frameCount + if (frameCount > TEXTURE_KILL_THRESHOLD + iter->second->frameCount // EFB copies living on the host GPU are unrecoverable and thus shouldn't be deleted && ! iter->second->IsEfbCopy() ) @@ -378,12 +378,12 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int const stage, tlut_hash = GetHash64(&texMem[tlutaddr], palette_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); // NOTE: For non-paletted textures, texID is equal to the texture address. - // A paletted texture, however, may have multiple texIDs assigned though depending on the currently used tlut. - // This (changing texID depending on the tlut_hash) is a trick to get around - // an issue with Metroid Prime's fonts (it has multiple sets of fonts on each other - // stored in a single texture and uses the palette to make different characters - // visible or invisible. Thus, unless we want to recreate the textures for every drawn character, - // we must make sure that a paletted texture gets assigned multiple IDs for each tlut used. + // A paletted texture, however, may have multiple texIDs assigned though depending on the currently used tlut. + // This (changing texID depending on the tlut_hash) is a trick to get around + // an issue with Metroid Prime's fonts (it has multiple sets of fonts on each other + // stored in a single texture and uses the palette to make different characters + // visible or invisible. Thus, unless we want to recreate the textures for every drawn character, + // we must make sure that a paletted texture gets assigned multiple IDs for each tlut used. // // TODO: Because texID isn't always the same as the address now, CopyRenderTargetToTexture might be broken now texID ^= ((u32)tlut_hash) ^(u32)(tlut_hash >> 32); @@ -579,40 +579,40 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat // Emulation methods: // // - EFB to RAM: - // Encodes the requested EFB data at its native resolution to the emulated RAM using shaders. - // Load() decodes the data from there again (using TextureDecoder) if the EFB copy is being used as a texture again. - // Advantage: CPU can read data from the EFB copy and we don't lose any important updates to the texture - // Disadvantage: Encoding+decoding steps often are redundant because only some games read or modify EFB copies before using them as textures. + // Encodes the requested EFB data at its native resolution to the emulated RAM using shaders. + // Load() decodes the data from there again (using TextureDecoder) if the EFB copy is being used as a texture again. + // Advantage: CPU can read data from the EFB copy and we don't lose any important updates to the texture + // Disadvantage: Encoding+decoding steps often are redundant because only some games read or modify EFB copies before using them as textures. // // - EFB to texture: - // Copies the requested EFB data to a texture object in VRAM, performing any color conversion using shaders. - // Advantage: Works for many games, since in most cases EFB copies aren't read or modified at all before being used as a texture again. - // Since we don't do any further encoding or decoding here, this method is much faster. - // It also allows enhancing the visual quality by doing scaled EFB copies. + // Copies the requested EFB data to a texture object in VRAM, performing any color conversion using shaders. + // Advantage: Works for many games, since in most cases EFB copies aren't read or modified at all before being used as a texture again. + // Since we don't do any further encoding or decoding here, this method is much faster. + // It also allows enhancing the visual quality by doing scaled EFB copies. // // - Hybrid EFB copies: - // 1a) Whenever this function gets called, encode the requested EFB data to RAM (like EFB to RAM) - // 1b) Set type to TCET_EC_DYNAMIC for all texture cache entries in the destination address range. - // If EFB copy caching is enabled, further checks will (try to) prevent redundant EFB copies. - // 2) Check if a texture cache entry for the specified dstAddr already exists (i.e. if an EFB copy was triggered to that address before): - // 2a) Entry doesn't exist: - // - Also copy the requested EFB data to a texture object in VRAM (like EFB to texture) - // - Create a texture cache entry for the target (type = TCET_EC_VRAM) - // - Store a hash of the encoded RAM data in the texcache entry. - // 2b) Entry exists AND type is TCET_EC_VRAM: - // - Like case 2a, but reuse the old texcache entry instead of creating a new one. - // 2c) Entry exists AND type is TCET_EC_DYNAMIC: - // - Only encode the texture to RAM (like EFB to RAM) and store a hash of the encoded data in the existing texcache entry. - // - Do NOT copy the requested EFB data to a VRAM object. Reason: the texture is dynamic, i.e. the CPU is modifying it. Storing a VRAM copy is useless, because we'd always end up deleting it and reloading the data from RAM anyway. - // 3) If the EFB copy gets used as a texture, compare the source RAM hash with the hash you stored when encoding the EFB data to RAM. - // 3a) If the two hashes match AND type is TCET_EC_VRAM, reuse the VRAM copy you created - // 3b) If the two hashes differ AND type is TCET_EC_VRAM, screw your existing VRAM copy. Set type to TCET_EC_DYNAMIC. - // Redecode the source RAM data to a VRAM object. The entry basically behaves like a normal texture now. - // 3c) If type is TCET_EC_DYNAMIC, treat the EFB copy like a normal texture. - // Advantage: Non-dynamic EFB copies can be visually enhanced like with EFB to texture. - // Compatibility is as good as EFB to RAM. - // Disadvantage: Slower than EFB to texture and often even slower than EFB to RAM. - // EFB copy cache depends on accurate texture hashing being enabled. However, with accurate hashing you end up being as slow as without a copy cache anyway. + // 1a) Whenever this function gets called, encode the requested EFB data to RAM (like EFB to RAM) + // 1b) Set type to TCET_EC_DYNAMIC for all texture cache entries in the destination address range. + // If EFB copy caching is enabled, further checks will (try to) prevent redundant EFB copies. + // 2) Check if a texture cache entry for the specified dstAddr already exists (i.e. if an EFB copy was triggered to that address before): + // 2a) Entry doesn't exist: + // - Also copy the requested EFB data to a texture object in VRAM (like EFB to texture) + // - Create a texture cache entry for the target (type = TCET_EC_VRAM) + // - Store a hash of the encoded RAM data in the texcache entry. + // 2b) Entry exists AND type is TCET_EC_VRAM: + // - Like case 2a, but reuse the old texcache entry instead of creating a new one. + // 2c) Entry exists AND type is TCET_EC_DYNAMIC: + // - Only encode the texture to RAM (like EFB to RAM) and store a hash of the encoded data in the existing texcache entry. + // - Do NOT copy the requested EFB data to a VRAM object. Reason: the texture is dynamic, i.e. the CPU is modifying it. Storing a VRAM copy is useless, because we'd always end up deleting it and reloading the data from RAM anyway. + // 3) If the EFB copy gets used as a texture, compare the source RAM hash with the hash you stored when encoding the EFB data to RAM. + // 3a) If the two hashes match AND type is TCET_EC_VRAM, reuse the VRAM copy you created + // 3b) If the two hashes differ AND type is TCET_EC_VRAM, screw your existing VRAM copy. Set type to TCET_EC_DYNAMIC. + // Redecode the source RAM data to a VRAM object. The entry basically behaves like a normal texture now. + // 3c) If type is TCET_EC_DYNAMIC, treat the EFB copy like a normal texture. + // Advantage: Non-dynamic EFB copies can be visually enhanced like with EFB to texture. + // Compatibility is as good as EFB to RAM. + // Disadvantage: Slower than EFB to texture and often even slower than EFB to RAM. + // EFB copy cache depends on accurate texture hashing being enabled. However, with accurate hashing you end up being as slow as without a copy cache anyway. // // Disadvantage of all methods: Calling this function requires the GPU to perform a pipeline flush which stalls any further CPU processing. // diff --git a/Source/Core/VideoCommon/TextureCacheBase.h b/Source/Core/VideoCommon/TextureCacheBase.h index f459dabb76..81fcd88ee6 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.h +++ b/Source/Core/VideoCommon/TextureCacheBase.h @@ -21,8 +21,8 @@ public: enum TexCacheEntryType { TCET_NORMAL, - TCET_EC_VRAM, // EFB copy which sits in VRAM and is ready to be used - TCET_EC_DYNAMIC, // EFB copy which sits in RAM and needs to be decoded before being used + TCET_EC_VRAM, // EFB copy which sits in VRAM and is ready to be used + TCET_EC_DYNAMIC, // EFB copy which sits in RAM and needs to be decoded before being used }; struct TCacheEntryBase @@ -94,7 +94,7 @@ public: static void Invalidate(); static void InvalidateRange(u32 start_address, u32 size); static void MakeRangeDynamic(u32 start_address, u32 size); - static void ClearRenderTargets(); // currently only used by OGL + static void ClearRenderTargets(); // currently only used by OGL static bool Find(u32 start_address, u64 hash); virtual TCacheEntryBase* CreateTexture(unsigned int width, unsigned int height, diff --git a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp index 4b24409ce3..a4f301e36c 100644 --- a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp @@ -1468,25 +1468,25 @@ PC_TexFormat TexDecoder_DecodeRGBA8FromTmem(u8* dst, const u8 *src_ar, const u8 const char* texfmt[] = { // pixel - "I4", "I8", "IA4", "IA8", - "RGB565", "RGB5A3", "RGBA8", "0x07", - "C4", "C8", "C14X2", "0x0B", - "0x0C", "0x0D", "CMPR", "0x0F", + "I4", "I8", "IA4", "IA8", + "RGB565", "RGB5A3", "RGBA8", "0x07", + "C4", "C8", "C14X2", "0x0B", + "0x0C", "0x0D", "CMPR", "0x0F", // Z-buffer - "0x10", "Z8", "0x12", "Z16", - "0x14", "0x15", "Z24X8", "0x17", - "0x18", "0x19", "0x1A", "0x1B", - "0x1C", "0x1D", "0x1E", "0x1F", + "0x10", "Z8", "0x12", "Z16", + "0x14", "0x15", "Z24X8", "0x17", + "0x18", "0x19", "0x1A", "0x1B", + "0x1C", "0x1D", "0x1E", "0x1F", // pixel + copy - "CR4", "0x21", "CRA4", "CRA8", - "0x24", "0x25", "CYUVA8", "CA8", - "CR8", "CG8", "CB8", "CRG8", - "CGB8", "0x2D", "0x2E", "0x2F", + "CR4", "0x21", "CRA4", "CRA8", + "0x24", "0x25", "CYUVA8", "CA8", + "CR8", "CG8", "CB8", "CRG8", + "CGB8", "0x2D", "0x2E", "0x2F", // Z + copy - "CZ4", "0x31", "0x32", "0x33", - "0x34", "0x35", "0x36", "0x37", - "0x38", "CZ8M", "CZ8L", "0x3B", - "CZ16L", "0x3D", "0x3E", "0x3F", + "CZ4", "0x31", "0x32", "0x33", + "0x34", "0x35", "0x36", "0x37", + "0x38", "CZ8M", "CZ8L", "0x3B", + "CZ16L", "0x3D", "0x3E", "0x3F", }; const unsigned char sfont_map[] = { diff --git a/Source/Core/VideoCommon/TextureDecoder_x64.cpp b/Source/Core/VideoCommon/TextureDecoder_x64.cpp index 0911c6a289..3f7c7554c8 100644 --- a/Source/Core/VideoCommon/TextureDecoder_x64.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_x64.cpp @@ -1478,7 +1478,7 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he const __m128i bV = _mm_or_si128( _mm_slli_epi16(tmpbV, 3), _mm_srli_epi16(tmpbV, 2) ); //newdst[0] = r0 | (g0 << 8) | (b0 << 16) | (a0 << 24); - const __m128i final = _mm_or_si128( _mm_or_si128(rV,_mm_slli_epi32(gV, 8)), + const __m128i final = _mm_or_si128(_mm_or_si128(rV,_mm_slli_epi32(gV, 8)), _mm_or_si128(_mm_slli_epi32(bV, 16), aVxff00)); _mm_storeu_si128( (__m128i*)newdst, final ); } @@ -1508,7 +1508,7 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he ); //newdst[0] = r0 | (g0 << 8) | (b0 << 16) | (a0 << 24); - const __m128i final = _mm_or_si128( _mm_or_si128(rV,_mm_slli_epi32(gV, 8)), + const __m128i final = _mm_or_si128(_mm_or_si128(rV,_mm_slli_epi32(gV, 8)), _mm_or_si128(_mm_slli_epi32(bV, 16), _mm_slli_epi32(aV, 24))); _mm_storeu_si128( (__m128i*)newdst, final ); } @@ -1580,7 +1580,7 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he const __m128i bV = _mm_or_si128( _mm_slli_epi16(tmpbV, 3), _mm_srli_epi16(tmpbV, 2) ); //newdst[0] = r0 | (g0 << 8) | (b0 << 16) | (a0 << 24); - const __m128i final = _mm_or_si128( _mm_or_si128(rV,_mm_slli_epi32(gV, 8)), + const __m128i final = _mm_or_si128(_mm_or_si128(rV,_mm_slli_epi32(gV, 8)), _mm_or_si128(_mm_slli_epi32(bV, 16), aVxff00)); // write the final result: @@ -1615,7 +1615,7 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he ); //newdst[0] = r0 | (g0 << 8) | (b0 << 16) | (a0 << 24); - const __m128i final = _mm_or_si128( _mm_or_si128(rV,_mm_slli_epi32(gV, 8)), + const __m128i final = _mm_or_si128(_mm_or_si128(rV,_mm_slli_epi32(gV, 8)), _mm_or_si128(_mm_slli_epi32(bV, 16), _mm_slli_epi32(aV, 24))); // write the final result: @@ -1675,7 +1675,7 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he const __m128i rgba10 = _mm_shuffle_epi8(_mm_unpacklo_epi8(ar1,gb1),mask0312); const __m128i rgba11 = _mm_shuffle_epi8(_mm_unpackhi_epi8(ar1,gb1),mask0312); - __m128i *dst128 = (__m128i*)( dst + (y + 0) * width + x ); + __m128i *dst128 = (__m128i*)( dst + (y + 0) * width + x ); _mm_storeu_si128(dst128, rgba00); dst128 = (__m128i*)( dst + (y + 1) * width + x ); _mm_storeu_si128(dst128, rgba01); @@ -1774,7 +1774,7 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he rgba10 = _mm_or_si128(r__a10, _gb_10); rgba11 = _mm_or_si128(r__a11, _gb_11); // Write em out! - __m128i *dst128 = (__m128i*)( dst + (y + 0) * width + x ); + __m128i *dst128 = (__m128i*)( dst + (y + 0) * width + x ); _mm_storeu_si128(dst128, rgba00); dst128 = (__m128i*)( dst + (y + 1) * width + x ); _mm_storeu_si128(dst128, rgba01); diff --git a/Source/Core/VideoCommon/VertexLoader.cpp b/Source/Core/VideoCommon/VertexLoader.cpp index 31ab1f7eaa..7246d4812a 100644 --- a/Source/Core/VideoCommon/VertexLoader.cpp +++ b/Source/Core/VideoCommon/VertexLoader.cpp @@ -391,7 +391,7 @@ void LOADERDECL UpdateBoundingBox() { m = (p1.x - p0.x) ? ((p1.y - p0.y) / (p1.x - p0.x)) : highNum; c = p0.y - (m * p0.x); - if (i0 & 1) { s = (s32)(c + roundUp); if (s >= 0 && s <= 479) left = 0; top = (s < top) ? s : top; bottom = (s > bottom) ? s : bottom; } + if (i0 & 1) { s = (s32)(c + roundUp); if (s >= 0 && s <= 479) left = 0; top = (s < top) ? s : top; bottom = (s > bottom) ? s : bottom; } if (i0 & 2) { s = (s32)((-c / m) + roundUp); if (s >= 0 && s <= 607) top = 0; left = (s < left) ? s : left; right = (s > right) ? s : right; } if (i0 & 4) { s = (s32)((m * 607) + c + roundUp); if (s >= 0 && s <= 479) right = 607; top = (s < top) ? s : top; bottom = (s > bottom) ? s : bottom; } if (i0 & 8) { s = (s32)(((479 - c) / m) + roundUp); if (s >= 0 && s <= 607) bottom = 479; left = (s < left) ? s : left; right = (s > right) ? s : right; } @@ -405,7 +405,7 @@ void LOADERDECL UpdateBoundingBox() { m = (p2.x - p1.x) ? ((p2.y - p1.y) / (p2.x - p1.x)) : highNum; c = p1.y - (m * p1.x); - if (i1 & 1) { s = (s32)(c + roundUp); if (s >= 0 && s <= 479) left = 0; top = (s < top) ? s : top; bottom = (s > bottom) ? s : bottom; } + if (i1 & 1) { s = (s32)(c + roundUp); if (s >= 0 && s <= 479) left = 0; top = (s < top) ? s : top; bottom = (s > bottom) ? s : bottom; } if (i1 & 2) { s = (s32)((-c / m) + roundUp); if (s >= 0 && s <= 607) top = 0; left = (s < left) ? s : left; right = (s > right) ? s : right; } if (i1 & 4) { s = (s32)((m * 607) + c + roundUp); if (s >= 0 && s <= 479) right = 607; top = (s < top) ? s : top; bottom = (s > bottom) ? s : bottom; } if (i1 & 8) { s = (s32)(((479 - c) / m) + roundUp); if (s >= 0 && s <= 607) bottom = 479; left = (s < left) ? s : left; right = (s > right) ? s : right; } @@ -416,7 +416,7 @@ void LOADERDECL UpdateBoundingBox() { m = (p2.x - p0.x) ? ((p2.y - p0.y) / (p2.x - p0.x)) : highNum; c = p0.y - (m * p0.x); - if (i2 & 1) { s = (s32)(c + roundUp); if (s >= 0 && s <= 479) left = 0; top = (s < top) ? s : top; bottom = (s > bottom) ? s : bottom; } + if (i2 & 1) { s = (s32)(c + roundUp); if (s >= 0 && s <= 479) left = 0; top = (s < top) ? s : top; bottom = (s > bottom) ? s : bottom; } if (i2 & 2) { s = (s32)((-c / m) + roundUp); if (s >= 0 && s <= 607) top = 0; left = (s < left) ? s : left; right = (s > right) ? s : right; } if (i2 & 4) { s = (s32)((m * 607) + c + roundUp); if (s >= 0 && s <= 479) right = 607; top = (s < top) ? s : top; bottom = (s > bottom) ? s : bottom; } if (i2 & 8) { s = (s32)(((479 - c) / m) + roundUp); if (s >= 0 && s <= 607) bottom = 479; left = (s < left) ? s : left; right = (s > right) ? s : right; } @@ -636,12 +636,12 @@ void VertexLoader::CompileVertexTranslator() case DIRECT: switch (m_VtxAttr.color[i].Comp) { - case FORMAT_16B_565: m_VertexSize += 2; WriteCall(Color_ReadDirect_16b_565); break; - case FORMAT_24B_888: m_VertexSize += 3; WriteCall(Color_ReadDirect_24b_888); break; - case FORMAT_32B_888x: m_VertexSize += 4; WriteCall(Color_ReadDirect_32b_888x); break; - case FORMAT_16B_4444: m_VertexSize += 2; WriteCall(Color_ReadDirect_16b_4444); break; - case FORMAT_24B_6666: m_VertexSize += 3; WriteCall(Color_ReadDirect_24b_6666); break; - case FORMAT_32B_8888: m_VertexSize += 4; WriteCall(Color_ReadDirect_32b_8888); break; + case FORMAT_16B_565: m_VertexSize += 2; WriteCall(Color_ReadDirect_16b_565); break; + case FORMAT_24B_888: m_VertexSize += 3; WriteCall(Color_ReadDirect_24b_888); break; + case FORMAT_32B_888x: m_VertexSize += 4; WriteCall(Color_ReadDirect_32b_888x); break; + case FORMAT_16B_4444: m_VertexSize += 2; WriteCall(Color_ReadDirect_16b_4444); break; + case FORMAT_24B_6666: m_VertexSize += 3; WriteCall(Color_ReadDirect_24b_6666); break; + case FORMAT_32B_8888: m_VertexSize += 4; WriteCall(Color_ReadDirect_32b_8888); break; default: _assert_(0); break; } break; @@ -649,12 +649,12 @@ void VertexLoader::CompileVertexTranslator() m_VertexSize += 1; switch (m_VtxAttr.color[i].Comp) { - case FORMAT_16B_565: WriteCall(Color_ReadIndex8_16b_565); break; - case FORMAT_24B_888: WriteCall(Color_ReadIndex8_24b_888); break; - case FORMAT_32B_888x: WriteCall(Color_ReadIndex8_32b_888x); break; - case FORMAT_16B_4444: WriteCall(Color_ReadIndex8_16b_4444); break; - case FORMAT_24B_6666: WriteCall(Color_ReadIndex8_24b_6666); break; - case FORMAT_32B_8888: WriteCall(Color_ReadIndex8_32b_8888); break; + case FORMAT_16B_565: WriteCall(Color_ReadIndex8_16b_565); break; + case FORMAT_24B_888: WriteCall(Color_ReadIndex8_24b_888); break; + case FORMAT_32B_888x: WriteCall(Color_ReadIndex8_32b_888x); break; + case FORMAT_16B_4444: WriteCall(Color_ReadIndex8_16b_4444); break; + case FORMAT_24B_6666: WriteCall(Color_ReadIndex8_24b_6666); break; + case FORMAT_32B_8888: WriteCall(Color_ReadIndex8_32b_8888); break; default: _assert_(0); break; } break; @@ -662,12 +662,12 @@ void VertexLoader::CompileVertexTranslator() m_VertexSize += 2; switch (m_VtxAttr.color[i].Comp) { - case FORMAT_16B_565: WriteCall(Color_ReadIndex16_16b_565); break; - case FORMAT_24B_888: WriteCall(Color_ReadIndex16_24b_888); break; - case FORMAT_32B_888x: WriteCall(Color_ReadIndex16_32b_888x); break; - case FORMAT_16B_4444: WriteCall(Color_ReadIndex16_16b_4444); break; - case FORMAT_24B_6666: WriteCall(Color_ReadIndex16_24b_6666); break; - case FORMAT_32B_8888: WriteCall(Color_ReadIndex16_32b_8888); break; + case FORMAT_16B_565: WriteCall(Color_ReadIndex16_16b_565); break; + case FORMAT_24B_888: WriteCall(Color_ReadIndex16_24b_888); break; + case FORMAT_32B_888x: WriteCall(Color_ReadIndex16_32b_888x); break; + case FORMAT_16B_4444: WriteCall(Color_ReadIndex16_16b_4444); break; + case FORMAT_24B_6666: WriteCall(Color_ReadIndex16_24b_6666); break; + case FORMAT_32B_8888: WriteCall(Color_ReadIndex16_32b_8888); break; default: _assert_(0); break; } break; diff --git a/Source/Core/VideoCommon/VertexLoader_Color.cpp b/Source/Core/VideoCommon/VertexLoader_Color.cpp index 38492fed41..88d7d557a9 100644 --- a/Source/Core/VideoCommon/VertexLoader_Color.cpp +++ b/Source/Core/VideoCommon/VertexLoader_Color.cpp @@ -100,9 +100,9 @@ void LOADERDECL Color_ReadDirect_24b_6666() // F|RES: i am not 100 percent sure, but the colElements seems to be important for rendering only // at least it fixes mario party 4 // -// if (colElements[colIndex]) -// else -// col |= 0xFF<<ASHIFT; +// if (colElements[colIndex]) +// else +// col |= 0xFF<<ASHIFT; // void LOADERDECL Color_ReadDirect_32b_8888() { diff --git a/Source/Core/VideoCommon/VertexLoader_Normal.cpp b/Source/Core/VideoCommon/VertexLoader_Normal.cpp index e4fb2c57ce..24d2f0b1ff 100644 --- a/Source/Core/VideoCommon/VertexLoader_Normal.cpp +++ b/Source/Core/VideoCommon/VertexLoader_Normal.cpp @@ -110,74 +110,74 @@ struct Normal_Index_Indices3 void VertexLoader_Normal::Init(void) { - m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT] [FORMAT_UBYTE] = Normal_Direct<u8, 1>(); + m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT] [FORMAT_UBYTE] = Normal_Direct<u8, 1>(); m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT] [FORMAT_BYTE] = Normal_Direct<s8, 1>(); - m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT] [FORMAT_USHORT] = Normal_Direct<u16, 1>(); - m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT] [FORMAT_SHORT] = Normal_Direct<s16, 1>(); - m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT] [FORMAT_FLOAT] = Normal_Direct<float, 1>(); - m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT3][FORMAT_UBYTE] = Normal_Direct<u8, 3>(); - m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT3][FORMAT_BYTE] = Normal_Direct<s8, 3>(); - m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT3][FORMAT_USHORT] = Normal_Direct<u16, 3>(); - m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT3][FORMAT_SHORT] = Normal_Direct<s16, 3>(); - m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT3][FORMAT_FLOAT] = Normal_Direct<float, 3>(); + m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT] [FORMAT_USHORT] = Normal_Direct<u16, 1>(); + m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT] [FORMAT_SHORT] = Normal_Direct<s16, 1>(); + m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT] [FORMAT_FLOAT] = Normal_Direct<float, 1>(); + m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT3][FORMAT_UBYTE] = Normal_Direct<u8, 3>(); + m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT3][FORMAT_BYTE] = Normal_Direct<s8, 3>(); + m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT3][FORMAT_USHORT] = Normal_Direct<u16, 3>(); + m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT3][FORMAT_SHORT] = Normal_Direct<s16, 3>(); + m_Table[NRM_DIRECT] [NRM_INDICES1][NRM_NBT3][FORMAT_FLOAT] = Normal_Direct<float, 3>(); // Same as above - m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT] [FORMAT_UBYTE] = Normal_Direct<u8, 1>(); - m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT] [FORMAT_BYTE] = Normal_Direct<s8, 1>(); - m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT] [FORMAT_USHORT] = Normal_Direct<u16, 1>(); - m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT] [FORMAT_SHORT] = Normal_Direct<s16, 1>(); - m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT] [FORMAT_FLOAT] = Normal_Direct<float, 1>(); - m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT3][FORMAT_UBYTE] = Normal_Direct<u8, 3>(); - m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT3][FORMAT_BYTE] = Normal_Direct<s8, 3>(); - m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT3][FORMAT_USHORT] = Normal_Direct<u16, 3>(); - m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT3][FORMAT_SHORT] = Normal_Direct<s16, 3>(); - m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT3][FORMAT_FLOAT] = Normal_Direct<float, 3>(); - - m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT] [FORMAT_UBYTE] = Normal_Index<u8, u8, 1>(); - m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT] [FORMAT_BYTE] = Normal_Index<u8, s8, 1>(); - m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT] [FORMAT_USHORT] = Normal_Index<u8, u16, 1>(); - m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT] [FORMAT_SHORT] = Normal_Index<u8, s16, 1>(); - m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT] [FORMAT_FLOAT] = Normal_Index<u8, float, 1>(); - m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT3][FORMAT_UBYTE] = Normal_Index<u8, u8, 3>(); - m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT3][FORMAT_BYTE] = Normal_Index<u8, s8, 3>(); - m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT3][FORMAT_USHORT] = Normal_Index<u8, u16, 3>(); - m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT3][FORMAT_SHORT] = Normal_Index<u8, s16, 3>(); - m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT3][FORMAT_FLOAT] = Normal_Index<u8, float, 3>(); + m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT] [FORMAT_UBYTE] = Normal_Direct<u8, 1>(); + m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT] [FORMAT_BYTE] = Normal_Direct<s8, 1>(); + m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT] [FORMAT_USHORT] = Normal_Direct<u16, 1>(); + m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT] [FORMAT_SHORT] = Normal_Direct<s16, 1>(); + m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT] [FORMAT_FLOAT] = Normal_Direct<float, 1>(); + m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT3][FORMAT_UBYTE] = Normal_Direct<u8, 3>(); + m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT3][FORMAT_BYTE] = Normal_Direct<s8, 3>(); + m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT3][FORMAT_USHORT] = Normal_Direct<u16, 3>(); + m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT3][FORMAT_SHORT] = Normal_Direct<s16, 3>(); + m_Table[NRM_DIRECT] [NRM_INDICES3][NRM_NBT3][FORMAT_FLOAT] = Normal_Direct<float, 3>(); + + m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT] [FORMAT_UBYTE] = Normal_Index<u8, u8, 1>(); + m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT] [FORMAT_BYTE] = Normal_Index<u8, s8, 1>(); + m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT] [FORMAT_USHORT] = Normal_Index<u8, u16, 1>(); + m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT] [FORMAT_SHORT] = Normal_Index<u8, s16, 1>(); + m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT] [FORMAT_FLOAT] = Normal_Index<u8, float, 1>(); + m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT3][FORMAT_UBYTE] = Normal_Index<u8, u8, 3>(); + m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT3][FORMAT_BYTE] = Normal_Index<u8, s8, 3>(); + m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT3][FORMAT_USHORT] = Normal_Index<u8, u16, 3>(); + m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT3][FORMAT_SHORT] = Normal_Index<u8, s16, 3>(); + m_Table[NRM_INDEX8] [NRM_INDICES1][NRM_NBT3][FORMAT_FLOAT] = Normal_Index<u8, float, 3>(); // Same as above for NRM_NBT - m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT] [FORMAT_UBYTE] = Normal_Index<u8, u8, 1>(); - m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT] [FORMAT_BYTE] = Normal_Index<u8, s8, 1>(); - m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT] [FORMAT_USHORT] = Normal_Index<u8, u16, 1>(); - m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT] [FORMAT_SHORT] = Normal_Index<u8, s16, 1>(); - m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT] [FORMAT_FLOAT] = Normal_Index<u8, float, 1>(); - m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT3][FORMAT_UBYTE] = Normal_Index_Indices3<u8, u8>(); - m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT3][FORMAT_BYTE] = Normal_Index_Indices3<u8, s8>(); - m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT3][FORMAT_USHORT] = Normal_Index_Indices3<u8, u16>(); - m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT3][FORMAT_SHORT] = Normal_Index_Indices3<u8, s16>(); - m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT3][FORMAT_FLOAT] = Normal_Index_Indices3<u8, float>(); - - m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT] [FORMAT_UBYTE] = Normal_Index<u16, u8, 1>(); - m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT] [FORMAT_BYTE] = Normal_Index<u16, s8, 1>(); - m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT] [FORMAT_USHORT] = Normal_Index<u16, u16, 1>(); - m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT] [FORMAT_SHORT] = Normal_Index<u16, s16, 1>(); - m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT] [FORMAT_FLOAT] = Normal_Index<u16, float, 1>(); - m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT3][FORMAT_UBYTE] = Normal_Index<u16, u8, 3>(); - m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT3][FORMAT_BYTE] = Normal_Index<u16, s8, 3>(); - m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT3][FORMAT_USHORT] = Normal_Index<u16, u16, 3>(); - m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT3][FORMAT_SHORT] = Normal_Index<u16, s16, 3>(); - m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT3][FORMAT_FLOAT] = Normal_Index<u16, float, 3>(); + m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT] [FORMAT_UBYTE] = Normal_Index<u8, u8, 1>(); + m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT] [FORMAT_BYTE] = Normal_Index<u8, s8, 1>(); + m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT] [FORMAT_USHORT] = Normal_Index<u8, u16, 1>(); + m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT] [FORMAT_SHORT] = Normal_Index<u8, s16, 1>(); + m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT] [FORMAT_FLOAT] = Normal_Index<u8, float, 1>(); + m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT3][FORMAT_UBYTE] = Normal_Index_Indices3<u8, u8>(); + m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT3][FORMAT_BYTE] = Normal_Index_Indices3<u8, s8>(); + m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT3][FORMAT_USHORT] = Normal_Index_Indices3<u8, u16>(); + m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT3][FORMAT_SHORT] = Normal_Index_Indices3<u8, s16>(); + m_Table[NRM_INDEX8] [NRM_INDICES3][NRM_NBT3][FORMAT_FLOAT] = Normal_Index_Indices3<u8, float>(); + + m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT] [FORMAT_UBYTE] = Normal_Index<u16, u8, 1>(); + m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT] [FORMAT_BYTE] = Normal_Index<u16, s8, 1>(); + m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT] [FORMAT_USHORT] = Normal_Index<u16, u16, 1>(); + m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT] [FORMAT_SHORT] = Normal_Index<u16, s16, 1>(); + m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT] [FORMAT_FLOAT] = Normal_Index<u16, float, 1>(); + m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT3][FORMAT_UBYTE] = Normal_Index<u16, u8, 3>(); + m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT3][FORMAT_BYTE] = Normal_Index<u16, s8, 3>(); + m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT3][FORMAT_USHORT] = Normal_Index<u16, u16, 3>(); + m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT3][FORMAT_SHORT] = Normal_Index<u16, s16, 3>(); + m_Table[NRM_INDEX16][NRM_INDICES1][NRM_NBT3][FORMAT_FLOAT] = Normal_Index<u16, float, 3>(); // Same as above for NRM_NBT - m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT] [FORMAT_UBYTE] = Normal_Index<u16, u8, 1>(); - m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT] [FORMAT_BYTE] = Normal_Index<u16, s8, 1>(); - m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT] [FORMAT_USHORT] = Normal_Index<u16, u16, 1>(); - m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT] [FORMAT_SHORT] = Normal_Index<u16, s16, 1>(); - m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT] [FORMAT_FLOAT] = Normal_Index<u16, float, 1>(); - m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_UBYTE] = Normal_Index_Indices3<u16, u8>(); - m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_BYTE] = Normal_Index_Indices3<u16, s8>(); - m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_USHORT] = Normal_Index_Indices3<u16, u16>(); - m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_SHORT] = Normal_Index_Indices3<u16, s16>(); - m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_FLOAT] = Normal_Index_Indices3<u16, float>(); + m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT] [FORMAT_UBYTE] = Normal_Index<u16, u8, 1>(); + m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT] [FORMAT_BYTE] = Normal_Index<u16, s8, 1>(); + m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT] [FORMAT_USHORT] = Normal_Index<u16, u16, 1>(); + m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT] [FORMAT_SHORT] = Normal_Index<u16, s16, 1>(); + m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT] [FORMAT_FLOAT] = Normal_Index<u16, float, 1>(); + m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_UBYTE] = Normal_Index_Indices3<u16, u8>(); + m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_BYTE] = Normal_Index_Indices3<u16, s8>(); + m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_USHORT] = Normal_Index_Indices3<u16, u16>(); + m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_SHORT] = Normal_Index_Indices3<u16, s16>(); + m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_FLOAT] = Normal_Index_Indices3<u16, float>(); } unsigned int VertexLoader_Normal::GetSize(unsigned int _type, diff --git a/Source/Core/VideoCommon/VertexShaderGen.h b/Source/Core/VideoCommon/VertexShaderGen.h index d2e39a3eb5..65d605ce68 100644 --- a/Source/Core/VideoCommon/VertexShaderGen.h +++ b/Source/Core/VideoCommon/VertexShaderGen.h @@ -50,7 +50,7 @@ #define C_NORMALMATRICES (C_TRANSFORMMATRICES + 64) #define C_POSTTRANSFORMMATRICES (C_NORMALMATRICES + 32) #define C_DEPTHPARAMS (C_POSTTRANSFORMMATRICES + 64) -#define C_VENVCONST_END (C_DEPTHPARAMS + 1) +#define C_VENVCONST_END (C_DEPTHPARAMS + 1) #pragma pack(1) diff --git a/Source/Core/VideoCommon/VertexShaderManager.cpp b/Source/Core/VideoCommon/VertexShaderManager.cpp index af9c97f594..c1f5b8188e 100644 --- a/Source/Core/VideoCommon/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/VertexShaderManager.cpp @@ -378,7 +378,7 @@ void VertexShaderManager::SetConstants() if(!g_ActiveConfig.backend_info.bSupportsOversizedViewports) { ViewportCorrectionMatrix(s_viewportCorrection); - bProjectionChanged = true; + bProjectionChanged = true; } } diff --git a/Source/Core/VideoCommon/stdafx.h b/Source/Core/VideoCommon/stdafx.h index bc5046304d..167fccc549 100644 --- a/Source/Core/VideoCommon/stdafx.h +++ b/Source/Core/VideoCommon/stdafx.h @@ -9,6 +9,6 @@ #define _WIN32_IE 0x0500 // Default value is 0x0400 #endif -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #include <algorithm> |