ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Finished updating common, next up gb folder

This commit is contained in:
Zach Bacon 2016-07-08 21:39:29 -04:00
parent fa33b8eea4
commit 59577d666f
No known key found for this signature in database
GPG Key ID: 7D110798AFE84B3A
7 changed files with 413 additions and 406 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/common/Patch.cpp
View File

@ -32,7 +32,6 @@ typedef off64_t __off64_t;
typedef __int64 __off64_t;
#endif
static int readInt2(FILE* f)
{
int res = 0;
@ -100,9 +99,11 @@ static s64 readVarPtr(FILE *f)
s64 offset = 0, shift = 1;
for (;;) {
int c = fgetc(f);
if (c == EOF) return 0;
if (c == EOF)
return 0;
offset += (c & 0x7F) * shift;
if (c & 0x80) break;
if (c & 0x80)
break;
shift <<= 7;
offset += shift;
}
@ -127,7 +128,7 @@ static uLong computePatchCRC(FILE *f, unsigned int size)
return crc;
}
static bool patchApplyIPS(const char *patchname, u8 **r, int *s)
static bool patchApplyIPS(const char* patchname, uint8_t** r, int* s)
{
// from the IPS spec at http://zerosoft.zophar.net/ips.htm
FILE* f = fopen(patchname, "rb");
@ -136,13 +137,9 @@ static bool patchApplyIPS(const char *patchname, u8 **r, int *s)
bool result = false;
u8 *rom = *r;
uint8_t* rom = *r;
int size = *s;
if(fgetc(f) == 'P' &&
fgetc(f) == 'A' &&
fgetc(f) == 'T' &&
fgetc(f) == 'C' &&
fgetc(f) == 'H') {
if (fgetc(f) == 'P' && fgetc(f) == 'A' && fgetc(f) == 'T' && fgetc(f) == 'C' && fgetc(f) == 'H') {
int b;
int offset;
int len;
@ -164,13 +161,13 @@ static bool patchApplyIPS(const char *patchname, u8 **r, int *s)
int c = fgetc(f);
if (c == -1)
break;
b = (u8)c;
b = (uint8_t)c;
} else
b = -1;
// check if we need to reallocate our ROM
if ((offset + len) >= size) {
size *= 2;
rom = (u8 *)realloc(rom, size);
rom = (uint8_t*)realloc(rom, size);
*r = rom;
*s = size;
}
@ -192,7 +189,7 @@ static bool patchApplyIPS(const char *patchname, u8 **r, int *s)
return result;
}
static bool patchApplyUPS(const char *patchname, u8 **rom, int *size)
static bool patchApplyUPS(const char* patchname, uint8_t** rom, int* size)
{
s64 srcCRC, dstCRC, patchCRC;
@ -223,7 +220,7 @@ static bool patchApplyUPS(const char *patchname, u8 **rom, int *size)
}
fseeko64(f, 0, SEEK_SET);
u32 crc = computePatchCRC(f, patchSize-4);
uint32_t crc = computePatchCRC(f, patchSize - 4);
if (crc != patchCRC) {
fclose(f);
@ -255,21 +252,23 @@ static bool patchApplyUPS(const char *patchname, u8 **rom, int *size)
return false;
}
if (dataSize > *size) {
*rom = (u8*)realloc(*rom, dataSize);
*rom = (uint8_t*)realloc(*rom, dataSize);
memset(*rom + *size, 0, dataSize - *size);
*size = dataSize;
}
s64 relative = 0;
u8 *mem;
uint8_t* mem;
while (ftello64(f) < patchSize - 12) {
relative += readVarPtr(f);
if (relative > dataSize) continue;
if (relative > dataSize)
continue;
mem = *rom + relative;
for (s64 i = relative; i < dataSize; i++) {
int x = fgetc(f);
relative++;
if (!x) break;
if (!x)
break;
if (i < dataSize) {
*mem++ ^= x;
}
@ -286,10 +285,14 @@ static int ppfVersion(FILE *f)
if (fgetc(f) != 'P' || fgetc(f) != 'P' || fgetc(f) != 'F') //-V501
return 0;
switch (fgetc(f)) {
case '1': return 1;
case '2': return 2;
case '3': return 3;
default: return 0;
case '1':
return 1;
case '2':
return 2;
case '3':
return 3;
default:
return 0;
}
}
@ -307,7 +310,7 @@ static int ppfFileIdLen(FILE *f, int version)
return (version == 2) ? readInt4(f) : readInt2(f);
}
static bool patchApplyPPF1(FILE *f, u8 **rom, int *size)
static bool patchApplyPPF1(FILE* f, uint8_t** rom, int* size)
{
fseek(f, 0, SEEK_END);
int count = ftell(f);
@ -317,7 +320,7 @@ static bool patchApplyPPF1(FILE *f, u8 **rom, int *size)
fseek(f, 56, SEEK_SET);
u8 *mem = *rom;
uint8_t* mem = *rom;
while (count > 0) {
int offset = readInt4(f);
@ -336,7 +339,7 @@ static bool patchApplyPPF1(FILE *f, u8 **rom, int *size)
return (count == 0);
}
static bool patchApplyPPF2(FILE *f, u8 **rom, int *size)
static bool patchApplyPPF2(FILE* f, uint8_t** rom, int* size)
{
fseek(f, 0, SEEK_END);
int count = ftell(f);
@ -350,9 +353,9 @@ static bool patchApplyPPF2(FILE *f, u8 **rom, int *size)
if (datalen != *size)
return false;
u8 *mem = *rom;
uint8_t* mem = *rom;
u8 block[1024];
uint8_t block[1024];
fread(&block, 1, 1024, f);
if (memcmp(&mem[0x9320], &block, 1024) != 0)
return false;
@ -380,7 +383,7 @@ static bool patchApplyPPF2(FILE *f, u8 **rom, int *size)
return (count == 0);
}
static bool patchApplyPPF3(FILE *f, u8 **rom, int *size)
static bool patchApplyPPF3(FILE* f, uint8_t** rom, int* size)
{
fseek(f, 0, SEEK_END);
int count = ftell(f);
@ -395,10 +398,10 @@ static bool patchApplyPPF3(FILE *f, u8 **rom, int *size)
int undo = fgetc(f);
fgetc(f);
u8 *mem = *rom;
uint8_t* mem = *rom;
if (blockcheck) {
u8 block[1024];
uint8_t block[1024];
fread(&block, 1, 1024, f);
if (memcmp(&mem[(imagetype == 0) ? 0x9320 : 0x80A0], &block, 1024) != 0)
return false;
@ -422,15 +425,17 @@ static bool patchApplyPPF3(FILE *f, u8 **rom, int *size)
break;
if (fread(&mem[offset], 1, len, f) != (size_t)len)
break;
if (undo) fseeko64(f, len, SEEK_CUR);
if (undo)
fseeko64(f, len, SEEK_CUR);
count -= 8 + 1 + len;
if (undo) count -= len;
if (undo)
count -= len;
}
return (count == 0);
}
static bool patchApplyPPF(const char *patchname, u8 **rom, int *size)
static bool patchApplyPPF(const char* patchname, uint8_t** rom, int* size)
{
FILE* f = fopen(patchname, "rb");
if (!f)
@ -440,9 +445,15 @@ static bool patchApplyPPF(const char *patchname, u8 **rom, int *size)
int version = ppfVersion(f);
switch (version) {
case 1: res = patchApplyPPF1(f, rom, size); break;
case 2: res = patchApplyPPF2(f, rom, size); break;
case 3: res = patchApplyPPF3(f, rom, size); break;
case 1:
res = patchApplyPPF1(f, rom, size);
break;
case 2:
res = patchApplyPPF2(f, rom, size);
break;
case 3:
res = patchApplyPPF3(f, rom, size);
break;
}
fclose(f);
@ -451,7 +462,7 @@ static bool patchApplyPPF(const char *patchname, u8 **rom, int *size)
#endif
bool applyPatch(const char *patchname, u8 **rom, int *size)
bool applyPatch(const char* patchname, uint8_t** rom, int* size)
{
#ifndef __LIBRETRO__
if (strlen(patchname) < 5)

2
src/common/Patch.h
View File

@ -3,6 +3,6 @@
#include "Types.h"
bool applyPatch(const char *patchname, u8 **rom, int *size);
bool applyPatch(const char *patchname, uint8_t **rom, int *size);
#endif // PATCH_H

22
src/common/Port.h
View File

@ -11,16 +11,14 @@
#include <ppcintrinsics.h>
#endif
#include "Types.h"
// swaps a 16-bit value
static inline u16 swap16(u16 v)
static inline uint16_t swap16(u16 v)
{
return (v << 8) | (v >> 8);
}
// swaps a 32-bit value
static inline u32 swap32(u32 v)
static inline uint32_t swap32(uint32_t v)
{
return (v << 24) | ((v << 8) & 0xff0000) | ((v >> 8) & 0xff00) | (v >> 24);
}
@ -47,16 +45,16 @@ static inline u32 swap32(u32 v)
#define WRITE32LE(base, value) __asm__("stwbrx %0, 0, %1" : : "r"(value), "r"(base) : "memory")
#else
#define READ16LE(x) swap16(*((u16 *)(x)))
#define READ32LE(x) swap32(*((u32 *)(x)))
#define WRITE16LE(x, v) *((u16 *)x) = swap16((v))
#define WRITE32LE(x, v) *((u32 *)x) = swap32((v))
#define READ16LE(x) swap16(*((uint16_t *)(x)))
#define READ32LE(x) swap32(*((uint32_t *)(x)))
#define WRITE16LE(x, v) *((uint16_t *)x) = swap16((v))
#define WRITE32LE(x, v) *((uint32_t *)x) = swap32((v))
#endif
#else
#define READ16LE(x) *((u16 *)x)
#define READ32LE(x) *((u32 *)x)
#define WRITE16LE(x, v) *((u16 *)x) = (v)
#define WRITE32LE(x, v) *((u32 *)x) = (v)
#define READ16LE(x) *((uint16_t *)x)
#define READ32LE(x) *((uint32_t *)x)
#define WRITE16LE(x, v) *((uint16_t *)x) = (v)
#define WRITE32LE(x, v) *((uint32_t *)x) = (v)
#endif
#endif // PORT_H

4
src/common/SoundDriver.h
View File

@ -18,8 +18,6 @@
#ifndef __VBA_SOUND_DRIVER_H__
#define __VBA_SOUND_DRIVER_H__
#include "Types.h"
/**
* Sound driver abstract interface for the core to use to output sound.
* Subclass this to implement a new sound driver.
@ -56,7 +54,7 @@ class SoundDriver
/**
* Write length bytes of data from the finalWave buffer to the driver output buffer.
*/
virtual void write(u16 *finalWave, int length) = 0;
virtual void write(uint16_t *finalWave, int length) = 0;
virtual void setThrottle(unsigned short throttle){};
};

8
src/common/SoundSDL.cpp
View File

@ -34,12 +34,12 @@ SoundSDL::SoundSDL():
}
void SoundSDL::soundCallback(void *data, u8 *stream, int len)
void SoundSDL::soundCallback(void *data, uint8_t *stream, int len)
{
reinterpret_cast<SoundSDL*>(data)->read(reinterpret_cast<u16 *>(stream), len);
reinterpret_cast<SoundSDL*>(data)->read(reinterpret_cast<uint16_t *>(stream), len);
}
void SoundSDL::read(u16 * stream, int length)
void SoundSDL::read(uint16_t * stream, int length)
{
if (!_initialized || length <= 0 || !emulating)
return;
@ -62,7 +62,7 @@ void SoundSDL::read(u16 * stream, int length)
SDL_SemPost (_semBufferEmpty);
}
void SoundSDL::write(u16 * finalWave, int length)
void SoundSDL::write(uint16_t * finalWave, int length)
{
if (!_initialized)
return;

4
src/common/SoundSDL.h
View File

@ -36,7 +36,7 @@ class SoundSDL : public SoundDriver
virtual void write(u16 *finalWave, int length);
private:
RingBuffer<u16> _rbuf;
RingBuffer<uint16_t> _rbuf;
SDL_mutex *_mutex;
SDL_sem *_semBufferFull;
@ -51,7 +51,7 @@ class SoundSDL : public SoundDriver
static const float _delay;
static void soundCallback(void *data, u8 *stream, int length);
virtual void read(u16 *stream, int length);
virtual void read(uint16_t *stream, int length);
};
#endif // __VBA_SOUND_SDL_H__

12
src/common/ffmpeg.cpp
View File

@ -285,14 +285,14 @@ MediaRet MediaRecorder::finish_setup(const char *fname)
case CODEC_ID_PCM_U16BE:
frame_len = sample_len;
}
audio_buf = (u8 *)malloc(AUDIO_BUF_LEN);
audio_buf = (uint8_t *)malloc(AUDIO_BUF_LEN);
if(!audio_buf) {
avformat_free_context(oc);
oc = NULL;
return MRET_ERR_NOMEM;
}
if(frame_len != sample_len && (frame_len > sample_len || sample_len % frame_len)) {
audio_buf2 = (u16 *)malloc(frame_len);
audio_buf2 = (uint16_t *)malloc(frame_len);
if(!audio_buf2) {
avformat_free_context(oc);
oc = NULL;
@ -304,7 +304,7 @@ MediaRet MediaRecorder::finish_setup(const char *fname)
if(video_buf)
free(video_buf);
if(vid_st) {
video_buf = (u8 *)malloc(VIDEO_BUF_LEN);
video_buf = (uint8_t *)malloc(VIDEO_BUF_LEN);
if(!video_buf) {
avformat_free_context(oc);
oc = NULL;
@ -361,7 +361,7 @@ void MediaRecorder::Stop()
{
if(oc) {
if(in_audio_buf2)
AddFrame((u16 *)0);
AddFrame((uint16_t *)0);
av_write_trailer(oc);
avformat_free_context(oc);
oc = NULL;
@ -395,7 +395,7 @@ MediaRecorder::~MediaRecorder()
}
// Still needs updating for avcodec_encode_video2
MediaRet MediaRecorder::AddFrame(const u8 *vid)
MediaRet MediaRecorder::AddFrame(const uint8_t *vid)
{
if(!oc || !vid_st)
return MRET_OK;
@ -527,7 +527,7 @@ static inline int MediaRecorderEncodeAudio(AVCodecContext *ctx,
}
#endif
MediaRet MediaRecorder::AddFrame(const u16 *aud)
MediaRet MediaRecorder::AddFrame(const uint16_t *aud)
{
if(!oc || !aud_st)
return MRET_OK;