mirror of
https://github.com/libretro/bsnes-libretro.git
synced 2024-11-23 08:59:40 +00:00
ae5d380d06
byuu says: Changelog: - fixed nall/path.hpp compilation issue - fixed ruby/audio/xaudio header declaration compilation issue (again) - cleaned up xaudio2.hpp file to match my coding syntax (12.5% of the file was whitespace overkill) - added null terminator entry to nall/windows/utf8.hpp argc[] array - nall/windows/guid.hpp uses the Windows API for generating the GUID - this should stop all the bug reports where two nall users were generating GUIDs at the exact same second - fixed hiro/cocoa compilation issue with uint# types - fixed major higan/sfc Super Game Boy audio latency issue - fixed higan/sfc CPU core bug with pei, [dp], [dp]+y instructions - major cleanups to higan/processor/r65816 core - merged emulation/native-mode opcodes - use camel-case naming on memory.hpp functions - simplify address masking code for memory.hpp functions - simplify a few opcodes themselves (avoid redundant copies, etc) - rename regs.* to r.* to match modern convention of other CPU cores - removed device.order<> concept from Emulator::Interface - cores will now do the translation to make the job of the UI easier - fixed plurality naming of arrays in Emulator::Interface - example: emulator.ports[p].devices[d].inputs[i] - example: vector<Medium> media - probably more surprises Major show-stoppers to the next official release: - we need to work on GB core improvements: LY=153/0 case, multiple STAT IRQs case, GBC audio output regs, etc. - we need to re-add software cursors for light guns (Super Scope, Justifier) - after the above, we need to fix the turbo button for the Super Scope I really have no idea how I want to implement the light guns. Ideally, we'd want it in higan/video, so we can support the NES Zapper with the same code. But this isn't going to be easy, because only the SNES knows when its output is interlaced, and its resolutions can vary as {256,512}x{224,240,448,480} which requires pixel doubling that was hard-coded to the SNES-specific behavior, but isn't appropriate to be exposed in higan/video.
123 lines
3.6 KiB
C++
123 lines
3.6 KiB
C++
#pragma once
|
|
|
|
#include <nall/primitives.hpp>
|
|
#include <nall/serializer.hpp>
|
|
#include <nall/stdint.hpp>
|
|
|
|
namespace nall {
|
|
|
|
struct varint {
|
|
virtual auto read() -> uint8_t = 0;
|
|
virtual auto write(uint8_t) -> void = 0;
|
|
|
|
auto readvu() -> uintmax {
|
|
uintmax data = 0, shift = 1;
|
|
while(true) {
|
|
uint8_t x = read();
|
|
data += (x & 0x7f) * shift;
|
|
if(x & 0x80) break;
|
|
shift <<= 7;
|
|
data += shift;
|
|
}
|
|
return data;
|
|
}
|
|
|
|
auto readvs() -> intmax {
|
|
uintmax data = readvu();
|
|
bool negate = data & 1;
|
|
data >>= 1;
|
|
if(negate) data = ~data;
|
|
return data;
|
|
}
|
|
|
|
auto writevu(uintmax data) -> void {
|
|
while(true) {
|
|
uint8_t x = data & 0x7f;
|
|
data >>= 7;
|
|
if(data == 0) return write(0x80 | x);
|
|
write(x);
|
|
data--;
|
|
}
|
|
}
|
|
|
|
auto writevs(intmax data) -> void {
|
|
bool negate = data < 0;
|
|
if(negate) data = ~data;
|
|
data = (data << 1) | negate;
|
|
writevu(data);
|
|
}
|
|
};
|
|
|
|
struct VariadicNatural {
|
|
inline VariadicNatural() : mask(~0ull) { assign(0); }
|
|
template<typename T> inline VariadicNatural(const T& value) : mask(~0ull) { assign(value); }
|
|
|
|
inline operator uint64_t() const { return data; }
|
|
template<typename T> inline auto& operator=(const T& value) { return assign(value); }
|
|
|
|
inline auto operator++(int) { auto value = data; assign(data + 1); return value; }
|
|
inline auto operator--(int) { auto value = data; assign(data - 1); return value; }
|
|
|
|
inline auto& operator++() { return assign(data + 1); }
|
|
inline auto& operator--() { return assign(data - 1); }
|
|
|
|
inline auto& operator &=(const uint64_t value) { return assign(data & value); }
|
|
inline auto& operator |=(const uint64_t value) { return assign(data | value); }
|
|
inline auto& operator ^=(const uint64_t value) { return assign(data ^ value); }
|
|
inline auto& operator<<=(const uint64_t value) { return assign(data << value); }
|
|
inline auto& operator>>=(const uint64_t value) { return assign(data >> value); }
|
|
inline auto& operator +=(const uint64_t value) { return assign(data + value); }
|
|
inline auto& operator -=(const uint64_t value) { return assign(data - value); }
|
|
inline auto& operator *=(const uint64_t value) { return assign(data * value); }
|
|
inline auto& operator /=(const uint64_t value) { return assign(data / value); }
|
|
inline auto& operator %=(const uint64_t value) { return assign(data % value); }
|
|
|
|
inline auto resize(uint bits) {
|
|
assert(bits <= 64);
|
|
mask = ~0ull >> (64 - bits);
|
|
data &= mask;
|
|
}
|
|
|
|
inline auto serialize(serializer& s) {
|
|
s(data);
|
|
s(mask);
|
|
}
|
|
|
|
struct Reference {
|
|
inline Reference(VariadicNatural& self, uint lo, uint hi) : self(self), Lo(lo), Hi(hi) {}
|
|
|
|
inline operator uint64_t() const {
|
|
const uint64_t RangeBits = Hi - Lo + 1;
|
|
const uint64_t RangeMask = (((1ull << RangeBits) - 1) << Lo) & self.mask;
|
|
return (self & RangeMask) >> Lo;
|
|
}
|
|
|
|
inline auto& operator=(const uint64_t value) {
|
|
const uint64_t RangeBits = Hi - Lo + 1;
|
|
const uint64_t RangeMask = (((1ull << RangeBits) - 1) << Lo) & self.mask;
|
|
self.data = (self.data & ~RangeMask) | ((value << Lo) & RangeMask);
|
|
return *this;
|
|
}
|
|
|
|
private:
|
|
VariadicNatural& self;
|
|
const uint Lo;
|
|
const uint Hi;
|
|
};
|
|
|
|
inline auto bits(uint lo, uint hi) -> Reference { return {*this, lo < hi ? lo : hi, hi > lo ? hi : lo}; }
|
|
inline auto bit(uint index) -> Reference { return {*this, index, index}; }
|
|
inline auto byte(uint index) -> Reference { return {*this, index * 8 + 0, index * 8 + 7}; }
|
|
|
|
private:
|
|
auto assign(uint64_t value) -> VariadicNatural& {
|
|
data = value & mask;
|
|
return *this;
|
|
}
|
|
|
|
uint64_t data;
|
|
uint64_t mask;
|
|
};
|
|
|
|
}
|