iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix crash on Windows + small performace improvement BUT breaks Donkey

Browse Source 
Kong
This commit is contained in:
CocoSimone
2023-02-21 01:29:26 +01:00
parent f113db7059
commit 1c42170810
10 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@@ -1,21 +1,21 @@
# Gadolinium
[![CodeFactor](https://www.codefactor.io/repository/github/cocosimone/Gadolinium/badge/master)](https://www.codefactor.io/repository/github/cocosimone/Gadolinium/overview/master)
[![build](https://github.com/CocoSimone/Gadolinium/actions/workflows/build.yml/badge.svg)](https://github.com/CocoSimone/Gadolinium/actions/workflows/build.yml)
[![CodeFactor](https://www.codefactor.io/repository/github/SimoneN64/Gadolinium/badge/master)](https://www.codefactor.io/repository/github/SimoneN64/Gadolinium/overview/master)
[![build](https://github.com/SimoneN64/Gadolinium/actions/workflows/build.yml/badge.svg)](https://github.com/SimoneN64/Gadolinium/actions/workflows/build.yml)
Rewrite of my Nintendo 64 emulator "[shibumi](https://github.com/CocoSimone/shibumi)".
Rewrite of my Nintendo 64 emulator "[shibumi](https://github.com/SimoneN64/shibumi)".
![Mario's face](resources/mario.png?raw=true)
## Pre-built binaries
| Release |
|---------------------------------------------------------------------------------------------------------------|
| [Windows (Release)](https://nightly.link/CocoSimone/Gadolinium/workflows/build/master/gadolinium-windows.zip) |
| [Linux (Release)](https://nightly.link/CocoSimone/Gadolinium/workflows/build/master/gadolinium-linux.zip) |
| [Windows (Release)](https://nightly.link/SimoneN64/Gadolinium/workflows/build/master/gadolinium-windows.zip) |
| [Linux (Release)](https://nightly.link/SimoneN64/Gadolinium/workflows/build/master/gadolinium-linux.zip) |
## Build instructions:
First clone the repository: `git clone --recursive https://github.com/CocoSimone/Gadolinium`
First clone the repository: `git clone --recursive https://github.com/SimoneN64/Gadolinium`
### Windows

10
src/backend/Core.cpp
View File

@@ -36,8 +36,8 @@ void Core::Run(Window& window, float volumeL, float volumeR) {
MMIO& mmio = cpu->mem.mmio;
for (int field = 0; field < mmio.vi.numFields; field++) {
int frameCycles = 0;
if (!pause && romLoaded) {
int frameCycles = 0;
for (int i = 0; i < mmio.vi.numHalflines; i++) {
mmio.vi.current = (i << 1) + field;
@@ -46,10 +46,8 @@ void Core::Run(Window& window, float volumeL, float volumeR) {
}
int cpuCount = cpu->Run();
cpu->RunRSP(cpuCount);
frameCycles += cpuCount;
mmio.rsp.Run(cpuCount, cpu->regs, cpu->mem);
mmio.ai.Step(cpu->mem, cpu->regs, cpuCount, volumeL, volumeR);
scheduler.tick(cpuCount, cpu->mem, cpu->regs);
}
if ((mmio.vi.current & 0x3FE) == mmio.vi.intr) {
@@ -58,8 +56,8 @@ void Core::Run(Window& window, float volumeL, float volumeR) {
UpdateScreenParallelRdp(*this, window, GetVI());
int missedCycles = N64_CYCLES_PER_FRAME(isPAL) - frameCycles;
mmio.ai.Step(cpu->mem, cpu->regs, missedCycles, volumeL, volumeR);
mmio.ai.Step(cpu->mem, cpu->regs, frameCycles, volumeL, volumeR);
scheduler.tick(frameCycles, cpu->mem, cpu->regs);
} else if (pause && romLoaded) {
UpdateScreenParallelRdp(*this, window, GetVI());
} else if (pause && !romLoaded) {

2
src/backend/MemoryRegions.hpp
View File

@@ -58,6 +58,6 @@ constexpr u64 operator""_gb(unsigned long long int x) {
return 1024_mb * x;
}
#define ADDRESS_RANGE_SIZE 4_gb
#define ADDRESS_RANGE_SIZE 0x80000000ull
#define PAGE_SIZE 4_kb
#define PAGE_COUNT ((ADDRESS_RANGE_SIZE) / (PAGE_SIZE))

3
src/backend/core/BaseCPU.hpp
View File

@@ -6,6 +6,9 @@ struct BaseCPU {
virtual ~BaseCPU() {}
virtual void Reset() {}
virtual int Run() {}
void RunRSP(int cpuCount) {
mem.mmio.rsp.Run(cpuCount, regs, mem);
}
Registers regs;
Mem mem;
};

4
src/backend/core/Interpreter.cpp
View File

@@ -26,8 +26,8 @@ void Interpreter::Reset() {
}
int Interpreter::Run() {
int cycles = 0;
for(; cycles <= mem.mmio.vi.cyclesPerHalfline; cycles++) {
int cycles = 1;
for(; cycles < mem.mmio.vi.cyclesPerHalfline; cycles++) {
CheckCompareInterrupt(mem.mmio.mi, regs);
regs.prevDelaySlot = regs.delaySlot;

14
src/backend/core/Mem.cpp
View File

@@ -8,6 +8,8 @@
namespace n64 {
Mem::Mem() {
cart = (u8*)calloc(CART_SIZE, 1);
sram = (u8*)calloc(SRAM_SIZE, 1);
Reset();
}
@@ -22,16 +24,8 @@ void Mem::Reset() {
writePages[i] = pointer;
}
if(sram) {
free(sram);
}
if(cart) {
free(cart);
}
cart = (u8*)calloc(CART_SIZE, 1);
sram = (u8*)calloc(SRAM_SIZE, 1);
memset(cart, 0, CART_SIZE);
memset(sram, 0, SRAM_SIZE);
mmio.Reset();
}

6
src/backend/core/RDP.cpp
View File

@@ -6,15 +6,13 @@
namespace n64 {
RDP::RDP() {
rdram = (u8*)calloc(RDRAM_SIZE, 1);
Reset();
}
void RDP::Reset() {
dpc.status.raw = 0x80;
if(rdram) {
free(rdram);
}
rdram = (u8*)calloc(RDRAM_SIZE, 1);
memset(rdram, 0, RDRAM_SIZE);
memset(cmd_buf, 0, 0x100000);
}

2
src/backend/core/RDP.hpp
View File

@@ -57,7 +57,7 @@ struct RDP {
RDP();
void Reset();
u8* rdram;
u8* rdram = nullptr;
[[nodiscard]] auto Read(u32 addr) const -> u32;
void Write(MI& mi, Registers& regs, RSP& rsp, u32 addr, u32 val);
void WriteStatus(MI& mi, Registers& regs, RSP& rsp, u32 val);

1
src/common.hpp
View File

@@ -37,3 +37,4 @@ using m128i = __m128i;
#define unlikely(exp) __builtin_expect(exp, 0)
#define likely(exp) __builtin_expect(exp, 1)
#define INLINE static inline __attribute__((always_inline))

2
src/utils/MemoryHelpers.hpp
View File

@@ -7,7 +7,7 @@
namespace Util {
template<typename T>
inline T ReadAccess(u8 *data, u32 index) {
if constexpr (sizeof(T) == 1) {
if constexpr (sizeof(T) == 1) { //
return data[index];
} else if constexpr (sizeof(T) == 2 || sizeof(T) == 4) {
T result = 0;