Merge pull request #1869 from Stevoisiak/GeneralConsistency

Minor consistency changes

Source/Core/Common/ArmCPUDetect.cpp

@@ -149,11 +149,11 @@ CPUInfo::CPUInfo()
 	Detect();
 }
 
-// Detects the various cpu features
+// Detects the various CPU features
 void CPUInfo::Detect()
 {
 	// Set some defaults here
-	// When ARMv8 cpus come out, these need to be updated.
+	// When ARMv8 CPUs come out, these need to be updated.
 	HTT = false;
 #ifdef _M_ARM_64
 	OS64bit = true;
@@ -251,7 +251,7 @@ void CPUInfo::Detect()
 #endif
 }
 
-// Turn the cpu info into a string we can show
+// Turn the CPU info into a string we can show
 std::string CPUInfo::Summarize()
 {
 	std::string sum;

Source/Core/Common/ArmEmitter.h

@@ -390,7 +390,7 @@ public:
 	void MCR(u32 coproc, u32 opc1, ARMReg Rt, u32 CRn, u32 CRm, u32 opc2 = 0);
 
 	// Do nothing
-	void NOP(int count = 1); //nop padding - TODO: fast nop slides, for amd and intel (check their manuals)
+	void NOP(int count = 1); //nop padding - TODO: fast nop slides, for AMD and Intel (check their manuals)
 
 #ifdef CALL
 #undef CALL
@@ -476,7 +476,7 @@ public:
 	void UBFX(ARMReg dest, ARMReg op2, u8 lsb, u8 width);
 	void CLZ(ARMReg rd, ARMReg rm);
 
-	// Using just MSR here messes with our defines on the PPC side of stuff (when this code was in dolphin...)
+	// Using just MSR here messes with our defines on the PPC side of stuff (when this code was in Dolphin...)
 	// Just need to put an underscore here, bit annoying.
 	void _MSR (bool nzcvq, bool g, Operand2 op2);
 	void _MSR (bool nzcvq, bool g, ARMReg src);

Source/Core/Common/Common.h

@@ -81,7 +81,7 @@ private:
 	#define GC_ALIGNED16_DECL(x) __declspec(align(16)) x
 	#define GC_ALIGNED64_DECL(x) __declspec(align(64)) x
 
-// Since they are always around on windows
+// Since they are always around on Windows
 	#define HAVE_WX 1
 	#define HAVE_OPENAL 1
 

Source/Core/Common/CommonFuncs.h

@@ -108,7 +108,7 @@ inline u64 _rotr64(u64 x, unsigned int shift)
 	#define snprintf _snprintf
 	#define vscprintf _vscprintf
 
-// 64 bit offsets for windows
+// 64 bit offsets for Windows
 	#define fseeko _fseeki64
 	#define ftello _ftelli64
 	#define atoll _atoi64

Source/Core/Common/CommonPaths.h

@@ -31,7 +31,7 @@
 	#endif
 #endif
 
-// Shared data dirs (Sys and shared User for linux)
+// Shared data dirs (Sys and shared User for Linux)
 #ifdef _WIN32
 	#define SYSDATA_DIR "Sys"
 #elif defined __APPLE__

Source/Core/Common/CommonTypes.h

@@ -40,7 +40,7 @@ typedef int32_t s32;
 typedef int64_t s64;
 
 #endif
-// For using windows lock code
+// For using Windows lock code
 #define TCHAR char
 #define LONG int
 

Source/Core/Common/FileUtil.cpp

@@ -469,7 +469,7 @@ u32 ScanDirectoryTree(const std::string &directory, FSTEntry& parentEntry)
 		FindClose(hFind);
 		return foundEntries;
 	}
-	// windows loop
+	// Windows loop
 	do
 	{
 		FSTEntry entry;
@@ -481,7 +481,7 @@ u32 ScanDirectoryTree(const std::string &directory, FSTEntry& parentEntry)
 	if (!dirp)
 		return 0;
 
-	// non windows loop
+	// non Windows loop
 	while (!readdir_r(dirp, &dirent, &result) && result)
 	{
 		FSTEntry entry;
@@ -538,7 +538,7 @@ bool DeleteDirRecursively(const std::string &directory)
 		return false;
 	}
 
-	// windows loop
+	// Windows loop
 	do
 	{
 		const std::string virtualName(TStrToUTF8(ffd.cFileName));
@@ -548,7 +548,7 @@ bool DeleteDirRecursively(const std::string &directory)
 	if (!dirp)
 		return false;
 
-	// non windows loop
+	// non Windows loop
 	while (!readdir_r(dirp, &dirent, &result) && result)
 	{
 		const std::string virtualName = result->d_name;

Source/Core/Common/StringUtil.cpp

@@ -218,7 +218,7 @@ bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _
 		return false;
 
 	size_t dir_end = full_path.find_last_of("/"
-	// windows needs the : included for something like just "C:" to be considered a directory
+	// Windows needs the : included for something like just "C:" to be considered a directory
 #ifdef _WIN32
 		":"
 #endif

Source/Core/Common/Thread.h

@@ -32,7 +32,7 @@ int CurrentThreadId();
 void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask);
 void SetCurrentThreadAffinity(u32 mask);
 
-// TODO: doesn't work on windows with (count > 2)
+// TODO: doesn't work on Windows with (count > 2)
 class Barrier
 {
 public:

Source/Core/Common/x64Emitter.cpp

@@ -374,7 +374,7 @@ void XEmitter::JMPptr(const OpArg &arg2)
 }
 
 //Can be used to trap other processors, before overwriting their code
-// not used in dolphin
+// not used in Dolphin
 void XEmitter::JMPself()
 {
 	Write8(0xEB);
@@ -968,8 +968,8 @@ void XEmitter::WriteShift(int bits, OpArg dest, OpArg &shift, int ext)
 		Write8((u8)shift.offset);
 }
 
-// large rotates and shift are slower on intel than amd
-// intel likes to rotate by 1, and the op is smaller too
+// large rotates and shift are slower on Intel than AMD
+// Intel likes to rotate by 1, and the op is smaller too
 void XEmitter::ROL(int bits, OpArg dest, OpArg shift) {WriteShift(bits, dest, shift, 0);}
 void XEmitter::ROR(int bits, OpArg dest, OpArg shift) {WriteShift(bits, dest, shift, 1);}
 void XEmitter::RCL(int bits, OpArg dest, OpArg shift) {WriteShift(bits, dest, shift, 2);}