Mark pFrame->nMode and pSound->eMode as volatile (#243)

Author: cadmic

include/emulator/frame.h

@@ -300,7 +300,7 @@ typedef struct Frame {
     /* 0x00080 0x00070 */ f32 rScaleX;
     /* 0x00084 0x00074 */ f32 rScaleY;
     /* 0x00088 0x00078 */ u32 nCountFrames;
-    /* 0x0008C 0x0007C */ u32 nMode;
+    /* 0x0008C 0x0007C */ volatile u32 nMode;
     /* 0x00090 0x00080 */ u32 aMode[FMT_COUNT];
     /* 0x000B8 0x000A8 */ Viewport viewport;
     /* 0x000C8 0x000B8 */ FrameBuffer aBuffer[FBT_COUNT];

include/emulator/soundGCN.h

@@ -39,7 +39,7 @@ typedef struct Sound {
     /* 0xA0 */ void* apDataBeep[SOUND_BEEP_COUNT];
     /* 0xAC */ s32 iBufferPlay;
     /* 0xB0 */ s32 iBufferMake;
-    /* 0xB4 */ SoundPlayMode eMode;
+    /* 0xB4 */ volatile SoundPlayMode eMode;
     /* 0xB8 */ void* pBufferZero;
     /* 0xBC */ void* pBufferHold;
     /* 0xC0 */ void* pBufferRampUp;

src/emulator/_frameGCN.c

@@ -1510,7 +1510,7 @@ static bool frameLoadTexture(Frame* pFrame, FrameTexture* pTexture, s32 iTexture
 bool frameDrawSetup2D(Frame* pFrame) {
     Mtx44 matrix44;
 
-    if (!(*(volatile u32*)&pFrame->nMode & 0x40000000)) {
+    if (!(pFrame->nMode & 0x40000000)) {
         pFrame->nMode |= 0x40000000;
 
         GXSetViewport(0.0f, 0.0f, pFrame->anSizeX[1], pFrame->anSizeY[1], 0.0f, 1.0f);
@@ -2716,7 +2716,7 @@ static bool frameDrawRectFill(Frame* pFrame, Rectangle* pRectangle) {
             pFrame->aColor[FCT_FILL].b == 0xF0 && pFrame->aColor[FCT_FILL].a == 0x00) {
             bFlag = true;
         }
-        if (bFlag && !(*(volatile u32*)&pFrame->nMode & 0x100000)) {
+        if (bFlag && !(pFrame->nMode & 0x100000)) {
             pFrame->nMode |= 0x100000;
             return true;
         }

src/emulator/frame.c

@@ -475,7 +475,7 @@ bool frameSetMode(Frame* pFrame, FrameModeType eType, u32 nMode) {
         nModeChanged = pFrame->aMode[eType] ^ nMode;
     } else {
         nModeChanged = 0xFFFFFFFF;
-        *((volatile u32*)&pFrame->nMode) |= (1 << eType);
+        pFrame->nMode |= 1 << eType;
     }
 
     nFlag = 0;
@@ -596,9 +596,7 @@ bool frameSetMatrix(Frame* pFrame, Mtx44 matrix, FrameMatrixType eType, bool bLo
                 bLoad = false;
             }
 
-            // TODO: fake volatile
-            if (bLoad || !(*(volatile u32*)&pFrame->nMode & 0x4000000) ||
-                (*(volatile u32*)&pFrame->nMode & 0x10000000)) {
+            if (bLoad || !(pFrame->nMode & 0x4000000) || (pFrame->nMode & 0x10000000)) {
                 if (matrix[0][0] == 1.0f && matrix[0][1] == 0.0f && matrix[0][2] == 0.0f && matrix[0][3] == 0.0f &&
                     matrix[1][0] == 0.0f && matrix[1][1] == 1.0f && matrix[1][2] == 0.0f && matrix[1][3] == 0.0f &&
                     matrix[2][0] == 0.0f && matrix[2][1] == 0.0f && matrix[2][2] == 1.0f && matrix[2][3] == 0.0f &&
@@ -617,7 +615,7 @@ bool frameSetMatrix(Frame* pFrame, Mtx44 matrix, FrameMatrixType eType, bool bLo
                 if (!frameGetMatrixHint(pFrame, nAddressN64 | 0x80000000, &pFrame->iHintProjection)) {
                     pFrame->iHintProjection = -1;
                 }
-            } else if (*(volatile u32*)&pFrame->nMode & 0x8000000) {
+            } else if (pFrame->nMode & 0x8000000) {
                 PSMTX44Concat(matrix, pFrame->matrixProjectionExtra, pFrame->matrixProjectionExtra);
             } else {
                 pFrame->nMode |= 0x8000000;
@@ -767,8 +765,7 @@ bool frameLoadVertex(Frame* pFrame, void* pBuffer, s32 iVertex0, s32 nCount) {
 
     matrixModel = pFrame->aMatrixModel[pFrame->iMatrixModel];
     if (pFrame->nMode & 0x08000000) {
-        // TODO: volatile hacks
-        if (!(*(volatile u32*)&pFrame->nMode & 0x400000)) {
+        if (!(pFrame->nMode & 0x400000)) {
             PSMTX44Concat(matrixModel, pFrame->matrixProjectionExtra, pFrame->matrixView);
             pFrame->nMode |= 0x400000;
             if (pFrame->iHintProjection != -1) {
@@ -779,8 +776,7 @@ bool frameLoadVertex(Frame* pFrame, void* pBuffer, s32 iVertex0, s32 nCount) {
             }
         }
         matrixView = pFrame->matrixView;
-        // TODO: volatile hacks
-    } else if (!(*(volatile u32*)&pFrame->nMode & 0x400000) && pFrame->iHintProjection != -1) {
+    } else if (!(pFrame->nMode & 0x400000) && pFrame->iHintProjection != -1) {
         if (!frameScaleMatrix(pFrame->matrixView, matrixModel, pFrame->aMatrixHint[pFrame->iHintProjection].rScale)) {
             return false;
         }

src/emulator/soundGCN.c

@@ -179,8 +179,7 @@ bool soundPlayBuffer(Sound* pSound) {
             pSound->iBufferPlay = (iBuffer + 1) % 16;
         }
         pSound->eMode = SPM_PLAY;
-        //! TODO: fake match on the following condition?
-    } else if ((*((volatile SoundPlayMode*)&pSound->eMode) == SPM_RAMPQUEUED) || (pSound->eMode == SPM_RAMPPLAYED)) {
+    } else if (pSound->eMode == SPM_RAMPQUEUED || pSound->eMode == SPM_RAMPPLAYED) {
         pData = pSound->pBufferZero;
         nSize = pSound->nSizeZero;
         pSound->eMode = SPM_RAMPPLAYED;