devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

rockboy: Properly fix the GCC11 code style warnings.

Browse source 
Change-Id: I69c77717604051052288a2d0f3aab068516d18ef
This commit is contained in:
Solomon Peachy 2021-04-23 09:25:47 -04:00
parent aab72f969f
commit 75d9393796
1 changed files with 32 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

59
apps/plugins/rockboy/cpu.c
View file

@ -13,12 +13,6 @@
#include "asm.h" #include "asm.h"
#endif #endif
/* GCC 11 complains about the code style. Just turn this off. */
#if __GNUC__ >= 11
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmisleading-identation"
#endif
struct cpu cpu IBSS_ATTR; struct cpu cpu IBSS_ATTR;
bool plugbuf; bool plugbuf;
@ -769,25 +763,32 @@ next:
__JR: __JR:
JR; break; JR; break;
case 0x20: /* JR NZ */ case 0x20: /* JR NZ */
if (!(F&FZ)) goto __JR; NOJR; break; if (!(F&FZ)) goto __JR;
NOJR; break;
case 0x28: /* JR Z */ case 0x28: /* JR Z */
if (F&FZ) goto __JR; NOJR; break; if (F&FZ) goto __JR;
NOJR; break;
case 0x30: /* JR NC */ case 0x30: /* JR NC */
if (!(F&FC)) goto __JR; NOJR; break; if (!(F&FC)) goto __JR;
NOJR; break;
case 0x38: /* JR C */ case 0x38: /* JR C */
if (F&FC) goto __JR; NOJR; break; if (F&FC) goto __JR;
NOJR; break;
case 0xC3: /* JP */ case 0xC3: /* JP */
__JP: __JP:
JP; break; JP; break;
case 0xC2: /* JP NZ */ case 0xC2: /* JP NZ */
if (!(F&FZ)) goto __JP; NOJP; break; if (!(F&FZ)) goto __JP;
NOJP; break;
case 0xCA: /* JP Z */ case 0xCA: /* JP Z */
if (F&FZ) goto __JP; NOJP; break; if (F&FZ) goto __JP;
NOJP; break;
case 0xD2: /* JP NC */ case 0xD2: /* JP NC */
if (!(F&FC)) goto __JP; NOJP; break; if (!(F&FC)) goto __JP;
NOJP; break;
case 0xDA: /* JP C */ case 0xDA: /* JP C */
if (F&FC) goto __JP; NOJP; break; if (F&FC) goto __JP;
NOJP; break;
case 0xE9: /* JP HL */ case 0xE9: /* JP HL */
PC = HL; break; PC = HL; break;
@ -795,13 +796,17 @@ next:
__RET: __RET:
RET; break; RET; break;
case 0xC0: /* RET NZ */ case 0xC0: /* RET NZ */
if (!(F&FZ)) goto __RET; NORET; break; if (!(F&FZ)) goto __RET;
NORET; break;
case 0xC8: /* RET Z */ case 0xC8: /* RET Z */
if (F&FZ) goto __RET; NORET; break; if (F&FZ) goto __RET;
NORET; break;
case 0xD0: /* RET NC */ case 0xD0: /* RET NC */
if (!(F&FC)) goto __RET; NORET; break; if (!(F&FC)) goto __RET;
NORET; break;
case 0xD8: /* RET C */ case 0xD8: /* RET C */
if (F&FC) goto __RET; NORET; break; if (F&FC) goto __RET;
NORET; break;
case 0xD9: /* RETI */ case 0xD9: /* RETI */
IME = IMA = 1; goto __RET; IME = IMA = 1; goto __RET;
@ -809,13 +814,17 @@ next:
__CALL: __CALL:
CALL; break; CALL; break;
case 0xC4: /* CALL NZ */ case 0xC4: /* CALL NZ */
if (!(F&FZ)) goto __CALL; NOCALL; break; if (!(F&FZ)) goto __CALL;
NOCALL; break;
case 0xCC: /* CALL Z */ case 0xCC: /* CALL Z */
if (F&FZ) goto __CALL; NOCALL; break; if (F&FZ) goto __CALL;
NOCALL; break;
case 0xD4: /* CALL NC */ case 0xD4: /* CALL NC */
if (!(F&FC)) goto __CALL; NOCALL; break; if (!(F&FC)) goto __CALL;
NOCALL; break;
case 0xDC: /* CALL C */ case 0xDC: /* CALL C */
if (F&FC) goto __CALL; NOCALL; break; if (F&FC) goto __CALL;
NOCALL; break;
case 0xC7: /* RST 0 */ case 0xC7: /* RST 0 */
b = 0x00; goto __RST; b = 0x00; goto __RST;
@ -1009,7 +1018,3 @@ next:
} }
#endif /* ASM_CPU_EMULATE */ #endif /* ASM_CPU_EMULATE */
#if __GNUC__ >= 11
#pragma GCC diagnostic pop
#endif