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

fix gpu/dsp ram domains

This commit is contained in:
CasualPokePlayer 2022-09-23 02:43:49 -07:00
parent 6113f3c17b
commit 801a783c69
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/dll/virtualjaguar.wbx.zst
View File

Binary file not shown.

13
waterbox/virtualjaguar/BizInterface.cpp
View File

@ -97,7 +97,7 @@ EXPORT void InitWithCd(BizSettings* bizSettings, u8* boot)
JaguarReset();
}
extern uint16_t eeprom_ram[64];
extern u16 eeprom_ram[64];
extern bool eeprom_dirty;
EXPORT bool SaveRamIsDirty()
@ -117,6 +117,9 @@ EXPORT void PutSaveRam(u8* src)
eeprom_dirty = false;
}
extern u8 gpu_ram_8[0x1000];
extern u8 dsp_ram_8[0x2000];
EXPORT void GetMemoryAreas(MemoryArea* m)
{
m[0].Data = jaguarMainRAM;
@ -129,14 +132,14 @@ EXPORT void GetMemoryAreas(MemoryArea* m)
m[1].Size = sizeof(eeprom_ram);
m[1].Flags = MEMORYAREA_FLAGS_WORDSIZE2 | MEMORYAREA_FLAGS_WRITABLE | MEMORYAREA_FLAGS_YUGEENDIAN | MEMORYAREA_FLAGS_SAVERAMMABLE;
m[2].Data = gpuRAM;
m[2].Data = gpu_ram_8;
m[2].Name = "GPU RAM";
m[2].Size = 0x18000;
m[2].Size = sizeof(gpu_ram_8);
m[2].Flags = MEMORYAREA_FLAGS_WORDSIZE2 | MEMORYAREA_FLAGS_WRITABLE | MEMORYAREA_FLAGS_YUGEENDIAN;
m[3].Data = dspRAM;
m[3].Data = dsp_ram_8;
m[3].Name = "DSP RAM";
m[3].Size = 0x5000;
m[3].Size = sizeof(dsp_ram_8);
m[3].Flags = MEMORYAREA_FLAGS_WORDSIZE2 | MEMORYAREA_FLAGS_WRITABLE | MEMORYAREA_FLAGS_YUGEENDIAN;
m[4].Data = TOMGetRamPointer();

2
waterbox/virtualjaguar/src/dsp.cpp
View File

@ -215,7 +215,7 @@ uint32_t dsp_convert_zero[32] = {
uint8_t dsp_branch_condition_table[32 * 8];
static uint16_t mirror_table[65536];
static uint8_t dsp_ram_8[0x2000];
uint8_t dsp_ram_8[0x2000];
#define BRANCH_CONDITION(x) dsp_branch_condition_table[(x) + ((jaguar_flags & 7) << 5)]

2
waterbox/virtualjaguar/src/gpu.cpp
View File

@ -163,7 +163,7 @@ void (*gpu_opcode[64])()=
gpu_opcode_store_r14_ri, gpu_opcode_store_r15_ri, gpu_opcode_sat24, gpu_opcode_pack,
};
static uint8_t gpu_ram_8[0x1000];
uint8_t gpu_ram_8[0x1000];
uint32_t gpu_pc;
static uint32_t gpu_acc;
static uint32_t gpu_remain;