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

Rename files endian.c and memory.c

Browse Source
This commit is contained in:
twinaphex
2014-03-30 22:29:30 +02:00
parent 7e6caac57d
commit 30b4c60b21
25 changed files with 40 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Fceuwin.dev
View File

@@ -150,7 +150,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit14]
FileName=src\memory.c
FileName=src\fceu-memory.c
CompileCpp=0
Folder=
Compile=1
@@ -460,7 +460,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit65]
FileName=src\memory.h
FileName=src\fceu-memory.h
CompileCpp=0
Folder=_Headers
Compile=1

2
src/boards/mapinc.h
View File

@@ -2,7 +2,7 @@
#include "../x6502.h"
#include "../fceu.h"
#include "../ppu.h"
#include "../memory.h"
#include "../fceu-memory.h"
#include "../sound.h"
#include "../state.h"
#include "../cart.h"

2
src/cart.c
View File

@@ -27,7 +27,7 @@
#include "ppu.h"
#include "cart.h"
#include "memory.h"
#include "fceu-memory.h"
#include "x6502.h"
#include "general.h"

2
src/cheat.c
View File

@@ -29,7 +29,7 @@
#include "fceu.h"
#include "general.h"
#include "cart.h"
#include "memory.h"
#include "fceu-memory.h"
static uint8 *CheatRPtrs[64];

4
src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
View File

@@ -1587,7 +1587,7 @@
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
</ClCompile>
<ClCompile Include="..\..\..\..\..\src\memory.c">
<ClCompile Include="..\..\..\..\..\src\fceu-memory.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">CompileAsC</CompileAs>
@@ -1711,7 +1711,7 @@
<ClInclude Include="..\..\..\..\..\srcmappers\mapinc.h" />
<ClInclude Include="..\..\..\..\..\srcmappers\vrc7tone.h" />
<ClInclude Include="..\..\..\..\..\srcmd5.h" />
<ClInclude Include="..\..\..\..\..\srcmemory.h" />
<ClInclude Include="..\..\..\..\..\srcfceu-memory.h" />
<ClInclude Include="..\..\..\..\..\srcfceu-endian.h" />
<ClInclude Include="..\..\..\..\..\srcops.h" />
<ClInclude Include="..\..\..\..\..\srcpalette.h" />

6
src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters
View File

@@ -629,7 +629,7 @@
<ClCompile Include="..\..\..\..\..\src\md5.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\src\memory.c">
<ClCompile Include="..\..\..\..\..\src\fceu-memory.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\src\mycrc32.c">
@@ -739,7 +739,7 @@
<ClInclude Include="..\..\..\..\..\src\md5.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\src\memory.h">
<ClInclude Include="..\..\..\..\..\src\fceu-memory.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\src\myendian.h">
@@ -785,4 +785,4 @@
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
</Project>

6
src/drivers/libretro/msvc/msvc-2010/msvc-2010.vcxproj
View File

@@ -845,7 +845,7 @@
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
</ClCompile>
<ClCompile Include="..\..\..\..\..\src\memory.c">
<ClCompile Include="..\..\..\..\..\src\fceu-memory.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
</ClCompile>
@@ -921,7 +921,7 @@
<ClInclude Include="..\..\..\..\..\src\mappers\mapinc.h" />
<ClInclude Include="..\..\..\..\..\src\mappers\vrc7tone.h" />
<ClInclude Include="..\..\..\..\..\src\md5.h" />
<ClInclude Include="..\..\..\..\..\src\memory.h" />
<ClInclude Include="..\..\..\..\..\src\fceu-memory.h" />
<ClInclude Include="..\..\..\..\..\src\fceu-endian.h" />
<ClInclude Include="..\..\..\..\..\src\ops.h" />
<ClInclude Include="..\..\..\..\..\src\palette.h" />
@@ -941,4 +941,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

6
src/drivers/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters
View File

@@ -75,7 +75,7 @@
<ClCompile Include="..\..\..\..\..\src\md5.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\src\memory.c">
<ClCompile Include="..\..\..\..\..\src\fceu-memory.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\src\mycrc32.c">
@@ -731,7 +731,7 @@
<ClInclude Include="..\..\..\..\..\src\md5.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\src\memory.h">
<ClInclude Include="..\..\..\..\..\src\fceu-memory.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\src\ops.h">
@@ -777,4 +777,4 @@
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
</Project>

95
src/endian.c
View File

@@ -1,95 +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 "types.h"
#include "endian.h"
void FlipByteOrder(uint8 *src, uint32 count) {
uint8 *start = src;
uint8 *end = src + count - 1;
if ((count & 1) || !count) return; /* This shouldn't happen. */
while (count--) {
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 LSB_FIRST
*(uint32*)Bufo = buf;
#else
*(uint32*)Bufo = ((buf & 0xFF) << 24) | ((buf & 0xFF00) << 8) | ((buf & 0xFF0000) >> 8) | ((buf & 0xFF000000) >> 24);
#endif
return 1;
}
int read16le(char *d, FILE *fp) {
#ifdef LSB_FIRST
return((fread(d, 1, 2, fp) < 2) ? 0 : 2);
#else
int ret;
ret = fread(d + 1, 1, 1, fp);
ret += fread(d, 1, 1, fp);
return ret < 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));
}

