Update to v100r14 release.
byuu says:
(Windows: compile with -fpermissive to silence an annoying error. I'll
fix it in the next WIP.)
I completely replaced the time management system in higan and overhauled
the scheduler.
Before, processor threads would have "int64 clock"; and there would
be a 1:1 relationship between two threads. When thread A ran for X
cycles, it'd subtract X * B.Frequency from clock; and when thread B ran
for Y cycles, it'd add Y * A.Frequency from clock. This worked well
and allowed perfect precision; but it doesn't work when you have more
complicated relationships: eg the 68K can sync to the Z80 and PSG; the
Z80 to the 68K and PSG; so the PSG needs two counters.
The new system instead uses a "uint64 clock" variable that represents
time in attoseconds. Every time the scheduler exits, it subtracts
the smallest clock count from all threads, to prevent an overflow
scenario. The only real downside is that rounding errors mean that
roughly every 20 minutes, we have a rounding error of one clock cycle
(one 20,000,000th of a second.) However, this only applies to systems
with multiple oscillators, like the SNES. And when you're in that
situation ... there's no such thing as a perfect oscillator anyway. A
real SNES will be thousands of times less out of spec than 1hz per 20
minutes.
The advantages are pretty immense. First, we obviously can now support
more complex relationships between threads. Second, we can build a
much more abstracted scheduler. All of libco is now abstracted away
completely, which may permit a state-machine / coroutine version of
Thread in the future. We've basically gone from this:
auto SMP::step(uint clocks) -> void {
clock += clocks * (uint64)cpu.frequency;
dsp.clock -= clocks;
if(dsp.clock < 0 && !scheduler.synchronizing()) co_switch(dsp.thread);
if(clock >= 0 && !scheduler.synchronizing()) co_switch(cpu.thread);
}
To this:
auto SMP::step(uint clocks) -> void {
Thread::step(clocks);
synchronize(dsp);
synchronize(cpu);
}
As you can see, we don't have to do multiple clock adjustments anymore.
This is a huge win for the SNES CPU that had to update the SMP, DSP, all
peripherals and all coprocessors. Likewise, we don't have to synchronize
all coprocessors when one runs, now we can just synchronize the active
one to the CPU.
Third, when changing the frequencies of threads (think SGB speed setting
modes, GBC double-speed mode, etc), it no longer causes the "int64
clock" value to be erroneous.
Fourth, this results in a fairly decent speedup, mostly across the
board. Aside from the GBA being mostly a wash (for unknown reasons),
it's about an 8% - 12% speedup in every other emulation core.
Now, all of this said ... this was an unbelievably massive change, so
... you know what that means >_> If anyone can help test all types of
SNES coprocessors, and some other system games, it'd be appreciated.
----
Lastly, we have a bitchin' new about screen. It unfortunately adds
~200KiB onto the binary size, because the PNG->C++ header file
transformation doesn't compress very well, and I want to keep the
original resource files in with the higan archive. I might try some
things to work around this file size increase in the future, but for now
... yeah, slightly larger archive sizes, sorry.
The logo's a bit busted on Windows (the Label control's background
transparency and alignment settings aren't working), but works well on
GTK. I'll have to fix Windows before the next official release. For now,
look on my Twitter feed if you want to see what it's supposed to look
like.
----
EDIT: forgot about ICD2::Enter. It's doing some weird inverse
run-to-save thing that I need to implement support for somehow. So, save
states on the SGB core probably won't work with this WIP.
2016-07-30 03:56:12 +00:00
|
|
|
struct SA1 : Processor::R65816, Thread {
|
2016-06-05 05:03:21 +00:00
|
|
|
//sa1.cpp
|
2015-11-14 00:52:51 +00:00
|
|
|
static auto Enter() -> void;
|
2016-02-09 11:51:12 +00:00
|
|
|
auto main() -> void;
|
2015-11-14 00:52:51 +00:00
|
|
|
auto tick() -> void;
|
2016-07-17 03:24:28 +00:00
|
|
|
auto interrupt() -> void override;
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2016-06-05 05:03:21 +00:00
|
|
|
alwaysinline auto triggerIRQ() -> void;
|
2016-03-26 01:56:15 +00:00
|
|
|
alwaysinline auto lastCycle() -> void override;
|
|
|
|
|
alwaysinline auto interruptPending() const -> bool override;
|
Update to v102r21 release.
byuu says:
Changelog:
- GBA: fixed WININ2 reads, BG3PB writes [Jonas Quinn]
- R65816: added support for yielding/resuming from WAI/STP¹
- SFC: removed status.dmaCounter functionality (also fixes possible
TAS desync issue)
- tomoko: added support for combinatorial inputs [hex\_usr\]²
- nall: fixed missing return value from Arithmetic::operator--
[Hendricks266]
Now would be the time to start looking for major regressions with the
new GBA PPU renderer, I suppose ...
¹: this doesn't matter for the master thread (SNES CPU), but is
important for slave threads (SNES SA1). If you try to save a state and
the SA1 is inside of a WAI instruction, it will get stuck there forever.
This was causing attempts to create a save state in Super Bomberman
- Panic Bomber W to deadlock the emulator and crash it. This is now
finally fixed.
Note that I still need to implement similar functionality into the Mega
Drive 68K and Z80 cores. They still have the possibility of deadlocking.
The SNES implementation was more a dry-run test for this new
functionality. This possible crashing bug in the Mega Drive core is the
major blocking bug for a new official release.
²: many, many thanks to hex\_usr for coming up with a really nice
design. I mostly implemented it the exact same way, but with a few tiny
differences that don't really matter (display " and ", " or " instead of
" & ", " | " in the input settings windows; append → bind;
assignmentName changed to displayName.)
The actual functionality is identical to the old higan v094 and earlier
builds. Emulated digital inputs let you combine multiple possible keys
to trigger the buttons. This is OR logic, so you can map to eg
keyboard.up OR gamepad.up for instance. Emulated analog inputs always
sum together. Emulated rumble outputs will cause all mapped devices to
rumble, which is probably not at all useful but whatever. Hotkeys use
AND logic, so you have to press every key mapped to trigger them. Useful
for eg Ctrl+F to trigger fullscreen.
Obviously, there are cases where OR logic would be nice for hotkeys,
too. Eg if you want both F11 and your gamepad's guide button to trigger
the fullscreen toggle. Unfortunately, this isn't supported, and likely
won't ever be in tomoko. Something I might consider is a throw switch in
the configuration file to swap between AND or OR logic for hotkeys, but
I'm not going to allow construction of mappings like "(Keyboard.Ctrl and
Keyboard.F) or Gamepad.Guide", as that's just too complicated to code,
and too complicated to make a nice GUI to set up the mappings for.
2017-06-06 13:44:40 +00:00
|
|
|
auto synchronizing() const -> bool override;
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2015-11-14 00:52:51 +00:00
|
|
|
auto init() -> void;
|
|
|
|
|
auto load() -> void;
|
|
|
|
|
auto unload() -> void;
|
|
|
|
|
auto power() -> void;
|
2010-08-09 13:28:56 +00:00
|
|
|
|
2016-06-05 05:03:21 +00:00
|
|
|
//bus.cpp
|
|
|
|
|
struct CPUIRAM : Memory {
|
|
|
|
|
auto size() const -> uint;
|
|
|
|
|
alwaysinline auto read(uint24, uint8 = 0) -> uint8;
|
|
|
|
|
alwaysinline auto write(uint24, uint8) -> void;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct CPUBWRAM : Memory {
|
|
|
|
|
auto size() const -> uint;
|
|
|
|
|
alwaysinline auto read(uint24, uint8 = 0) -> uint8;
|
|
|
|
|
alwaysinline auto write(uint24, uint8) -> void;
|
|
|
|
|
bool dma;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
//dma.cpp
|
|
|
|
|
struct DMA {
|
|
|
|
|
enum CDEN : uint { DmaNormal = 0, DmaCharConversion = 1 };
|
|
|
|
|
enum SD : uint { SourceROM = 0, SourceBWRAM = 1, SourceIRAM = 2 };
|
|
|
|
|
enum DD : uint { DestIRAM = 0, DestBWRAM = 1 };
|
|
|
|
|
uint line;
|
|
|
|
|
};
|
|
|
|
|
|
2016-06-17 13:03:54 +00:00
|
|
|
auto dmaNormal() -> void;
|
|
|
|
|
auto dmaCC1() -> void;
|
|
|
|
|
auto dmaCC1Read(uint addr) -> uint8;
|
|
|
|
|
auto dmaCC2() -> void;
|
2016-06-05 05:03:21 +00:00
|
|
|
|
|
|
|
|
//memory.cpp
|
2016-06-17 13:03:54 +00:00
|
|
|
auto busRead(uint24 addr, uint8 data) -> uint8;
|
|
|
|
|
auto busWrite(uint24 addr, uint8 data) -> void;
|
|
|
|
|
auto vbrRead(uint24 addr, uint8 data = 0) -> uint8;
|
2016-06-05 05:03:21 +00:00
|
|
|
|
Update to v099r14 release.
byuu says:
Changelog:
- (u)int(max,ptr) abbreviations removed; use _t suffix now [didn't feel
like they were contributing enough to be worth it]
- cleaned up nall::integer,natural,real functionality
- toInteger, toNatural, toReal for parsing strings to numbers
- fromInteger, fromNatural, fromReal for creating strings from numbers
- (string,Markup::Node,SQL-based-classes)::(integer,natural,real)
left unchanged
- template<typename T> numeral(T value, long padding, char padchar)
-> string for print() formatting
- deduces integer,natural,real based on T ... cast the value if you
want to override
- there still exists binary,octal,hex,pointer for explicit print()
formatting
- lstring -> string_vector [but using lstring = string_vector; is
declared]
- would be nice to remove the using lstring eventually ... but that'd
probably require 10,000 lines of changes >_>
- format -> string_format [no using here; format was too ambiguous]
- using integer = Integer<sizeof(int)*8>; and using natural =
Natural<sizeof(uint)*8>; declared
- for consistency with boolean. These three are meant for creating
zero-initialized values implicitly (various uses)
- R65816::io() -> idle() and SPC700::io() -> idle() [more clear; frees
up struct IO {} io; naming]
- SFC CPU, PPU, SMP use struct IO {} io; over struct (Status,Registers) {}
(status,registers); now
- still some CPU::Status status values ... they didn't really fit into
IO functionality ... will have to think about this more
- SFC CPU, PPU, SMP now use step() exclusively instead of addClocks()
calling into step()
- SFC CPU joypad1_bits, joypad2_bits were unused; killed them
- SFC PPU CGRAM moved into PPU::Screen; since nothing else uses it
- SFC PPU OAM moved into PPU::Object; since nothing else uses it
- the raw uint8[544] array is gone. OAM::read() constructs values from
the OAM::Object[512] table now
- this avoids having to determine how we want to sub-divide the two
OAM memory sections
- this also eliminates the OAM::synchronize() functionality
- probably more I'm forgetting
The FPS fluctuations are driving me insane. This WIP went from 128fps to
137fps. Settled on 133.5fps for the final build. But nothing I changed
should have affected performance at all. This level of fluctuation makes
it damn near impossible to know whether I'm speeding things up or slowing
things down with changes.
2016-07-01 11:50:32 +00:00
|
|
|
alwaysinline auto idle() -> void override;
|
2016-06-05 05:03:21 +00:00
|
|
|
alwaysinline auto read(uint24 addr) -> uint8 override;
|
|
|
|
|
alwaysinline auto write(uint24 addr, uint8 data) -> void override;
|
|
|
|
|
|
2016-06-17 13:03:54 +00:00
|
|
|
auto mmcromRead(uint24 addr, uint8 data) -> uint8;
|
|
|
|
|
auto mmcromWrite(uint24 addr, uint8 data) -> void;
|
2016-06-05 05:03:21 +00:00
|
|
|
|
2016-06-17 13:03:54 +00:00
|
|
|
auto mmcbwramRead(uint24 addr, uint8 data) -> uint8;
|
|
|
|
|
auto mmcbwramWrite(uint24 addr, uint8 data) -> void;
|
2016-06-05 05:03:21 +00:00
|
|
|
|
2016-06-17 13:03:54 +00:00
|
|
|
auto mmcSA1Read(uint addr, uint8 data) -> uint8;
|
|
|
|
|
auto mmcSA1Write(uint addr, uint8 data) -> void;
|
2016-06-05 05:03:21 +00:00
|
|
|
|
2016-06-17 13:03:54 +00:00
|
|
|
auto bitmapRead(uint addr, uint8 data) -> uint8;
|
|
|
|
|
auto bitmapWrite(uint addr, uint8 data) -> void;
|
2016-06-05 05:03:21 +00:00
|
|
|
|
Update to v099r13 release.
byuu says:
Changelog:
- GB core code cleanup completed
- GBA core code cleanup completed
- some more cleanup on missed processor/arm functions/variables
- fixed FC loading icarus bug
- "Load ROM File" icarus functionality restored
- minor code unification efforts all around (not perfect yet)
- MMIO->IO
- mmio.cpp->io.cpp
- read,write->readIO,writeIO
It's been a very long work in progress ... starting all the way back with
v094r09, but the major part of the higan code cleanup is now completed! Of
course, it's very important to note that this is only for the basic style:
- under_score functions and variables are now camelCase
- return-type function-name() are now auto function-name() -> return-type
- Natural<T>/Integer<T> replace (u)intT_n types where possible
- signed/unsigned are now int/uint
- most of the x==true,x==false tests changed to x,!x
A lot of spot improvements to consistency, simplicity and quality have
gone in along the way, of course. But we'll probably never fully finishing
beautifying every last line of code in the entire codebase. Still,
this is a really great start. Going forward, WIP diffs should start
being smaller and of higher quality once again.
I know the joke is, "until my coding style changes again", but ... this
was way too stressful, way too time consuming, and way too risky. I'm
too old and tired now for extreme upheavel like this again. The only
major change I'm slowly mulling over would be renaming the using
Natural<T>/Integer<T> = (u)intT; shorthand to something that isn't as
easily confused with the (u)int_t types ... but we'll see. I'll definitely
continue to change small things all the time, but for the larger picture,
I need to just accept the style I have and live with it.
2016-06-29 11:10:28 +00:00
|
|
|
//io.cpp
|
2016-06-05 05:03:21 +00:00
|
|
|
auto readIO(uint24 addr, uint8 data) -> uint8;
|
|
|
|
|
auto writeIO(uint24 addr, uint8 data) -> void;
|
|
|
|
|
|
|
|
|
|
//serialization.cpp
|
2015-11-14 00:52:51 +00:00
|
|
|
auto serialize(serializer&) -> void;
|
|
|
|
|
|
|
|
|
|
MappedRAM rom;
|
|
|
|
|
MappedRAM iram;
|
|
|
|
|
MappedRAM bwram;
|
2016-06-05 05:03:21 +00:00
|
|
|
|
|
|
|
|
CPUIRAM cpuiram;
|
|
|
|
|
CPUBWRAM cpubwram;
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
DMA dma;
|
|
|
|
|
|
|
|
|
|
struct Status {
|
|
|
|
|
uint8 counter;
|
|
|
|
|
|
|
|
|
|
bool interruptPending;
|
|
|
|
|
|
|
|
|
|
uint16 scanlines;
|
|
|
|
|
uint16 vcounter;
|
|
|
|
|
uint16 hcounter;
|
|
|
|
|
} status;
|
|
|
|
|
|
|
|
|
|
struct MMIO {
|
|
|
|
|
//$2200 CCNT
|
|
|
|
|
bool sa1_irq;
|
|
|
|
|
bool sa1_rdyb;
|
|
|
|
|
bool sa1_resb;
|
|
|
|
|
bool sa1_nmi;
|
|
|
|
|
uint8 smeg;
|
|
|
|
|
|
|
|
|
|
//$2201 SIE
|
|
|
|
|
bool cpu_irqen;
|
|
|
|
|
bool chdma_irqen;
|
|
|
|
|
|
|
|
|
|
//$2202 SIC
|
|
|
|
|
bool cpu_irqcl;
|
|
|
|
|
bool chdma_irqcl;
|
|
|
|
|
|
|
|
|
|
//$2203,$2204 CRV
|
|
|
|
|
uint16 crv;
|
|
|
|
|
|
|
|
|
|
//$2205,$2206 CNV
|
|
|
|
|
uint16 cnv;
|
|
|
|
|
|
|
|
|
|
//$2207,$2208 CIV
|
|
|
|
|
uint16 civ;
|
|
|
|
|
|
|
|
|
|
//$2209 SCNT
|
|
|
|
|
bool cpu_irq;
|
|
|
|
|
bool cpu_ivsw;
|
|
|
|
|
bool cpu_nvsw;
|
|
|
|
|
uint8 cmeg;
|
|
|
|
|
|
|
|
|
|
//$220a CIE
|
|
|
|
|
bool sa1_irqen;
|
|
|
|
|
bool timer_irqen;
|
|
|
|
|
bool dma_irqen;
|
|
|
|
|
bool sa1_nmien;
|
|
|
|
|
|
|
|
|
|
//$220b CIC
|
|
|
|
|
bool sa1_irqcl;
|
|
|
|
|
bool timer_irqcl;
|
|
|
|
|
bool dma_irqcl;
|
|
|
|
|
bool sa1_nmicl;
|
|
|
|
|
|
|
|
|
|
//$220c,$220d SNV
|
|
|
|
|
uint16 snv;
|
|
|
|
|
|
|
|
|
|
//$220e,$220f SIV
|
|
|
|
|
uint16 siv;
|
|
|
|
|
|
|
|
|
|
//$2210 TMC
|
|
|
|
|
bool hvselb;
|
|
|
|
|
bool ven;
|
|
|
|
|
bool hen;
|
|
|
|
|
|
|
|
|
|
//$2212,$2213
|
|
|
|
|
uint16 hcnt;
|
|
|
|
|
|
|
|
|
|
//$2214,$2215
|
|
|
|
|
uint16 vcnt;
|
|
|
|
|
|
|
|
|
|
//$2220 CXB
|
|
|
|
|
bool cbmode;
|
|
|
|
|
uint cb;
|
|
|
|
|
|
|
|
|
|
//$2221 DXB
|
|
|
|
|
bool dbmode;
|
|
|
|
|
uint db;
|
|
|
|
|
|
|
|
|
|
//$2222 EXB
|
|
|
|
|
bool ebmode;
|
|
|
|
|
uint eb;
|
|
|
|
|
|
|
|
|
|
//$2223 FXB
|
|
|
|
|
bool fbmode;
|
|
|
|
|
uint fb;
|
|
|
|
|
|
|
|
|
|
//$2224 BMAPS
|
|
|
|
|
uint8 sbm;
|
|
|
|
|
|
|
|
|
|
//$2225 BMAP
|
|
|
|
|
bool sw46;
|
|
|
|
|
uint8 cbm;
|
|
|
|
|
|
|
|
|
|
//$2226 SBWE
|
|
|
|
|
bool swen;
|
|
|
|
|
|
|
|
|
|
//$2227 CBWE
|
|
|
|
|
bool cwen;
|
|
|
|
|
|
|
|
|
|
//$2228 BWPA
|
|
|
|
|
uint8 bwp;
|
|
|
|
|
|
|
|
|
|
//$2229 SIWP
|
|
|
|
|
uint8 siwp;
|
|
|
|
|
|
|
|
|
|
//$222a CIWP
|
|
|
|
|
uint8 ciwp;
|
|
|
|
|
|
|
|
|
|
//$2230 DCNT
|
|
|
|
|
bool dmaen;
|
|
|
|
|
bool dprio;
|
|
|
|
|
bool cden;
|
|
|
|
|
bool cdsel;
|
|
|
|
|
bool dd;
|
|
|
|
|
uint8 sd;
|
|
|
|
|
|
|
|
|
|
//$2231 CDMA
|
|
|
|
|
bool chdend;
|
|
|
|
|
uint8 dmasize;
|
|
|
|
|
uint8 dmacb;
|
|
|
|
|
|
|
|
|
|
//$2232-$2234 SDA
|
|
|
|
|
uint32 dsa;
|
|
|
|
|
|
|
|
|
|
//$2235-$2237 DDA
|
|
|
|
|
uint32 dda;
|
|
|
|
|
|
|
|
|
|
//$2238,$2239 DTC
|
|
|
|
|
uint16 dtc;
|
|
|
|
|
|
|
|
|
|
//$223f BBF
|
|
|
|
|
bool bbf;
|
|
|
|
|
|
|
|
|
|
//$2240-224f BRF
|
|
|
|
|
uint8 brf[16];
|
|
|
|
|
|
|
|
|
|
//$2250 MCNT
|
|
|
|
|
bool acm;
|
|
|
|
|
bool md;
|
|
|
|
|
|
|
|
|
|
//$2251,$2252 MA
|
|
|
|
|
uint16 ma;
|
|
|
|
|
|
|
|
|
|
//$2253,$2254 MB
|
|
|
|
|
uint16 mb;
|
|
|
|
|
|
|
|
|
|
//$2258 VBD
|
|
|
|
|
bool hl;
|
|
|
|
|
uint8 vb;
|
|
|
|
|
|
|
|
|
|
//$2259-$225b VDA
|
|
|
|
|
uint32 va;
|
|
|
|
|
uint8 vbit;
|
|
|
|
|
|
|
|
|
|
//$2300 SFR
|
|
|
|
|
bool cpu_irqfl;
|
|
|
|
|
bool chdma_irqfl;
|
|
|
|
|
|
|
|
|
|
//$2301 CFR
|
|
|
|
|
bool sa1_irqfl;
|
|
|
|
|
bool timer_irqfl;
|
|
|
|
|
bool dma_irqfl;
|
|
|
|
|
bool sa1_nmifl;
|
|
|
|
|
|
|
|
|
|
//$2302,$2303 HCR
|
|
|
|
|
uint16 hcr;
|
|
|
|
|
|
|
|
|
|
//$2304,$2305 VCR
|
|
|
|
|
uint16 vcr;
|
|
|
|
|
|
|
|
|
|
//$2306-230a MR
|
|
|
|
|
uint64 mr;
|
|
|
|
|
|
|
|
|
|
//$230b OF
|
|
|
|
|
bool overflow;
|
|
|
|
|
} mmio;
|
2010-08-09 13:28:56 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
extern SA1 sa1;
|