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

Merge pull request #1588 from rohit-n/zero-nullptr 

Silence a few "zero as null pointer" warnings.
This commit is contained in:
Lioncash 2014-11-24 19:26:55 -05:00
parent 60e9301f40 4d931c16ad
commit 8b337120db
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/ArmEmitter.h
View File

@ -348,7 +348,7 @@ protected:
inline void Write32(u32 value) {*(u32*)code = value; code+=4;} inline void Write32(u32 value) {*(u32*)code = value; code+=4;}
public: public:
ARMXEmitter() : code(0), startcode(0), lastCacheFlushEnd(0) { ARMXEmitter() : code(nullptr), startcode(nullptr), lastCacheFlushEnd(nullptr) {
condition = CC_AL << 28; condition = CC_AL << 28;
} }
ARMXEmitter(u8 *code_ptr) { ARMXEmitter(u8 *code_ptr) {

4
Source/Core/Common/GekkoDisassembler.cpp
View File

@ -2285,7 +2285,7 @@ const char* GekkoDisassembler::GetGPRName(u32 index)
if (index < 32) if (index < 32)
return gprnames[index]; return gprnames[index];
return 0; return nullptr;
} }
static const char* fprnames[] = static const char* fprnames[] =
@ -2301,5 +2301,5 @@ const char* GekkoDisassembler::GetFPRName(u32 index)
if (index < 32) if (index < 32)
return fprnames[index]; return fprnames[index];
return 0; return nullptr;
} }

2
Source/Core/Core/PowerPC/JitArm32/JitFPRCache.cpp
View File

@ -9,7 +9,7 @@ using namespace ArmGen;
ArmFPRCache::ArmFPRCache() ArmFPRCache::ArmFPRCache()
{ {
emit = 0; emit = nullptr;
} }
void ArmFPRCache::Init(ARMXEmitter *emitter) void ArmFPRCache::Init(ARMXEmitter *emitter)

2
Source/Core/Core/PowerPC/JitArm32/JitRegCache.cpp
View File

@ -9,7 +9,7 @@ using namespace ArmGen;
ArmRegCache::ArmRegCache() ArmRegCache::ArmRegCache()
{ {
emit = 0; emit = nullptr;
} }
void ArmRegCache::Init(ARMXEmitter *emitter) void ArmRegCache::Init(ARMXEmitter *emitter)