7
src/endian.h
View File

@@ -1,7 +0,0 @@
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 *);

10
src/fceu-endian.c
View File

@@ -26,7 +26,7 @@
#endif
#include <stdio.h>
#include "memory.h"
#include "fceu-memory.h"
#include "fceu-types.h"
#include "fceu-endian.h"
@@ -47,14 +47,14 @@ void FlipByteOrder(uint8 *src, uint32 count) {
}
}
int write16le(uint16 b, MEM_TYPE *fp) {
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, MEM_TYPE *fp) {
int write32le(uint32 b, FILE *fp) {
uint8 s[4];
s[0] = b;
s[1] = b >> 8;
@@ -63,7 +63,7 @@ int write32le(uint32 b, MEM_TYPE *fp) {
return((fwrite(s, 1, 4, fp) < 4) ? 0 : 4);
}
int read32le(uint32 *Bufo, MEM_TYPE *fp) {
int read32le(uint32 *Bufo, FILE *fp) {
uint32 buf;
if (fread(&buf, 1, 4, fp) < 4)
return 0;
@@ -75,7 +75,7 @@ int read32le(uint32 *Bufo, MEM_TYPE *fp) {
return 1;
}
int read16le(char *d, MEM_TYPE *fp) {
int read16le(char *d, FILE *fp) {
#ifdef LSB_FIRST
return((fread(d, 1, 2, fp) < 2) ? 0 : 2);
#else

12
src/fceu-endian.h
View File

@@ -1,11 +1,11 @@
#ifndef FCEU_ENDIAN_H_
#define FCEU_ENDIAN_H_
#ifndef _FCEU_ENDIAN_H
#define _FCEU_ENDIAN_H
#include "memory.h"
#include "fceu-memory.h"
int write16le(uint16 b, MEM_TYPE *fp);
int write32le(uint32 b, MEM_TYPE *fp);
int read32le(uint32 *Bufo, MEM_TYPE *fp);
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);

2
src/memory.c → src/fceu-memory.c
View File

@@ -22,7 +22,7 @@
#include "fceu-types.h"
#include "fceu.h"
#include "memory.h"
#include "fceu-memory.h"
#include "general.h"
void *FCEU_gmalloc(uint32 size) {

0
src/memory.h → src/fceu-memory.h
View File

2
src/fceu.c
View File

@@ -31,7 +31,7 @@
#include "netplay.h"
#include "general.h"
#include "fceu-endian.h"
#include "memory.h"
#include "fceu-memory.h"
#include "cart.h"
#include "nsf.h"

2
src/fds.c
View File

@@ -30,7 +30,7 @@
#include "general.h"
#include "state.h"
#include "file.h"
#include "memory.h"
#include "fceu-memory.h"
#include "cart.h"
#include "md5.h"
#include "netplay.h"

2
src/file.c
View File

@@ -29,7 +29,7 @@
#include "fceu-types.h"
#include "file.h"
#include "fceu-endian.h"
#include "memory.h"
#include "fceu-memory.h"
#include "driver.h"
#include "general.h"

2
src/ines.c
View File

@@ -34,7 +34,7 @@
#include "state.h"
#include "file.h"
#include "general.h"
#include "memory.h"
#include "fceu-memory.h"
#include "crc32.h"
#include "md5.h"
#include "cheat.h"

2
src/netplay.c
View File

@@ -34,7 +34,7 @@
#include "state.h"
#include "cheat.h"
#include "input.h"
#include "endian.h"
#include "fceu-endian.h"
#ifndef __LIBRETRO__
#define NETPLAY_ENABLED

2
src/nsf.c
View File

@@ -30,7 +30,7 @@
#include "sound.h"
#include "nsf.h"
#include "general.h"
#include "memory.h"
#include "fceu-memory.h"
#include "file.h"
#include "fds.h"
#include "cart.h"

2
src/ppu.c
View File

@@ -31,7 +31,7 @@
#include "sound.h"
#include "general.h"
#include "fceu-endian.h"
#include "memory.h"
#include "fceu-memory.h"
#include "ppuview.h"
#include "cart.h"

4
src/state.c
View File

@@ -34,12 +34,12 @@
#include "x6502.h"
#include "fceu.h"
#include "sound.h"
#include "endian.h"
#include "fceu-endian.h"
#include "fds.h"
#include "general.h"
#include "state.h"
#include "movie.h"
#include "memory.h"
#include "fceu-memory.h"
#include "ppu.h"
#include "netplay.h"
#include "video.h"

2
src/state.h
View File

@@ -21,7 +21,7 @@
#ifndef _FCEU_STATE_H_
#define _FCEU_STATE_H_
#include "memory.h"
#include "fceu-memory.h"
void FCEUSS_Save(char *);
int FCEUSS_Load(char *);

2
src/unif.c
View File

@@ -36,7 +36,7 @@
#include "state.h"
#include "fceu-endian.h"
#include "file.h"
#include "memory.h"
#include "fceu-memory.h"
#include "input.h"
#include "md5.h"

2
src/video.c
View File

@@ -28,7 +28,7 @@
#include "video.h"
#include "fceu.h"
#include "general.h"
#include "memory.h"
#include "fceu-memory.h"
#include "crc32.h"
#include "state.h"
#include "movie.h"