mirror of
https://github.com/bsnes-emu/bsnes.git
synced 2025-04-02 10:42:14 -04:00
afa8ea61c5
byuu says:
Changelog:
- gba,ws: removed Thread::step() override¹
- processor/m68k: move.b (a7)+ and move.b (a7)- adjust a7 by two, not
by one²
- tomoko: created new initialize(Video,Audio,Input)Driver() functions³
- ruby/audio: split Audio::information into
Audio::available(Devices,Frequencies,Latencies,Channels)³
- ws: added Model::(WonderSwan,WonderSwanColor,SwanCrystal)()
functions for consistency with other cores
¹: this should hopefully fix GBA Pokemon Pinball. Thanks to
SuperMikeMan for pointing out the underlying cause.
²: this fixes A Ressaha de Ikou, Mega Bomberman, and probably more
games.
³: this is the big change: so there was a problem with WASAPI where
you might change your device under the audio settings panel. And your
new device may not support the frequency that your old device used. This
would end up not updating the frequency, and the pitch would be
distorted.
The old Audio::information() couldn't tell you what frequencies,
latencies, or channels were available for all devices simultaneously, so
I had to split them up. The new initializeAudioDriver() function
validates you have a correct driver, or it defaults to none. Then it
validates a correct device name, or it defaults to the first entry in
the list. Then it validates a correct frequency, or defaults to the
first in the list. Then finally it validates a correct latency, or
defaults to the first in the list.
In this way ... we have a clear path now with no API changes required to
select default devices, frequencies, latencies, channel counts: they
need to be the first items in their respective lists.
So, what we need to do now is go through and for every audio driver that
enumerates devices, we need to make sure the default device gets added
to the top of the list. I'm ... not really sure how to do this with most
drivers, so this is definitely going to take some time.
Also, when you change a device, initializeAudioDriver() is called again,
so if it's a bad device, it will disable the audio driver instead of
continuing to send samples at it and hoping that the driver blocked
those API calls when it failed to initialize properly.
Now then ... since it was a decently-sized API change, it's possible
I've broken compilation of the Linux drivers, so please report any
compilation errors so that I can fix them.
195 lines
4.5 KiB
C++
195 lines
4.5 KiB
C++
template<uint Size> auto M68K::fetch(EffectiveAddress& ea) -> uint32 {
|
|
if(!ea.valid.raise()) return ea.address;
|
|
|
|
switch(ea.mode) {
|
|
|
|
case DataRegisterDirect: {
|
|
return read(DataRegister{ea.reg});
|
|
}
|
|
|
|
case AddressRegisterDirect: {
|
|
return read(AddressRegister{ea.reg});
|
|
}
|
|
|
|
case AddressRegisterIndirect: {
|
|
return read(AddressRegister{ea.reg});
|
|
}
|
|
|
|
case AddressRegisterIndirectWithPostIncrement: {
|
|
return read(AddressRegister{ea.reg});
|
|
}
|
|
|
|
case AddressRegisterIndirectWithPreDecrement: {
|
|
return read(AddressRegister{ea.reg});
|
|
}
|
|
|
|
case AddressRegisterIndirectWithDisplacement: {
|
|
return read(AddressRegister{ea.reg}) + (int16)readPC();
|
|
}
|
|
|
|
case AddressRegisterIndirectWithIndex: {
|
|
auto extension = readPC();
|
|
auto index = extension & 0x8000
|
|
? read(AddressRegister{extension >> 12})
|
|
: read(DataRegister{extension >> 12});
|
|
if(!(extension & 0x800)) index = (int16)index;
|
|
return read(AddressRegister{ea.reg}) + index + (int8)extension;
|
|
}
|
|
|
|
case AbsoluteShortIndirect: {
|
|
return (int16)readPC();
|
|
}
|
|
|
|
case AbsoluteLongIndirect: {
|
|
return readPC<Long>();
|
|
}
|
|
|
|
case ProgramCounterIndirectWithDisplacement: {
|
|
auto base = r.pc;
|
|
return base + (int16)readPC();
|
|
}
|
|
|
|
case ProgramCounterIndirectWithIndex: {
|
|
auto base = r.pc;
|
|
auto extension = readPC();
|
|
auto index = extension & 0x8000
|
|
? read(AddressRegister{extension >> 12})
|
|
: read(DataRegister{extension >> 12});
|
|
if(!(extension & 0x800)) index = (int16)index;
|
|
return base + index + (int8)extension;
|
|
}
|
|
|
|
case Immediate: {
|
|
return readPC<Size>();
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
template<uint Size, bool Hold> auto M68K::read(EffectiveAddress& ea) -> uint32 {
|
|
ea.address = fetch<Size>(ea);
|
|
|
|
switch(ea.mode) {
|
|
|
|
case DataRegisterDirect: {
|
|
return clip<Size>(ea.address);
|
|
}
|
|
|
|
case AddressRegisterDirect: {
|
|
return sign<Size>(ea.address);
|
|
}
|
|
|
|
case AddressRegisterIndirect: {
|
|
return read<Size>(ea.address);
|
|
}
|
|
|
|
case AddressRegisterIndirectWithPostIncrement: {
|
|
auto address = ea.address + (ea.reg == 7 && Size == Byte ? bytes<Word>() : bytes<Size>());
|
|
auto data = read<Size>(ea.address);
|
|
if(!Hold) write(AddressRegister{ea.reg}, ea.address = address);
|
|
return data;
|
|
}
|
|
|
|
case AddressRegisterIndirectWithPreDecrement: {
|
|
auto address = ea.address - (ea.reg == 7 && Size == Byte ? bytes<Word>() : bytes<Size>());
|
|
auto data = read<Size>(address);
|
|
if(!Hold) write(AddressRegister{ea.reg}, ea.address = address);
|
|
return data;
|
|
}
|
|
|
|
case AddressRegisterIndirectWithDisplacement: {
|
|
return read<Size>(ea.address);
|
|
}
|
|
|
|
case AddressRegisterIndirectWithIndex: {
|
|
return read<Size>(ea.address);
|
|
}
|
|
|
|
case AbsoluteShortIndirect: {
|
|
return read<Size>(ea.address);
|
|
}
|
|
|
|
case AbsoluteLongIndirect: {
|
|
return read<Size>(ea.address);
|
|
}
|
|
|
|
case ProgramCounterIndirectWithDisplacement: {
|
|
return read<Size>(ea.address);
|
|
}
|
|
|
|
case ProgramCounterIndirectWithIndex: {
|
|
return read<Size>(ea.address);
|
|
}
|
|
|
|
case Immediate: {
|
|
return clip<Size>(ea.address);
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
template<uint Size, bool Hold> auto M68K::write(EffectiveAddress& ea, uint32 data) -> void {
|
|
ea.address = fetch<Size>(ea);
|
|
|
|
switch(ea.mode) {
|
|
|
|
case DataRegisterDirect: {
|
|
return write<Size>(DataRegister{ea.reg}, data);
|
|
}
|
|
|
|
case AddressRegisterDirect: {
|
|
return write<Size>(AddressRegister{ea.reg}, data);
|
|
}
|
|
|
|
case AddressRegisterIndirect: {
|
|
return write<Size>(ea.address, data);
|
|
}
|
|
|
|
case AddressRegisterIndirectWithPostIncrement: {
|
|
auto address = ea.address + (ea.reg == 7 && Size == Byte ? bytes<Word>() : bytes<Size>());
|
|
write<Size>(ea.address, data);
|
|
if(!Hold) write(AddressRegister{ea.reg}, ea.address = address);
|
|
return;
|
|
}
|
|
|
|
case AddressRegisterIndirectWithPreDecrement: {
|
|
auto address = ea.address - (ea.reg == 7 && Size == Byte ? bytes<Word>() : bytes<Size>());
|
|
write<Size, Reverse>(address, data);
|
|
if(!Hold) write(AddressRegister{ea.reg}, ea.address = address);
|
|
return;
|
|
}
|
|
|
|
case AddressRegisterIndirectWithDisplacement: {
|
|
return write<Size>(ea.address, data);
|
|
}
|
|
|
|
case AddressRegisterIndirectWithIndex: {
|
|
return write<Size>(ea.address, data);
|
|
}
|
|
|
|
case AbsoluteShortIndirect: {
|
|
return write<Size>(ea.address, data);
|
|
}
|
|
|
|
case AbsoluteLongIndirect: {
|
|
return write<Size>(ea.address, data);
|
|
}
|
|
|
|
case ProgramCounterIndirectWithDisplacement: {
|
|
return write<Size>(ea.address, data);
|
|
}
|
|
|
|
case ProgramCounterIndirectWithIndex: {
|
|
return write<Size>(ea.address, data);
|
|
}
|
|
|
|
case Immediate: {
|
|
return;
|
|
}
|
|
|
|
}
|
|
}
|