Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2025-03-06 14:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed memory pool macros to (hopefully) work with gcc.

Browse source
This commit is contained in:
Bart Trzynadlowski 2011-08-15 05:59:33 +00:00
parent 6c5b4293eb
commit 5e1ea75374
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Src/Model3/Model3.cpp
View file

@ -2475,7 +2475,7 @@ static void Dump(const char *file, UINT8 *buf, unsigned size, BOOL reverse32, BO
#define OFFSET_SAMPLEROM 0xD0C0000 // 16 MB (sound board samples)
#define OFFSET_DSBPROGROM 0xE0C0000 // 128 KB (DSB program)
#define OFFSET_DSBMPEGROM 0xE0E0000 // 16 MB (DSB MPEG data -- Z80 version only uses 8MB)
#define MEMORY_POOL_SIZE (0x800000+0x800000+0x8000000+0x4000000+0x20000+0x20000+0x80000+0x1000000+0x20000+0x1000000)
#define MEMORY_POOL_SIZE (0x800000 + 0x800000 + 0x8000000 + 0x4000000 + 0x20000 + 0x20000 + 0x80000 + 0x1000000 + 0x20000 + 0x1000000)
const struct GameInfo * CModel3::GetGameInfo(void)
{

21
Src/Model3/SoundBoard.cpp
View file

@ -1,3 +1,4 @@
//TODO: before release, comment out printf()'s
/**
** Supermodel
** A Sega Model 3 Arcade Emulator.
@ -394,15 +395,15 @@ void CSoundBoard::Reset(void)
UpdateROMBanks();
M68KSetContext(&M68K);
M68KReset();
printf("SBrd PC=%06X\n", M68KGetPC());
//printf("SBrd PC=%06X\n", M68KGetPC());
M68KGetContext(&M68K);
if (NULL != DSB)
DSB->Reset();
DebugLog("Sound Board Reset\n");
printf("PC=%06X\n", M68KGetPC());
M68KSetContext(&M68K);
M68KGetContext(&M68K);
printf("PC=%06X\n", M68KGetPC());
//printf("PC=%06X\n", M68KGetPC());
//M68KSetContext(&M68K);
//M68KGetContext(&M68K);
//printf("PC=%06X\n", M68KGetPC());
}
void CSoundBoard::SaveState(CBlockFile *SaveState)
@ -454,11 +455,11 @@ void CSoundBoard::AttachDSB(CDSB *DSBPtr)
}
// Offsets of memory regions within sound board's pool
#define OFFSET_RAM1 (0) // 1 MB SCSP1 RAM
#define OFFSET_RAM2 (0x100000) // 1 MB SCSP2 RAM
#define OFFSET_AUDIO_LEFT (0x200000) // 1470 bytes (16 bits, 44.1 KHz, 1/60th second) left audio channel
#define OFFSET_AUDIO_RIGHT (0x2005BE) // 1470 bytes right audio channel
#define MEMORY_POOL_SIZE (0x100000+0x100000+0x5be+0x5be)
#define OFFSET_RAM1 0 // 1 MB SCSP1 RAM
#define OFFSET_RAM2 0x100000 // 1 MB SCSP2 RAM
#define OFFSET_AUDIO_LEFT 0x200000 // 1470 bytes (16 bits, 44.1 KHz, 1/60th second) left audio channel
#define OFFSET_AUDIO_RIGHT 0x2005BE // 1470 bytes right audio channel
#define MEMORY_POOL_SIZE (0x100000 + 0x100000 + 0x5BE + 0x5BE)
BOOL CSoundBoard::Init(const UINT8 *soundROMPtr, const UINT8 *sampleROMPtr)
{