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

Update to v086r03 release. 

byuu says:

Cart unload save path was using the new game rather than the old game.
Caused by trying to allow a failed cartridge load to not unload the
current game.
But that's so uncommon that it's not worth worrying about. It'll always
unload before trying to load a new game now.

Removed the TM/TS disable speedup, to fix Madara 2's text boxes.
This actually did cause a slight performance penalty on games that
disable layers via TM/TS. Zelda 3 inside Link's house is a good example.
It knocked the FPS from 98.5 to 94.5. So to counter that, I removed
conditionals from tiledata loading and decoding, and used fall through
switches.
This boosted us back to 97.0. The -march=native flag apparently works
better with SB now, so that was added, putting us up to 99.0fps.
So it should be the same speed in the worst case, and slightly faster in
the best case.

Bumped the pre-render time to 68 clocks from 60 clocks. Adjusted sprite
tile fetch time from 22 to 14 to compensate.
This should give us perfectly stable Dai Kaijuu Monogatari 2 battles.
This commit is contained in:
Tim Allen 2012-02-18 18:49:52 +11:00
parent 6cfb9e89e7
commit 7a96321e78
8 changed files with 46 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsnes/Makefile
View File

@ -11,7 +11,7 @@ ui := ui
# compiler
c := $(compiler) -std=gnu99
cpp := $(subst cc,++,$(compiler)) -std=gnu++0x
flags := -I. -O3 -fomit-frame-pointer
flags := -I. -march=native -O3 -fomit-frame-pointer
link :=
objects := libco

2
bsnes/base/base.hpp
View File

@ -1,7 +1,7 @@
#ifndef BASE_HPP
#define BASE_HPP
const char Version[] = "086.02";
const char Version[] = "086.03";
#include <nall/platform.hpp>
#include <nall/algorithm.hpp>

2
bsnes/snes/cartridge/cartridge.cpp
View File

