Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix Super FX voxel demo #241

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions bsnes/Database/Super Famicom.bml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,30 @@ game
size: 0x80000
content: Program

//Prototypes (USA)

database
revision: 2022-03-14

game
sha256: 4362afe51da8a01a67a1c2d6c2545d9e7cbaf8c42fd8f319dd8b61fe328512e1
name: Super FX voxel demo
title: Super FX voxel demo
label: Voxels in progress
region: USA
revision: 1.0
board: GSU-RAM
memory
type: ROM
size: 0x60000
content: Program
memory
type: RAM
size: 0x10000
content: Save
oscillator
frequency: 21440000

//Super Comboy (KOR)

database
Expand Down
7 changes: 5 additions & 2 deletions bsnes/sfc/coprocessor/superfx/memory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,19 @@ auto SuperFX::read(uint addr, uint8 data) -> uint8 {
synchronizeCPU();
if(synchronizing()) break;
}
return rom.read((((addr & 0x3f0000) >> 1) | (addr & 0x7fff)) & romMask);
addr = (((addr & 0x3f0000) >> 1) | (addr & 0x7fff));
addr = Bus::mirror(addr, rom.size());
return rom.read(addr);
}

if((addr & 0xe00000) == 0x400000) { //$40-5f:0000-ffff
addr = Bus::mirror(addr, rom.size());
while(!regs.scmr.ron) {
step(6);
synchronizeCPU();
if(synchronizing()) break;
}
return rom.read(addr & romMask);
return rom.read(addr);
}

if((addr & 0xe00000) == 0x600000) { //$60-7f:0000-ffff
Expand Down