mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-03 14:08:56 +00:00
gst/nsf/: Remove memguard again and apply hopefully all previously dropped local patches. Should be really better tha...
Original commit message from CVS: * gst/nsf/Makefile.am: * gst/nsf/fds_snd.c: * gst/nsf/mmc5_snd.c: * gst/nsf/nsf.c: * gst/nsf/types.h: * gst/nsf/vrc7_snd.c: * gst/nsf/vrcvisnd.c: * gst/nsf/memguard.c: * gst/nsf/memguard.h: Remove memguard again and apply hopefully all previously dropped local patches. Should be really better than the old version now.
This commit is contained in:
Sebastian Dröge
parent
6763549151
commit
ccf0b720ba
10 changed files with 126 additions and 549 deletions
14
ChangeLog
14
ChangeLog
|
|
@ -1,3 +1,17 @@
|
|||
2008-03-26 Sebastian Dröge <slomo@circular-chaos.org>
|
||||
|
||||
* gst/nsf/Makefile.am:
|
||||
* gst/nsf/fds_snd.c:
|
||||
* gst/nsf/mmc5_snd.c:
|
||||
* gst/nsf/nsf.c:
|
||||
* gst/nsf/types.h:
|
||||
* gst/nsf/vrc7_snd.c:
|
||||
* gst/nsf/vrcvisnd.c:
|
||||
* gst/nsf/memguard.c:
|
||||
* gst/nsf/memguard.h:
|
||||
Remove memguard again and apply hopefully all previously dropped
|
||||
local patches. Should be really better than the old version now.
|
||||
|
||||
2008-03-25 Wim Taymans <wim.taymans@collabora.co.uk>
|
||||
|
||||
* gst/nsf/memguard.c: (_my_free):
|
||||
|
|
|
|||
|
|
@ -9,8 +9,7 @@ NOSEFART_SOURCES=fmopl.c \
|
|||
fds_snd.c \
|
||||
nes6502.c \
|
||||
nsf.c \
|
||||
vrcvisnd.c \
|
||||
memguard.c
|
||||
vrcvisnd.c
|
||||
|
||||
NOSEFART_INCLUDES=fmopl.h \
|
||||
log.h \
|
||||
|
|
@ -23,8 +22,7 @@ NOSEFART_INCLUDES=fmopl.h \
|
|||
nes6502.h \
|
||||
nsf.h \
|
||||
types.h \
|
||||
vrcvisnd.h \
|
||||
memguard.h
|
||||
vrcvisnd.h
|
||||
|
||||
libgstnsf_la_SOURCES = gstnsf.c $(NOSEFART_SOURCES)
|
||||
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
** $Id$
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include "types.h"
|
||||
#include "nes_apu.h"
|
||||
#include "fds_snd.h"
|
||||
|
|
@ -66,7 +67,7 @@ fds_shutdown (void)
|
|||
|
||||
static apu_memwrite fds_memwrite[] = {
|
||||
{0x4040, 0x4092, fds_write},
|
||||
{-1, -1, NULL}
|
||||
{(uint32) - 1, (uint32) - 1, NULL}
|
||||
};
|
||||
|
||||
apuext_t fds_ext = {
|
||||
|
|
@ -80,7 +81,20 @@ apuext_t fds_ext = {
|
|||
|
||||
/*
|
||||
** $Log$
|
||||
** Revision 1.3 2008/03/25 15:56:10 slomo
|
||||
** Revision 1.4 2008/03/26 07:40:55 slomo
|
||||
** * gst/nsf/Makefile.am:
|
||||
** * gst/nsf/fds_snd.c:
|
||||
** * gst/nsf/mmc5_snd.c:
|
||||
** * gst/nsf/nsf.c:
|
||||
** * gst/nsf/types.h:
|
||||
** * gst/nsf/vrc7_snd.c:
|
||||
** * gst/nsf/vrcvisnd.c:
|
||||
** * gst/nsf/memguard.c:
|
||||
** * gst/nsf/memguard.h:
|
||||
** Remove memguard again and apply hopefully all previously dropped
|
||||
** local patches. Should be really better than the old version now.
|
||||
**
|
||||
** Revision 1.3 2008-03-25 15:56:10 slomo
|
||||
** Patch by: Andreas Henriksson <andreas at fatal dot set>
|
||||
** * gst/nsf/Makefile.am:
|
||||
** * gst/nsf/dis6502.h:
|
||||
|
|
|
|||
|
|
@ -1,408 +0,0 @@
|
|||
/*
|
||||
** Nofrendo (c) 1998-2000 Matthew Conte (matt@conte.com)
|
||||
**
|
||||
**
|
||||
** This program is free software; you can redistribute it and/or
|
||||
** modify it under the terms of version 2 of the GNU Library General
|
||||
** Public License as published by the Free Software Foundation.
|
||||
**
|
||||
** 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
|
||||
** Library General Public License for more details. To obtain a
|
||||
** copy of the GNU Library General Public License, write to the Free
|
||||
** Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
**
|
||||
** Any permitted reproduction of these routines, in whole or in part,
|
||||
** must bear this legend.
|
||||
**
|
||||
**
|
||||
** memguard.c
|
||||
**
|
||||
** memory allocation wrapper routines
|
||||
**
|
||||
** NOTE: based on code (c) 1998 the Retrocade group
|
||||
** $Id$
|
||||
*/
|
||||
|
||||
#include "types.h"
|
||||
|
||||
/* undefine macro definitions, so we get real calls */
|
||||
#undef malloc
|
||||
#undef free
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include "memguard.h"
|
||||
#include "log.h"
|
||||
|
||||
|
||||
/* Maximum number of allocated blocks at any one time */
|
||||
#define MAX_BLOCKS 16384
|
||||
|
||||
/* Memory block structure */
|
||||
typedef struct memblock_s
|
||||
{
|
||||
void *block_addr;
|
||||
int block_size;
|
||||
char *file_name;
|
||||
int line_num;
|
||||
} memblock_t;
|
||||
|
||||
boolean mem_debug = TRUE; /* debugging flag */
|
||||
|
||||
|
||||
#ifdef NOFRENDO_DEBUG
|
||||
|
||||
static int mem_blockcount = 0; /* allocated block count */
|
||||
static memblock_t *mem_record = NULL;
|
||||
|
||||
#define GUARD_STRING "GgUuAaRrDdSsTtRrIiNnGgBbLlOoCcKk"
|
||||
#define GUARD_LENGTH 64 /* before and after allocated block */
|
||||
|
||||
|
||||
/*
|
||||
** Check the memory guard to make sure out of bounds writes have not
|
||||
** occurred.
|
||||
*/
|
||||
static boolean
|
||||
mem_checkguardblock (void *data, int guard_size)
|
||||
{
|
||||
uint8 *orig, *chk, *blk;
|
||||
int i, alloc_size;
|
||||
|
||||
/* get the original pointer */
|
||||
orig = (((uint8 *) data) - guard_size);
|
||||
|
||||
/* get the size */
|
||||
alloc_size = *((uint32 *) orig);
|
||||
|
||||
/* now skip past the size */
|
||||
blk = orig + sizeof (uint32);
|
||||
|
||||
/* check leading guard string */
|
||||
chk = GUARD_STRING;
|
||||
for (i = sizeof (uint32); i < guard_size; i++) {
|
||||
if (0 == *chk)
|
||||
chk = GUARD_STRING;
|
||||
if (*blk != *chk)
|
||||
return FALSE;
|
||||
chk++;
|
||||
blk++;
|
||||
}
|
||||
|
||||
/* check end of block */
|
||||
chk = GUARD_STRING;
|
||||
blk = ((uint8 *) data) + alloc_size;
|
||||
for (i = 0; i < guard_size; i++) {
|
||||
if (0 == *chk)
|
||||
chk = GUARD_STRING;
|
||||
if (*blk != *chk)
|
||||
return FALSE;
|
||||
chk++;
|
||||
blk++;
|
||||
}
|
||||
|
||||
/* we're okay! */
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/* free a guard block */
|
||||
static void
|
||||
mem_freeguardblock (void *data, int guard_size)
|
||||
{
|
||||
uint8 *orig = (((uint8 *) data) - guard_size);
|
||||
|
||||
free (orig);
|
||||
}
|
||||
|
||||
/* fill in the memory guard, advance the pointer to the 'real' memory */
|
||||
static void *
|
||||
mem_guardblock (int alloc_size, int guard_size)
|
||||
{
|
||||
void *orig;
|
||||
uint8 *blk, *chk;
|
||||
int i;
|
||||
|
||||
/* allocate memory */
|
||||
orig = calloc (alloc_size + (guard_size * 2), 1);
|
||||
if (NULL == orig)
|
||||
return NULL;
|
||||
|
||||
blk = ((uint8 *) orig);
|
||||
|
||||
/* store the size of the newly allocated block */
|
||||
*((uint32 *) blk) = alloc_size;
|
||||
|
||||
/* skip past the size */
|
||||
blk += sizeof (uint32);
|
||||
|
||||
/* put guard string at beginning of block */
|
||||
chk = GUARD_STRING;
|
||||
for (i = sizeof (uint32); i < guard_size; i++) {
|
||||
if (0 == *chk)
|
||||
chk = GUARD_STRING;
|
||||
*blk++ = *chk++;
|
||||
}
|
||||
|
||||
/* check end of block */
|
||||
chk = GUARD_STRING;
|
||||
blk = guard_size + (uint8 *) orig + alloc_size;
|
||||
for (i = 0; i < guard_size; i++) {
|
||||
if (0 == *chk)
|
||||
chk = GUARD_STRING;
|
||||
*blk++ = *chk++;
|
||||
}
|
||||
|
||||
return (void *) (guard_size + (uint8 *) orig);
|
||||
}
|
||||
|
||||
|
||||
/* Allocate a bunch of memory to keep track of all memory blocks */
|
||||
static void
|
||||
mem_init (void)
|
||||
{
|
||||
if (mem_record) {
|
||||
free (mem_record);
|
||||
mem_record = NULL;
|
||||
}
|
||||
|
||||
mem_record = calloc (MAX_BLOCKS * sizeof (memblock_t), 1);
|
||||
ASSERT (mem_record);
|
||||
}
|
||||
|
||||
/* add a block of memory to the master record */
|
||||
static void
|
||||
mem_addblock (void *data, int block_size, char *file, int line)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < MAX_BLOCKS; i++) {
|
||||
if (NULL == mem_record[i].block_addr) {
|
||||
mem_record[i].block_addr = data;
|
||||
mem_record[i].block_size = block_size;
|
||||
mem_record[i].file_name = file;
|
||||
mem_record[i].line_num = line;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
ASSERT_MSG ("out of memory blocks.");
|
||||
}
|
||||
|
||||
/* find an entry in the block record and delete it */
|
||||
static void
|
||||
mem_deleteblock (void *data, char *file, int line)
|
||||
{
|
||||
int i;
|
||||
char fail[256];
|
||||
|
||||
for (i = 0; i < MAX_BLOCKS; i++) {
|
||||
if (data == mem_record[i].block_addr) {
|
||||
if (FALSE == mem_checkguardblock (mem_record[i].block_addr, GUARD_LENGTH)) {
|
||||
sprintf (fail,
|
||||
"mem_deleteblock 0x%08X at line %d of %s -- block corrupt",
|
||||
(uint32) data, line, file);
|
||||
ASSERT_MSG (fail);
|
||||
}
|
||||
|
||||
memset (&mem_record[i], 0, sizeof (memblock_t));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
sprintf (fail, "mem_deleteblock 0x%08X at line %d of %s -- block not found",
|
||||
(uint32) data, line, file);
|
||||
ASSERT_MSG (fail);
|
||||
}
|
||||
#endif /* NOFRENDO_DEBUG */
|
||||
|
||||
/* allocates memory and clears it */
|
||||
#ifdef NOFRENDO_DEBUG
|
||||
void *
|
||||
_my_malloc (int size, char *file, int line)
|
||||
#else
|
||||
void *
|
||||
_my_malloc (int size)
|
||||
#endif
|
||||
{
|
||||
void *temp;
|
||||
char fail[256];
|
||||
|
||||
#ifdef NOFRENDO_DEBUG
|
||||
if (NULL == mem_record && FALSE != mem_debug)
|
||||
mem_init ();
|
||||
|
||||
if (FALSE != mem_debug)
|
||||
temp = mem_guardblock (size, GUARD_LENGTH);
|
||||
else
|
||||
#endif /* NOFRENDO_DEBUG */
|
||||
temp = calloc (sizeof (uint8), size);
|
||||
|
||||
if (NULL == temp) {
|
||||
#ifdef NOFRENDO_DEBUG
|
||||
sprintf (fail, "malloc: out of memory at line %d of %s. block size: %d\n",
|
||||
line, file, size);
|
||||
#else
|
||||
sprintf (fail, "malloc: out of memory. block size: %d\n", size);
|
||||
#endif
|
||||
ASSERT_MSG (fail);
|
||||
}
|
||||
#ifdef NOFRENDO_DEBUG
|
||||
if (FALSE != mem_debug)
|
||||
mem_addblock (temp, size, file, line);
|
||||
|
||||
mem_blockcount++;
|
||||
#endif
|
||||
|
||||
return temp;
|
||||
}
|
||||
|
||||
/* free a pointer allocated with my_malloc */
|
||||
#ifdef NOFRENDO_DEBUG
|
||||
void
|
||||
_my_free (void **data, char *file, int line)
|
||||
#else
|
||||
void
|
||||
_my_free (void **data)
|
||||
#endif
|
||||
{
|
||||
char fail[256];
|
||||
|
||||
if (NULL == data || NULL == *data
|
||||
|| (void *) 0xFFFFFFFF == (void *) *data
|
||||
|| (void *) 0xFFFFFFFF == (void *) data) {
|
||||
#ifdef NOFRENDO_DEBUG
|
||||
sprintf (fail, "free: attempted to free NULL pointer at line %d of %s\n",
|
||||
line, file);
|
||||
#else
|
||||
sprintf (fail, "free: attempted to free NULL pointer.\n");
|
||||
#endif
|
||||
ASSERT_MSG (fail);
|
||||
}
|
||||
#ifdef NOFRENDO_DEBUG
|
||||
/* if this is true, we are in REAL trouble */
|
||||
if (0 == mem_blockcount) {
|
||||
ASSERT_MSG ("free: attempted to free memory when no blocks available");
|
||||
}
|
||||
|
||||
if (FALSE != mem_debug)
|
||||
mem_deleteblock (*data, file, line);
|
||||
|
||||
mem_blockcount--; /* dec our block count */
|
||||
|
||||
if (FALSE != mem_debug)
|
||||
mem_freeguardblock (*data, GUARD_LENGTH);
|
||||
else
|
||||
#endif /* NOFRENDO_DEBUG */
|
||||
free (*data);
|
||||
|
||||
*data = NULL; /* NULL our source */
|
||||
}
|
||||
|
||||
/* check for orphaned memory handles */
|
||||
void
|
||||
mem_checkleaks (void)
|
||||
{
|
||||
#ifdef NOFRENDO_DEBUG
|
||||
int i;
|
||||
|
||||
if (FALSE == mem_debug)
|
||||
return;
|
||||
|
||||
if (mem_blockcount) {
|
||||
log_printf ("memory leak - %d unfreed block%s\n\n", mem_blockcount,
|
||||
mem_blockcount == 1 ? "" : "s");
|
||||
|
||||
for (i = 0; i < MAX_BLOCKS; i++) {
|
||||
if (mem_record[i].block_addr) {
|
||||
log_printf ("addr: 0x%08X, size: %d, line %d of %s%s\n",
|
||||
(uint32) mem_record[i].block_addr,
|
||||
mem_record[i].block_size,
|
||||
mem_record[i].line_num,
|
||||
mem_record[i].file_name,
|
||||
(FALSE == mem_checkguardblock (mem_record[i].block_addr,
|
||||
GUARD_LENGTH))
|
||||
? " -- block corrupt" : "");
|
||||
}
|
||||
}
|
||||
} else
|
||||
log_printf ("no memory leaks\n");
|
||||
#endif
|
||||
}
|
||||
|
||||
void
|
||||
mem_checkblocks (void)
|
||||
{
|
||||
#ifdef NOFRENDO_DEBUG
|
||||
int i;
|
||||
|
||||
if (FALSE == mem_debug)
|
||||
return;
|
||||
|
||||
for (i = 0; i < MAX_BLOCKS; i++) {
|
||||
if (mem_record[i].block_addr) {
|
||||
if (FALSE == mem_checkguardblock (mem_record[i].block_addr, GUARD_LENGTH)) {
|
||||
log_printf ("addr: 0x%08X, size: %d, line %d of %s -- block corrupt\n",
|
||||
(uint32) mem_record[i].block_addr,
|
||||
mem_record[i].block_size,
|
||||
mem_record[i].line_num, mem_record[i].file_name);
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif /* NOFRENDO_DEBUG */
|
||||
}
|
||||
|
||||
/*
|
||||
** $Log$
|
||||
** Revision 1.4 2008/03/25 16:58:53 wtay
|
||||
** * gst/nsf/memguard.c: (_my_free):
|
||||
** * gst/nsf/types.h:
|
||||
** Unbreak compilation by disabling memguard and doing some dirty hack
|
||||
** fixes to make it compile on 64bits.
|
||||
**
|
||||
** Revision 1.3 2008-03-25 15:56:11 slomo
|
||||
** Patch by: Andreas Henriksson <andreas at fatal dot set>
|
||||
** * gst/nsf/Makefile.am:
|
||||
** * gst/nsf/dis6502.h:
|
||||
** * gst/nsf/fds_snd.c:
|
||||
** * gst/nsf/fds_snd.h:
|
||||
** * gst/nsf/fmopl.c:
|
||||
** * gst/nsf/fmopl.h:
|
||||
** * gst/nsf/gstnsf.c:
|
||||
** * gst/nsf/log.c:
|
||||
** * gst/nsf/log.h:
|
||||
** * gst/nsf/memguard.c:
|
||||
** * gst/nsf/memguard.h:
|
||||
** * gst/nsf/mmc5_snd.c:
|
||||
** * gst/nsf/mmc5_snd.h:
|
||||
** * gst/nsf/nes6502.c:
|
||||
** * gst/nsf/nes6502.h:
|
||||
** * gst/nsf/nes_apu.c:
|
||||
** * gst/nsf/nes_apu.h:
|
||||
** * gst/nsf/nsf.c:
|
||||
** * gst/nsf/nsf.h:
|
||||
** * gst/nsf/osd.h:
|
||||
** * gst/nsf/types.h:
|
||||
** * gst/nsf/vrc7_snd.c:
|
||||
** * gst/nsf/vrc7_snd.h:
|
||||
** * gst/nsf/vrcvisnd.c:
|
||||
** * gst/nsf/vrcvisnd.h:
|
||||
** Update our internal nosefart to nosefart-2.7-mls to fix segfaults
|
||||
** on some files. Fixes bug #498237.
|
||||
** Remove some // comments, fix some compiler warnings and use pow()
|
||||
** instead of a slow, selfmade implementation.
|
||||
**
|
||||
** Revision 1.1 2003/04/08 20:46:46 ben
|
||||
** add new input for NES music file.
|
||||
**
|
||||
** Revision 1.8 2000/06/26 04:54:48 matt
|
||||
** simplified and made more robust
|
||||
**
|
||||
** Revision 1.7 2000/06/12 01:11:41 matt
|
||||
** cleaned up some error output for win32
|
||||
**
|
||||
** Revision 1.6 2000/06/09 15:12:25 matt
|
||||
** initial revision
|
||||
**
|
||||
*/
|
||||
|
|
@ -1,98 +0,0 @@
|
|||
/*
|
||||
** Nofrendo (c) 1998-2000 Matthew Conte (matt@conte.com)
|
||||
**
|
||||
**
|
||||
** This program is free software; you can redistribute it and/or
|
||||
** modify it under the terms of version 2 of the GNU Library General
|
||||
** Public License as published by the Free Software Foundation.
|
||||
**
|
||||
** 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
|
||||
** Library General Public License for more details. To obtain a
|
||||
** copy of the GNU Library General Public License, write to the Free
|
||||
** Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
**
|
||||
** Any permitted reproduction of these routines, in whole or in part,
|
||||
** must bear this legend.
|
||||
**
|
||||
**
|
||||
** memguard.h
|
||||
**
|
||||
** memory allocation wrapper routines
|
||||
** $Id$
|
||||
*/
|
||||
|
||||
#ifndef _MEMGUARD_H_
|
||||
#define _MEMGUARD_H_
|
||||
|
||||
#ifdef NOFRENDO_DEBUG
|
||||
|
||||
#define malloc(s) _my_malloc((s), __FILE__, __LINE__)
|
||||
#define free(d) _my_free((void **) &(d), __FILE__, __LINE__)
|
||||
|
||||
extern void *_my_malloc(int size, char *file, int line);
|
||||
extern void _my_free(void **data, char *file, int line);
|
||||
|
||||
#else /* Non-debugging versions of calls */
|
||||
|
||||
#define malloc(s) _my_malloc((s))
|
||||
#define free(d) _my_free((void **) &(d))
|
||||
|
||||
extern void *_my_malloc(int size);
|
||||
extern void _my_free(void **data);
|
||||
|
||||
#endif /* NOFRENDO_DEBUG */
|
||||
|
||||
|
||||
extern void mem_checkblocks(void);
|
||||
extern void mem_checkleaks(void);
|
||||
|
||||
extern boolean mem_debug;
|
||||
|
||||
#endif /* _MEMGUARD_H_ */
|
||||
|
||||
/*
|
||||
** $Log$
|
||||
** Revision 1.3 2008/03/25 15:56:11 slomo
|
||||
** Patch by: Andreas Henriksson <andreas at fatal dot set>
|
||||
** * gst/nsf/Makefile.am:
|
||||
** * gst/nsf/dis6502.h:
|
||||
** * gst/nsf/fds_snd.c:
|
||||
** * gst/nsf/fds_snd.h:
|
||||
** * gst/nsf/fmopl.c:
|
||||
** * gst/nsf/fmopl.h:
|
||||
** * gst/nsf/gstnsf.c:
|
||||
** * gst/nsf/log.c:
|
||||
** * gst/nsf/log.h:
|
||||
** * gst/nsf/memguard.c:
|
||||
** * gst/nsf/memguard.h:
|
||||
** * gst/nsf/mmc5_snd.c:
|
||||
** * gst/nsf/mmc5_snd.h:
|
||||
** * gst/nsf/nes6502.c:
|
||||
** * gst/nsf/nes6502.h:
|
||||
** * gst/nsf/nes_apu.c:
|
||||
** * gst/nsf/nes_apu.h:
|
||||
** * gst/nsf/nsf.c:
|
||||
** * gst/nsf/nsf.h:
|
||||
** * gst/nsf/osd.h:
|
||||
** * gst/nsf/types.h:
|
||||
** * gst/nsf/vrc7_snd.c:
|
||||
** * gst/nsf/vrc7_snd.h:
|
||||
** * gst/nsf/vrcvisnd.c:
|
||||
** * gst/nsf/vrcvisnd.h:
|
||||
** Update our internal nosefart to nosefart-2.7-mls to fix segfaults
|
||||
** on some files. Fixes bug #498237.
|
||||
** Remove some // comments, fix some compiler warnings and use pow()
|
||||
** instead of a slow, selfmade implementation.
|
||||
**
|
||||
** Revision 1.1 2003/04/08 20:46:46 ben
|
||||
** add new input for NES music file.
|
||||
**
|
||||
** Revision 1.5 2000/06/26 04:54:48 matt
|
||||
** simplified and made more robust
|
||||
**
|
||||
** Revision 1.4 2000/06/09 15:12:25 matt
|
||||
** initial revision
|
||||
**
|
||||
*/
|
||||
|
|
@ -310,13 +310,13 @@ mmc5_shutdown (void)
|
|||
|
||||
static apu_memread mmc5_memread[] = {
|
||||
{0x5205, 0x5206, mmc5_read},
|
||||
{-1, -1, NULL}
|
||||
{(uint32) - 1, (uint32) - 1, NULL}
|
||||
};
|
||||
|
||||
static apu_memwrite mmc5_memwrite[] = {
|
||||
{0x5000, 0x5015, mmc5_write},
|
||||
{0x5205, 0x5206, mmc5_write},
|
||||
{-1, -1, NULL}
|
||||
{(uint32) - 1, (uint32) - 1, NULL}
|
||||
};
|
||||
|
||||
apuext_t mmc5_ext = {
|
||||
|
|
@ -330,7 +330,20 @@ apuext_t mmc5_ext = {
|
|||
|
||||
/*
|
||||
** $Log$
|
||||
** Revision 1.3 2008/03/25 15:56:11 slomo
|
||||
** Revision 1.4 2008/03/26 07:40:55 slomo
|
||||
** * gst/nsf/Makefile.am:
|
||||
** * gst/nsf/fds_snd.c:
|
||||
** * gst/nsf/mmc5_snd.c:
|
||||
** * gst/nsf/nsf.c:
|
||||
** * gst/nsf/types.h:
|
||||
** * gst/nsf/vrc7_snd.c:
|
||||
** * gst/nsf/vrcvisnd.c:
|
||||
** * gst/nsf/memguard.c:
|
||||
** * gst/nsf/memguard.h:
|
||||
** Remove memguard again and apply hopefully all previously dropped
|
||||
** local patches. Should be really better than the old version now.
|
||||
**
|
||||
** Revision 1.3 2008-03-25 15:56:11 slomo
|
||||
** Patch by: Andreas Henriksson <andreas at fatal dot set>
|
||||
** * gst/nsf/Makefile.am:
|
||||
** * gst/nsf/dis6502.h:
|
||||
|
|
|
|||
|
|
@ -89,14 +89,14 @@ nsf_bankswitch (uint32 address, uint8 value)
|
|||
static nes6502_memread default_readhandler[] = {
|
||||
{0x0800, 0x1FFF, read_mirrored_ram},
|
||||
{0x4000, 0x4017, apu_read},
|
||||
{-1, -1, NULL}
|
||||
{(uint32) - 1, (uint32) - 1, NULL}
|
||||
};
|
||||
|
||||
static nes6502_memwrite default_writehandler[] = {
|
||||
{0x0800, 0x1FFF, write_mirrored_ram},
|
||||
{0x4000, 0x4017, apu_write},
|
||||
{0x5FF6, 0x5FFF, nsf_bankswitch},
|
||||
{-1, -1, NULL}
|
||||
{(uint32) - 1, (uint32) - 1, NULL}
|
||||
};
|
||||
|
||||
static uint8
|
||||
|
|
@ -1031,7 +1031,20 @@ nsf_setfilter (nsf_t * nsf, int filter_type)
|
|||
|
||||
/*
|
||||
** $Log$
|
||||
** Revision 1.5 2008/03/25 15:56:12 slomo
|
||||
** Revision 1.6 2008/03/26 07:40:55 slomo
|
||||
** * gst/nsf/Makefile.am:
|
||||
** * gst/nsf/fds_snd.c:
|
||||
** * gst/nsf/mmc5_snd.c:
|
||||
** * gst/nsf/nsf.c:
|
||||
** * gst/nsf/types.h:
|
||||
** * gst/nsf/vrc7_snd.c:
|
||||
** * gst/nsf/vrcvisnd.c:
|
||||
** * gst/nsf/memguard.c:
|
||||
** * gst/nsf/memguard.h:
|
||||
** Remove memguard again and apply hopefully all previously dropped
|
||||
** local patches. Should be really better than the old version now.
|
||||
**
|
||||
** Revision 1.5 2008-03-25 15:56:12 slomo
|
||||
** Patch by: Andreas Henriksson <andreas at fatal dot set>
|
||||
** * gst/nsf/Makefile.am:
|
||||
** * gst/nsf/dis6502.h:
|
||||
|
|
|
|||
|
|
@ -23,13 +23,16 @@
|
|||
** $Id$
|
||||
*/
|
||||
|
||||
#ifndef _TYPES_H_
|
||||
#define _TYPES_H_
|
||||
#ifndef _NSF_TYPES_H_
|
||||
#define _NSF_TYPES_H_
|
||||
|
||||
#include <glib.h> /* for types, endianness */
|
||||
|
||||
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
|
||||
/* Define this if running on little-endian (x86) systems */
|
||||
|
||||
#ifndef DCPLAYA
|
||||
# define HOST_LITTLE_ENDIAN
|
||||
#define HOST_LITTLE_ENDIAN
|
||||
#else
|
||||
#undef HOST_LITTLE_ENDIAN
|
||||
#endif
|
||||
|
||||
#ifdef __GNUC__
|
||||
|
|
@ -42,26 +45,14 @@
|
|||
|
||||
/* These should be changed depending on the platform */
|
||||
|
||||
typedef gint8 int8;
|
||||
typedef gint16 int16;
|
||||
typedef gint32 int32;
|
||||
|
||||
|
||||
#ifdef __BEOS__ /* added by Eli Dayan (for compiling under BeOS) */
|
||||
|
||||
/* use types in the BeOS Support Kit instead */
|
||||
#include <be/support/SupportDefs.h>
|
||||
#elif defined (DCPLAYA) /* $$$ added by ben (for compiling with dcplaya) */
|
||||
# include <arch/types.h>
|
||||
#else
|
||||
typedef char int8;
|
||||
typedef short int16;
|
||||
typedef int int32;
|
||||
|
||||
typedef unsigned char uint8;
|
||||
typedef unsigned short uint16;
|
||||
typedef unsigned int uint32;
|
||||
|
||||
#endif
|
||||
|
||||
typedef uint8 boolean;
|
||||
typedef guint8 uint8;
|
||||
typedef guint16 uint16;
|
||||
typedef guint32 uint32;
|
||||
typedef guint8 boolean;
|
||||
|
||||
#ifndef TRUE
|
||||
#define TRUE 1
|
||||
|
|
@ -76,7 +67,7 @@ typedef uint8 boolean;
|
|||
|
||||
#ifdef NOFRENDO_DEBUG
|
||||
#include <stdlib.h>
|
||||
#include "memguard.h"
|
||||
/* #include "memguard.h" */
|
||||
#include "log.h"
|
||||
#define ASSERT(expr) if (FALSE == (expr))\
|
||||
{\
|
||||
|
|
@ -95,11 +86,24 @@ typedef uint8 boolean;
|
|||
#define ASSERT_MSG(msg)
|
||||
#endif
|
||||
|
||||
#endif /* _TYPES_H_ */
|
||||
#endif /* _NSF_TYPES_H_ */
|
||||
|
||||
/*
|
||||
** $Log$
|
||||
** Revision 1.5 2008/03/25 16:58:53 wtay
|
||||
** Revision 1.6 2008/03/26 07:40:55 slomo
|
||||
** * gst/nsf/Makefile.am:
|
||||
** * gst/nsf/fds_snd.c:
|
||||
** * gst/nsf/mmc5_snd.c:
|
||||
** * gst/nsf/nsf.c:
|
||||
** * gst/nsf/types.h:
|
||||
** * gst/nsf/vrc7_snd.c:
|
||||
** * gst/nsf/vrcvisnd.c:
|
||||
** * gst/nsf/memguard.c:
|
||||
** * gst/nsf/memguard.h:
|
||||
** Remove memguard again and apply hopefully all previously dropped
|
||||
** local patches. Should be really better than the old version now.
|
||||
**
|
||||
** Revision 1.5 2008-03-25 16:58:53 wtay
|
||||
** * gst/nsf/memguard.c: (_my_free):
|
||||
** * gst/nsf/types.h:
|
||||
** Unbreak compilation by disabling memguard and doing some dirty hack
|
||||
|
|
|
|||
|
|
@ -310,7 +310,7 @@ vrc7_process (void)
|
|||
static apu_memwrite vrc7_memwrite[] = {
|
||||
{0x9010, 0x9010, vrc7_write},
|
||||
{0x9030, 0x9030, vrc7_write},
|
||||
{-1, -1, NULL}
|
||||
{(uint32) - 1, (uint32) - 1, NULL}
|
||||
};
|
||||
|
||||
apuext_t vrc7_ext = {
|
||||
|
|
@ -324,7 +324,20 @@ apuext_t vrc7_ext = {
|
|||
|
||||
/*
|
||||
** $Log$
|
||||
** Revision 1.3 2008/03/25 15:56:12 slomo
|
||||
** Revision 1.4 2008/03/26 07:40:56 slomo
|
||||
** * gst/nsf/Makefile.am:
|
||||
** * gst/nsf/fds_snd.c:
|
||||
** * gst/nsf/mmc5_snd.c:
|
||||
** * gst/nsf/nsf.c:
|
||||
** * gst/nsf/types.h:
|
||||
** * gst/nsf/vrc7_snd.c:
|
||||
** * gst/nsf/vrcvisnd.c:
|
||||
** * gst/nsf/memguard.c:
|
||||
** * gst/nsf/memguard.h:
|
||||
** Remove memguard again and apply hopefully all previously dropped
|
||||
** local patches. Should be really better than the old version now.
|
||||
**
|
||||
** Revision 1.3 2008-03-25 15:56:12 slomo
|
||||
** Patch by: Andreas Henriksson <andreas at fatal dot set>
|
||||
** * gst/nsf/Makefile.am:
|
||||
** * gst/nsf/dis6502.h:
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
** $Id$
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include "types.h"
|
||||
#include "vrcvisnd.h"
|
||||
#include "nes_apu.h"
|
||||
|
|
@ -174,7 +175,7 @@ static apu_memwrite vrcvi_memwrite[] = {
|
|||
{0x9000, 0x9002, vrcvi_write}, /* vrc6 */
|
||||
{0xA000, 0xA002, vrcvi_write},
|
||||
{0xB000, 0xB002, vrcvi_write},
|
||||
{-1, -1, NULL}
|
||||
{(uint32) - 1, (uint32) - 1, NULL}
|
||||
};
|
||||
|
||||
apuext_t vrcvi_ext = {
|
||||
|
|
@ -188,7 +189,20 @@ apuext_t vrcvi_ext = {
|
|||
|
||||
/*
|
||||
** $Log$
|
||||
** Revision 1.3 2008/03/25 15:56:13 slomo
|
||||
** Revision 1.4 2008/03/26 07:40:56 slomo
|
||||
** * gst/nsf/Makefile.am:
|
||||
** * gst/nsf/fds_snd.c:
|
||||
** * gst/nsf/mmc5_snd.c:
|
||||
** * gst/nsf/nsf.c:
|
||||
** * gst/nsf/types.h:
|
||||
** * gst/nsf/vrc7_snd.c:
|
||||
** * gst/nsf/vrcvisnd.c:
|
||||
** * gst/nsf/memguard.c:
|
||||
** * gst/nsf/memguard.h:
|
||||
** Remove memguard again and apply hopefully all previously dropped
|
||||
** local patches. Should be really better than the old version now.
|
||||
**
|
||||
** Revision 1.3 2008-03-25 15:56:13 slomo
|
||||
** Patch by: Andreas Henriksson <andreas at fatal dot set>
|
||||
** * gst/nsf/Makefile.am:
|
||||
** * gst/nsf/dis6502.h:
|
||||
|
|
|
|||
Loading…
Reference in a new issue