More GCC compatibility/warning fixes (#3118)

* Wrap >4-char literals in a MULTI_CHAR macro

Modern compilers do not support CW's non-standard behavior with
>4 char literals. We can, however, use a constexpr function to
compute the u64 values directly. This leaves <=4 char literals
unchanged.

* Replace non-pointer usages of NULL with 0

* Define NULL to nullptr on C++11 and above

* Fix more -Wpointer-arith and -Woverflow warnings

* Replace u32/s32 with uintptr_t/intptr_t where appropriate

* JSUOutputStream: Overload all standard int types

7 files changed, 10 insertions, 10 deletions

diff --git a/src/JSystem/JAudio2/JASAramStream.cpp b/src/JSystem/JAudio2/JASAramStream.cpp
index 34a2c811c7..ea0fb5776f 100644
--- a/src/JSystem/JAudio2/JASAramStream.cpp
+++ b/src/JSystem/JAudio2/JASAramStream.cpp
@@ -143,7 +143,7 @@ bool JASAramStream::start() {
 }
 
 bool JASAramStream::stop(u16 param_0) {
-    if (!OSSendMessage(&field_0x000, (OSMessage)(param_0 << 0x10 | 1), OS_MESSAGE_NOBLOCK)) {
+    if (!OSSendMessage(&field_0x000, (OSMessage)(uintptr_t)(param_0 << 0x10 | 1), OS_MESSAGE_NOBLOCK)) {
         JUT_WARN(290, "%s", "OSSendMessage Failed");
         return false;
     }
diff --git a/src/JSystem/JAudio2/JASDSPInterface.cpp b/src/JSystem/JAudio2/JASDSPInterface.cpp
index 79cf9bb249..f4e85d1bd5 100644
--- a/src/JSystem/JAudio2/JASDSPInterface.cpp
+++ b/src/JSystem/JAudio2/JASDSPInterface.cpp
@@ -471,7 +471,7 @@ int JASDsp::setFXLine(u8 param_0, s16* buffer, JASDsp::FxlineConfig_* param_2) {
     return 1;
 }
 
-BOOL JASDsp::changeFXLineParam(u8 param_0, u8 param_1, u32 param_2) {
+BOOL JASDsp::changeFXLineParam(u8 param_0, u8 param_1, uintptr_t param_2) {
     JUT_ASSERT(450, dspMutex);
     FxBuf* buf = &FX_BUF[param_0];
     switch (param_1) {
diff --git a/src/JSystem/JAudio2/JASHeapCtrl.cpp b/src/JSystem/JAudio2/JASHeapCtrl.cpp
index ee280261f4..44abd98ba4 100644
--- a/src/JSystem/JAudio2/JASHeapCtrl.cpp
+++ b/src/JSystem/JAudio2/JASHeapCtrl.cpp
@@ -284,7 +284,7 @@ void JASGenericMemPool::free(void* ptr, u32 param_1) {
     freeMemCount++;
 }
 
-u32 JASKernel::sAramBase;
+uintptr_t JASKernel::sAramBase;
 
 JKRHeap* JASKernel::sSystemHeap;
 
@@ -309,7 +309,7 @@ JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>* JASKernel::getCom
 
 JASHeap JASKernel::audioAramHeap;
 
-void JASKernel::setupAramHeap(u32 param_0, u32 param_1) {
+void JASKernel::setupAramHeap(uintptr_t param_0, u32 param_1) {
 #if !PLATFORM_GCN
     OSReport("setupAramHeap %x, %x, %x\n", param_0, ARGetBaseAddress(), param_1);
     param_0 = ARGetBaseAddress();
diff --git a/src/JSystem/JAudio2/JASResArcLoader.cpp b/src/JSystem/JAudio2/JASResArcLoader.cpp
index 7fb2aff736..a55c73469c 100644
--- a/src/JSystem/JAudio2/JASResArcLoader.cpp
+++ b/src/JSystem/JAudio2/JASResArcLoader.cpp
@@ -55,7 +55,7 @@ static void JASResArcLoader::loadResourceCallback(void* args) {
 }
 
 
-int JASResArcLoader::loadResourceAsync(JKRArchive* archive, u16 id, u8* buffer, u32 size, LoadCallback callback, u32 cbArg)
+int JASResArcLoader::loadResourceAsync(JKRArchive* archive, u16 id, u8* buffer, u32 size, LoadCallback callback, uintptr_t cbArg)
 {
 	TLoadResInfo args(archive, id, buffer, size);
 	args.mCallback    = callback;
diff --git a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp
index 9bc0bbf31d..c599a0e857 100644
--- a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp
+++ b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp
@@ -42,7 +42,7 @@ JASWaveArc* JASSimpleWaveBank::getWaveArc(u32 no) {
 int JASSimpleWaveBank::TWaveHandle::getWavePtr() const {
     void* base = mHeap->getBase();
     if (base == NULL) {
-        return NULL;
+        return 0;
     }
     return (intptr_t)base + mWaveInfo.field_0x08;
 }
diff --git a/src/JSystem/JAudio2/JAUSectionHeap.cpp b/src/JSystem/JAudio2/JAUSectionHeap.cpp
index 8a9bbf8277..eb1f211070 100644
--- a/src/JSystem/JAudio2/JAUSectionHeap.cpp
+++ b/src/JSystem/JAudio2/JAUSectionHeap.cpp
@@ -40,7 +40,7 @@ namespace {
             field_0x4 = stack_14.getNumFiles();
             field_0x8 = new s32[field_0x4];
             if (!field_0x8) {
-                field_0x4 = NULL;
+                field_0x4 = 0;
                 return;
             }
             for (u32 i = 0; i < field_0x4; i++) {
diff --git a/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp b/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp
index f973cb4779..596dfb2742 100644
--- a/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp
+++ b/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp
@@ -111,10 +111,10 @@ bool JAUDynamicSeqDataBlocks::appendDynamicSeqDataBlock(JAUSeqDataBlock* seqData
     return 1;
 }
 
-static void JAUDynamicSeqDataBlocks_receiveLoaded_(u32 param_0, u32 param_1) {
+static void JAUDynamicSeqDataBlocks_receiveLoaded_(u32 param_0, uintptr_t param_1) {
     JSULink<JAUSeqDataBlock>* link = (JSULink<JAUSeqDataBlock>*)param_1;
     JAUSeqDataBlock* seqDataBlock = link->getObject();
-    if (param_0 != NULL) {
+    if (param_0 != 0) {
         seqDataBlock->field_0x1c = 2;
     } else {
         seqDataBlock->field_0x1c = 0;
@@ -153,7 +153,7 @@ bool JAUDynamicSeqDataBlocks::loadDynamicSeq(JAISoundID param_0, bool param_1,
         JASResArcLoader::loadResourceAsync(
             seqDataArchive_, resourceId,
             link->getObject()->region.addr, link->getObject()->region.size,
-            JAUDynamicSeqDataBlocks_receiveLoaded_, (u32)link);
+            JAUDynamicSeqDataBlocks_receiveLoaded_, (uintptr_t)link);
     }
     return true;
 }