admin/ci-libretro-fceumm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge fceu-endian.c

Browse Source
This commit is contained in:
twinaphex
2015-08-06 13:15:34 +02:00
parent 8938dde948
commit c569003086
5 changed files with 84 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
src/drivers/libretro/fceu/fceu-endian.c
View File

@@ -1,123 +0,0 @@
/* FCE Ultra - NES/Famicom Emulator
*
* Copyright notice for this file:
* Copyright (C) 2002 Xodnizel
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/* Contains file I/O functions that write/read data */
/* LSB first. */
#include <stdio.h>
#include "fceu-memory.h"
#include "fceu-types.h"
#include "fceu-endian.h"
void FlipByteOrder(uint8 *src, uint32 count)
{
uint8 *start = src;
uint8 *end = src + count - 1;
while(start < end)
{
uint8 tmp;
tmp = *end;
*end = *start;
*start = tmp;
end--;
start++;
}
}
int write16le(uint16 b, FILE *fp)
{
uint8 s[2];
s[0] = b;
s[1] = b >> 8;
return((fwrite(s, 1, 2, fp) < 2) ? 0 : 2);
}
int write32le(uint32 b, FILE *fp)
{
uint8 s[4];
s[0] = b;
s[1] = b >> 8;
s[2] = b >> 16;
s[3] = b >> 24;
return((fwrite(s, 1, 4, fp) < 4) ? 0 : 4);
}
int read32le(uint32 *Bufo, FILE *fp)
{
uint32 buf;
if (fread(&buf, 1, 4, fp) < 4)
return 0;
#ifdef MSB_FIRST
*(uint32*)Bufo = ((buf & 0xFF) << 24) | ((buf & 0xFF00) << 8) | ((buf & 0xFF0000) >> 8) | ((buf & 0xFF000000) >> 24);
#else
*(uint32*)Bufo = buf;
#endif
return 1;
}
int write32le_mem(uint32 b, memstream_t *mem)
{
uint8 s[4];
s[0]=b;
s[1]=b>>8;
s[2]=b>>16;
s[3]=b>>24;
return((memstream_write(mem, s, 4)<4)?0:4);
}
int read32le_mem(uint32 *Bufo, memstream_t *mem)
{
uint32 buf;
if(memstream_read(mem, &buf, 4)<4)
return 0;
#ifdef MSB_FIRST
*(uint32*)Bufo=((buf&0xFF)<<24)|((buf&0xFF00)<<8)|((buf&0xFF0000)>>8)|((buf&0xFF000000)>>24);
#else
*(uint32*)Bufo=buf;
#endif
return 1;
}
int read16le(char *d, FILE *fp)
{
#ifdef MSB_FIRST
int ret;
ret = fread(d + 1, 1, 1, fp);
ret += fread(d, 1, 1, fp);
return ret < 2 ? 0 : 2;
#else
return((fread(d, 1, 2, fp) < 2) ? 0 : 2);
#endif
}
void FCEU_en32lsb(uint8 *buf, uint32 morp)
{
buf[0] = morp;
buf[1] = morp >> 8;
buf[2] = morp >> 16;
buf[3] = morp >> 24;
}
uint32 FCEU_de32lsb(uint8 *morp)
{
return(morp[0] | (morp[1] << 8) | (morp[2] << 16) | (morp[3] << 24));
}

18
src/drivers/libretro/fceu/fceu-endian.h
View File

@@ -1,18 +0,0 @@
#ifndef _FCEU_ENDIAN_H
#define _FCEU_ENDIAN_H
#include "fceu-memory.h"
#include "../memstream.h"
int write32le_mem(uint32 b, memstream_t *mem);
int read32le_mem(uint32 *Bufo, memstream_t *mem);
int write16le(uint16 b, FILE *fp);
int write32le(uint32 b, FILE *fp);
int read32le(uint32 *Bufo, FILE *fp);
void FlipByteOrder(uint8 *src, uint32 count);
void FCEU_en32lsb(uint8 *, uint32);
uint32 FCEU_de32lsb(uint8 *);
#endif

2
src/drivers/libretro/griffin.c
View File

@@ -8,7 +8,7 @@
#include "cheat.c" #include "cheat.c"
#include "crc32.c" #include "crc32.c"
#include "debug.c" #include "debug.c"
#include "drivers/libretro/fceu/fceu-endian.c" #include "fceu-endian.c"
#include "drivers/libretro/fceu/fceu-memory.c" #include "drivers/libretro/fceu/fceu-memory.c"
#include "misc.c" #include "misc.c"
#include "fceu.c" #include "fceu.c"

130
src/fceu-endian.c
View File