@ -34,7 +34,7 @@ void Cartridge::load(Mode cartridge_mode, const char *markup) {
nvram.reset();
parse_markup(markup);
print(markup, "\n\n");
//print(markup, "\n\n");
if(ram_size > 0) {
ram.map(allocate<uint8>(ram_size, 0xff), ram_size);

51
bsnes/snes/ppu/background/background.cpp
View File

@ -127,19 +127,18 @@ void PPU::Background::get_tile() {
if(mirror_y) voffset ^= 7;
offset = (character << (4 + color_depth)) + ((voffset & 7) << 1);
if(regs.mode >= Mode::BPP2) {
data[0] = ppu.vram[offset + 0];
data[1] = ppu.vram[offset + 1];
}
if(regs.mode >= Mode::BPP4) {
data[2] = ppu.vram[offset + 16];
data[3] = ppu.vram[offset + 17];
}
if(regs.mode >= Mode::BPP8) {
data[4] = ppu.vram[offset + 32];
data[5] = ppu.vram[offset + 33];
data[6] = ppu.vram[offset + 48];
switch(regs.mode) {
case Mode::BPP8:
data[7] = ppu.vram[offset + 49];
data[6] = ppu.vram[offset + 48];
data[5] = ppu.vram[offset + 33];
data[4] = ppu.vram[offset + 32];
case Mode::BPP4:
data[3] = ppu.vram[offset + 17];
data[2] = ppu.vram[offset + 16];
case Mode::BPP2:
data[1] = ppu.vram[offset + 1];
data[0] = ppu.vram[offset + 0];
}
if(mirror_x) for(unsigned n = 0; n < 8; n++) {
@ -160,7 +159,6 @@ void PPU::Background::run(bool screen) {
if(hires == false) return;
}
if(regs.main_enable == false && regs.sub_enable == false) return;
if(regs.mode == Mode::Inactive) return;
if(regs.mode == Mode::Mode7) return run_mode7();
@ -186,20 +184,21 @@ void PPU::Background::run(bool screen) {
unsigned PPU::Background::get_tile_color() {
unsigned color = 0;
if(regs.mode >= Mode::BPP2) {
color += (data[0] & 0x80) ? 0x01 : 0; data[0] <<= 1;
color += (data[1] & 0x80) ? 0x02 : 0; data[1] <<= 1;
}
if(regs.mode >= Mode::BPP4) {
color += (data[2] & 0x80) ? 0x04 : 0; data[2] <<= 1;
color += (data[3] & 0x80) ? 0x08 : 0; data[3] <<= 1;
}
if(regs.mode >= Mode::BPP8) {
color += (data[4] & 0x80) ? 0x10 : 0; data[4] <<= 1;
color += (data[5] & 0x80) ? 0x20 : 0; data[5] <<= 1;
color += (data[6] & 0x80) ? 0x40 : 0; data[6] <<= 1;
color += (data[7] & 0x80) ? 0x80 : 0; data[7] <<= 1;
switch(regs.mode) {
case Mode::BPP8:
color += (data[7] >> 0) & 0x80; data[7] <<= 1;
color += (data[6] >> 1) & 0x40; data[6] <<= 1;
color += (data[5] >> 2) & 0x20; data[5] <<= 1;
color += (data[4] >> 3) & 0x10; data[4] <<= 1;
case Mode::BPP4:
color += (data[3] >> 4) & 0x08; data[3] <<= 1;
color += (data[2] >> 5) & 0x04; data[2] <<= 1;
case Mode::BPP2:
color += (data[1] >> 6) & 0x02; data[1] <<= 1;
color += (data[0] >> 7) & 0x01; data[0] <<= 1;
}
return color;
}

8
bsnes/snes/ppu/ppu.cpp
View File

@ -33,7 +33,7 @@ void PPU::enter() {
}
scanline();
add_clocks(60);
add_clocks(68);
bg1.begin();
bg2.begin();
bg3.begin();
@ -59,13 +59,13 @@ void PPU::enter() {
add_clocks(2);
}
add_clocks(22);
add_clocks(14);
sprite.tilefetch();
} else {
add_clocks(1052 + 22 + 136);
add_clocks(1052 + 14 + 136);
}
add_clocks(lineclocks() - 60 - 1052 - 22 - 136);
add_clocks(lineclocks() - 68 - 1052 - 14 - 136);
}
}

3
bsnes/ui/interface/gameboy/gameboy.cpp
View File

@ -8,6 +8,8 @@ bool InterfaceGameBoy::cartridgeLoaded() {
}
bool InterfaceGameBoy::loadCartridge(GameBoy::System::Revision revision, const string &filename) {
interface->unloadCartridge();
uint8_t *data;
unsigned size;
@ -19,7 +21,6 @@ bool InterfaceGameBoy::loadCartridge(GameBoy::System::Revision revision, const s
interface->base = { false, nall::basename(filename) };
}
interface->unloadCartridge();
interface->game = interface->base;
interface->cartridgeTitle = interface->base.title();
interface->applyPatch(interface->base, data, size);

3
bsnes/ui/interface/nes/nes.cpp
View File

@ -23,6 +23,8 @@ bool InterfaceNES::cartridgeLoaded() {
}
bool InterfaceNES::loadCartridge(const string &filename) {
interface->unloadCartridge();
uint8_t *data;
unsigned size;
@ -47,7 +49,6 @@ bool InterfaceNES::loadCartridge(const string &filename) {
interface->base = { false, nall::basename(filename) };
}
interface->unloadCartridge();
interface->game = interface->base;
interface->cartridgeTitle = interface->base.title();
interface->applyPatch(interface->base, data, size);

15
bsnes/ui/interface/snes/snes.cpp
View File

@ -49,11 +49,12 @@ bool InterfaceSNES::loadCartridge(const string &filename, CartridgePath &cartrid
}
bool InterfaceSNES::loadCartridge(string basename) {
interface->unloadCartridge();
uint8_t *data;
unsigned size;
if(loadCartridge(basename, interface->base, data, size) == false) return false;
interface->unloadCartridge();
interface->game = interface->base;
interface->cartridgeTitle = interface->base.title();
@ -74,12 +75,13 @@ bool InterfaceSNES::loadCartridge(string basename) {
}
bool InterfaceSNES::loadSatellaviewSlottedCartridge(string basename, string slotname) {
interface->unloadCartridge();
uint8_t *data[2];
unsigned size[2];
if(loadCartridge(basename, interface->base, data[0], size[0]) == false) return false;
loadCartridge(slotname, interface->slot[0], data[1], size[1]);
interface->unloadCartridge();
interface->game = !data[1] ? interface->base : interface->slot[0]; //TODO: subfolder for folders; concatenation for files
interface->cartridgeTitle = interface->base.title();
if(data[1]) interface->cartridgeTitle.append(" + ", interface->slot[0].title());
@ -103,12 +105,13 @@ bool InterfaceSNES::loadSatellaviewSlottedCartridge(string basename, string slot
}
bool InterfaceSNES::loadSatellaviewCartridge(string basename, string slotname) {
interface->unloadCartridge();
uint8_t *data[2];
unsigned size[2];
if(loadCartridge(basename, interface->base, data[0], size[0]) == false) return false;
loadCartridge(slotname, interface->slot[0], data[1], size[1]);
interface->unloadCartridge();
interface->game = !data[1] ? interface->base : interface->slot[0];
interface->cartridgeTitle = interface->base.title();
if(data[1]) interface->cartridgeTitle = interface->slot[0].title();
@ -132,13 +135,14 @@ bool InterfaceSNES::loadSatellaviewCartridge(string basename, string slotname) {
}
bool InterfaceSNES::loadSufamiTurboCartridge(string basename, string slotAname, string slotBname) {
interface->unloadCartridge();
uint8_t *data[3];
unsigned size[3];
if(loadCartridge(basename, interface->base, data[0], size[0]) == false) return false;
loadCartridge(slotAname, interface->slot[0], data[1], size[1]);
loadCartridge(slotBname, interface->slot[1], data[2], size[2]);
interface->unloadCartridge();
interface->game = !data[1] ? interface->base : interface->slot[0]; //TODO: subfolder for folders; concatenation for files
interface->cartridgeTitle = interface->base.title();
if( data[1] && !data[2]) interface->cartridgeTitle = interface->slot[0].title();
@ -168,12 +172,13 @@ bool InterfaceSNES::loadSufamiTurboCartridge(string basename, string slotAname,
}
bool InterfaceSNES::loadSuperGameBoyCartridge(string basename, string slotname) {
interface->unloadCartridge();
uint8_t *data[2];
unsigned size[2];
if(loadCartridge(basename, interface->base, data[0], size[0]) == false) return false;
loadCartridge(slotname, interface->slot[0], data[1], size[1]);
interface->unloadCartridge();
interface->game = !data[1] ? interface->base : interface->slot[0];
interface->cartridgeTitle = interface->base.title();
if(data[1]) interface->cartridgeTitle = interface->slot[0].title();