mirror of
https://github.com/bsnes-emu/bsnes.git
synced 2025-02-24 07:02:27 +01:00
67457fade4
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.
77 lines
1.8 KiB
C++
77 lines
1.8 KiB
C++
struct CPU : Processor::ARM, Thread, IO {
|
|
using ARM::read;
|
|
using ARM::write;
|
|
|
|
struct Interrupt {
|
|
enum : uint {
|
|
VBlank = 0x0001,
|
|
HBlank = 0x0002,
|
|
VCoincidence = 0x0004,
|
|
Timer0 = 0x0008,
|
|
Timer1 = 0x0010,
|
|
Timer2 = 0x0020,
|
|
Timer3 = 0x0040,
|
|
Serial = 0x0080,
|
|
DMA0 = 0x0100,
|
|
DMA1 = 0x0200,
|
|
DMA2 = 0x0400,
|
|
DMA3 = 0x0800,
|
|
Keypad = 0x1000,
|
|
Cartridge = 0x2000,
|
|
};
|
|
};
|
|
|
|
#include "registers.hpp"
|
|
#include "prefetch.hpp"
|
|
#include "state.hpp"
|
|
|
|
//cpu.cpp
|
|
CPU();
|
|
~CPU();
|
|
|
|
static auto Enter() -> void;
|
|
auto main() -> void;
|
|
|
|
auto step(uint clocks) -> void override;
|
|
|
|
auto syncStep(uint clocks) -> void;
|
|
auto keypadRun() -> void;
|
|
auto power() -> void;
|
|
|
|
//bus.cpp
|
|
auto _idle() -> void override;
|
|
auto _read(uint mode, uint32 addr) -> uint32 override;
|
|
auto _write(uint mode, uint32 addr, uint32 word) -> void override;
|
|
auto wait(uint mode, uint32 addr) -> uint;
|
|
|
|
//io.cpp
|
|
auto readIO(uint32 addr) -> uint8;
|
|
auto writeIO(uint32 addr, uint8 byte) -> void;
|
|
|
|
auto readIWRAM(uint mode, uint32 addr) -> uint32;
|
|
auto writeIWRAM(uint mode, uint32 addr, uint32 word) -> void;
|
|
|
|
auto readEWRAM(uint mode, uint32 addr) -> uint32;
|
|
auto writeEWRAM(uint mode, uint32 addr, uint32 word) -> void;
|
|
|
|
//dma.cpp
|
|
auto dmaRun() -> void;
|
|
auto dmaExecute(Registers::DMA& dma) -> void;
|
|
auto dmaVblank() -> void;
|
|
auto dmaHblank() -> void;
|
|
auto dmaHDMA() -> void;
|
|
|
|
//timer.cpp
|
|
auto timerStep(uint clocks) -> void;
|
|
auto timerIncrement(uint n) -> void;
|
|
auto timerRunFIFO(uint n) -> void;
|
|
|
|
//serialization.cpp
|
|
auto serialize(serializer&) -> void;
|
|
|
|
uint8* iwram = nullptr;
|
|
uint8* ewram = nullptr;
|
|
};
|
|
|
|
extern CPU cpu;
|