state.c: Style nits
This commit is contained in:
57
src/state.c
57
src/state.c
@@ -53,7 +53,6 @@ extern SFORMAT FCEUPPU_STATEINFO[];
|
||||
extern SFORMAT FCEUSND_STATEINFO[];
|
||||
extern SFORMAT FCEUCTRL_STATEINFO[];
|
||||
|
||||
|
||||
SFORMAT SFCPU[] = {
|
||||
{ &X.PC, 2 | RLSB, "PC\0" },
|
||||
{ &X.A, 1, "A\0\0" },
|
||||
@@ -82,39 +81,39 @@ SFORMAT SFCPUC[] = {
|
||||
|
||||
static int SubWrite(memstream_t *mem, SFORMAT *sf)
|
||||
{
|
||||
uint32 acc=0;
|
||||
uint32 acc = 0;
|
||||
|
||||
while(sf->v)
|
||||
{
|
||||
if(sf->s==~0) /* Link to another struct. */
|
||||
if(sf->s == ~0) /* Link to another struct. */
|
||||
{
|
||||
uint32 tmp;
|
||||
|
||||
if(!(tmp=SubWrite(mem, (SFORMAT *)sf->v)))
|
||||
if(!(tmp = SubWrite(mem, (SFORMAT *)sf->v)))
|
||||
return(0);
|
||||
acc+=tmp;
|
||||
acc += tmp;
|
||||
sf++;
|
||||
continue;
|
||||
}
|
||||
|
||||
acc+=8; /* Description + size */
|
||||
acc+=sf->s&(~RLSB);
|
||||
acc += 8; /* Description + size */
|
||||
acc += sf->s & (~RLSB);
|
||||
|
||||
if(mem) /* Are we writing or calculating the size of this block? */
|
||||
{
|
||||
memstream_write(mem, sf->desc, 4);
|
||||
write32le_mem(sf->s&(~RLSB), mem);
|
||||
write32le_mem(sf->s & (~RLSB), mem);
|
||||
|
||||
#ifdef MSB_FIRST
|
||||
if(sf->s&RLSB)
|
||||
FlipByteOrder((uint8 *)sf->v,sf->s&(~RLSB));
|
||||
if(sf->s & RLSB)
|
||||
FlipByteOrder((uint8 *)sf->v, sf->s & (~RLSB));
|
||||
#endif
|
||||
memstream_write(mem, (uint8 *)sf->v, sf->s & (~RLSB));
|
||||
|
||||
memstream_write(mem, (uint8 *)sf->v, sf->s&(~RLSB));
|
||||
/* Now restore the original byte order. */
|
||||
#ifdef MSB_FIRST
|
||||
if(sf->s&RLSB)
|
||||
FlipByteOrder((uint8 *)sf->v,sf->s&(~RLSB));
|
||||
if(sf->s & RLSB)
|
||||
FlipByteOrder((uint8 *)sf->v, sf->s & (~RLSB));
|
||||
#endif
|
||||
}
|
||||
sf++;
|
||||
@@ -129,7 +128,7 @@ static int WriteStateChunk(memstream_t *mem, int type, SFORMAT *sf)
|
||||
|
||||
memstream_putc(mem, type);
|
||||
|
||||
bsize = SubWrite(0,sf);
|
||||
bsize = SubWrite(0, sf);
|
||||
write32le_mem(bsize, mem);
|
||||
|
||||
if (!SubWrite(mem, sf))
|
||||
@@ -164,28 +163,28 @@ static int ReadStateChunk(memstream_t *mem, SFORMAT *sf, int size)
|
||||
{
|
||||
SFORMAT *tmp;
|
||||
int temp;
|
||||
temp=memstream_pos(mem);
|
||||
temp = memstream_pos(mem);
|
||||
|
||||
while(memstream_pos(mem)<temp+size)
|
||||
while(memstream_pos(mem) < (temp + size))
|
||||
{
|
||||
uint32 tsize;
|
||||
char toa[4];
|
||||
if(memstream_read(mem, toa, 4)<=0)
|
||||
if(memstream_read(mem, toa, 4) <= 0)
|
||||
return 0;
|
||||
|
||||
read32le_mem(&tsize,mem);
|
||||
read32le_mem(&tsize, mem);
|
||||
|
||||
if((tmp=CheckS(sf,tsize,toa)))
|
||||
if((tmp = CheckS(sf, tsize, toa)))
|
||||
{
|
||||
memstream_read(mem, (uint8 *)tmp->v, tmp->s&(~RLSB));
|
||||
memstream_read(mem, (uint8 *)tmp->v, tmp->s & (~RLSB));
|
||||
|
||||
#ifdef MSB_FIRST
|
||||
if(tmp->s&RLSB)
|
||||
FlipByteOrder((uint8 *)tmp->v,tmp->s&(~RLSB));
|
||||
if(tmp->s & RLSB)
|
||||
FlipByteOrder((uint8 *)tmp->v, tmp->s & (~RLSB));
|
||||
#endif
|
||||
}
|
||||
else
|
||||
memstream_seek(mem,tsize,SEEK_CUR);
|
||||
memstream_seek(mem, tsize, SEEK_CUR);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
@@ -201,7 +200,7 @@ static int ReadStateChunks(memstream_t *st, int32 totalsize)
|
||||
t = memstream_getc(st);
|
||||
if (t == EOF)
|
||||
break;
|
||||
if (!read32le_mem(&size,st))
|
||||
if (!read32le_mem(&size, st))
|
||||
break;
|
||||
totalsize -= size + 5;
|
||||
|
||||
@@ -291,7 +290,7 @@ void FCEUSS_Load_Mem(void)
|
||||
|
||||
memstream_read(mem, header, 16);
|
||||
|
||||
if (memcmp(header,"FCS",3) != 0)
|
||||
if (memcmp(header, "FCS", 3) != 0)
|
||||
return;
|
||||
|
||||
if (header[3] == 0xFF)
|
||||
@@ -302,7 +301,7 @@ void FCEUSS_Load_Mem(void)
|
||||
x = ReadStateChunks(mem, *(uint32*)(header + 4));
|
||||
|
||||
if (stateversion < 9500)
|
||||
X.IRQlow=0;
|
||||
X.IRQlow = 0;
|
||||
|
||||
if (GameStateRestore)
|
||||
GameStateRestore(stateversion);
|
||||
@@ -330,8 +329,10 @@ void AddExState(void *v, uint32 s, int type, char *desc)
|
||||
strncpy(SFMDATA[SFEXINDEX].desc, desc, sizeof(SFMDATA[SFEXINDEX].desc));
|
||||
SFMDATA[SFEXINDEX].v = v;
|
||||
SFMDATA[SFEXINDEX].s = s;
|
||||
if (type) SFMDATA[SFEXINDEX].s |= RLSB;
|
||||
if (SFEXINDEX < 63) SFEXINDEX++;
|
||||
if (type)
|
||||
SFMDATA[SFEXINDEX].s |= RLSB;
|
||||
if (SFEXINDEX < 63)
|
||||
SFEXINDEX++;
|
||||
SFMDATA[SFEXINDEX].v = 0; /* End marker. */
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user