@@ -26,70 +26,98 @@
#include "fceu-types.h" #include "fceu-types.h"
#include "fceu-endian.h" #include "fceu-endian.h"
void FlipByteOrder(uint8 *src, uint32 count) { void FlipByteOrder(uint8 *src, uint32 count)
uint8 *start = src; {
uint8 *end = src + count - 1; uint8 *start = src;
uint8 *end = src + count - 1;
if ((count & 1) || !count) return; /* This shouldn't happen. */ while(start < end)
{
uint8 tmp;
while (count--) { tmp = *end;
uint8 tmp; *end = *start;
*start = tmp;
tmp = *end; end--;
*end = *start; start++;
*start = tmp; }
end--;
start++;
}
} }
int write16le(uint16 b, FILE *fp) { int write16le(uint16 b, FILE *fp)
uint8 s[2]; {
s[0] = b; uint8 s[2];
s[1] = b >> 8; s[0] = b;
return((fwrite(s, 1, 2, fp) < 2) ? 0 : 2); s[1] = b >> 8;
return((fwrite(s, 1, 2, fp) < 2) ? 0 : 2);
} }
int write32le(uint32 b, FILE *fp) { int write32le(uint32 b, FILE *fp)
uint8 s[4]; {
s[0] = b; uint8 s[4];
s[1] = b >> 8; s[0] = b;
s[2] = b >> 16; s[1] = b >> 8;
s[3] = b >> 24; s[2] = b >> 16;
return((fwrite(s, 1, 4, fp) < 4) ? 0 : 4); s[3] = b >> 24;
return((fwrite(s, 1, 4, fp) < 4) ? 0 : 4);
} }
int read32le(uint32 *Bufo, FILE *fp) { int read32le(uint32 *Bufo, FILE *fp)
uint32 buf; {
if (fread(&buf, 1, 4, fp) < 4) uint32 buf;
return 0; if (fread(&buf, 1, 4, fp) < 4)
#ifdef MSB_FIRST return 0;
*(uint32*)Bufo = ((buf & 0xFF) << 24) | ((buf & 0xFF00) << 8) | ((buf & 0xFF0000) >> 8) | ((buf & 0xFF000000) >> 24); #ifdef MSB_FIRST
#else *(uint32*)Bufo = ((buf & 0xFF) << 24) | ((buf & 0xFF00) << 8) | ((buf & 0xFF0000) >> 8) | ((buf & 0xFF000000) >> 24);
*(uint32*)Bufo = buf; #else
#endif *(uint32*)Bufo = buf;
return 1; #endif
return 1;
} }
int read16le(char *d, FILE *fp) { int write32le_mem(uint32 b, memstream_t *mem)
#ifdef MSB_FIRST {
int ret; uint8 s[4];
ret = fread(d + 1, 1, 1, fp); s[0]=b;
ret += fread(d, 1, 1, fp); s[1]=b>>8;
return ret < 2 ? 0 : 2; s[2]=b>>16;
#else s[3]=b>>24;
return((fread(d, 1, 2, fp) < 2) ? 0 : 2); return((memstream_write(mem, s, 4)<4)?0:4);
#endif
} }
void FCEU_en32lsb(uint8 *buf, uint32 morp) { int read32le_mem(uint32 *Bufo, memstream_t *mem)
buf[0] = morp; {
buf[1] = morp >> 8; uint32 buf;
buf[2] = morp >> 16; if(memstream_read(mem, &buf, 4)<4)
buf[3] = morp >> 24; return 0;
#ifdef MSB_FIRST
*(uint32*)Bufo=((buf&0xFF)<<24)|((buf&0xFF00)<<8)|((buf&0xFF0000)>>8)|((buf&0xFF000000)>>24);
#else
*(uint32*)Bufo=buf;
#endif
return 1;
} }
uint32 FCEU_de32lsb(uint8 *morp) { int read16le(char *d, FILE *fp)
return(morp[0] | (morp[1] << 8) | (morp[2] << 16) | (morp[3] << 24)); {
#ifdef MSB_FIRST
int ret;
ret = fread(d + 1, 1, 1, fp);
ret += fread(d, 1, 1, fp);
return ret < 2 ? 0 : 2;
#else
return((fread(d, 1, 2, fp) < 2) ? 0 : 2);
#endif
} }
void FCEU_en32lsb(uint8 *buf, uint32 morp)
{
buf[0] = morp;
buf[1] = morp >> 8;
buf[2] = morp >> 16;
buf[3] = morp >> 24;
}
uint32 FCEU_de32lsb(uint8 *morp)
{
return(morp[0] | (morp[1] << 8) | (morp[2] << 16) | (morp[3] << 24));
}

4
src/fceu-endian.h
View File

@@ -2,6 +2,10 @@
#define _FCEU_ENDIAN_H #define _FCEU_ENDIAN_H
#include "fceu-memory.h" #include "fceu-memory.h"
#include <memstream.h>
int write32le_mem(uint32 b, memstream_t *mem);
int read32le_mem(uint32 *Bufo, memstream_t *mem);
int write16le(uint16 b, FILE *fp); int write16le(uint16 b, FILE *fp);
int write32le(uint32 b, FILE *fp); int write32le(uint32 b, FILE *fp);