ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NV2A : More PFB logging and PRAMIN read/write stubs

This commit is contained in:
PatrickvL 2017-01-05 14:27:34 +01:00
parent 34722a92e7
commit 7669461eaf
2 changed files with 97 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/CxbxKrnl/EmuNV2A.cpp
View File

@ -77,6 +77,10 @@ struct {
uint32_t regs[0x1000]; uint32_t regs[0x1000];
} pvideo; } pvideo;
struct {
uint32_t regs[0x100000 / sizeof(uint32_t)];
} pramin;
struct { struct {
uint32_t pending_interrupts; uint32_t pending_interrupts;
uint32_t enabled_interrupts; uint32_t enabled_interrupts;
@ -111,12 +115,14 @@ static void update_irq()
else { else {
pmc.pending_interrupts &= ~NV_PMC_INTR_0_PFIFO; pmc.pending_interrupts &= ~NV_PMC_INTR_0_PFIFO;
} }
if (pcrtc.pending_interrupts & pcrtc.enabled_interrupts) { if (pcrtc.pending_interrupts & pcrtc.enabled_interrupts) {
pmc.pending_interrupts |= NV_PMC_INTR_0_PCRTC; pmc.pending_interrupts |= NV_PMC_INTR_0_PCRTC;
} }
else { else {
pmc.pending_interrupts &= ~NV_PMC_INTR_0_PCRTC; pmc.pending_interrupts &= ~NV_PMC_INTR_0_PCRTC;
} }
/* TODO PGRAPH */ /* TODO PGRAPH */
/* /*
if (pgraph.pending_interrupts & pgraph.enabled_interrupts) { if (pgraph.pending_interrupts & pgraph.enabled_interrupts) {
@ -125,18 +131,19 @@ static void update_irq()
else { else {
pmc.pending_interrupts &= ~NV_PMC_INTR_0_PGRAPH; pmc.pending_interrupts &= ~NV_PMC_INTR_0_PGRAPH;
} */ } */
if (pmc.pending_interrupts && pmc.enabled_interrupts) { if (pmc.pending_interrupts && pmc.enabled_interrupts) {
// TODO Raise IRQ // TODO Raise IRQ
EmuWarning("EmuNV2A: update_irq : Raise IRQ Not Implemented"); EmuWarning("EmuNV2A update_irq() : Raise IRQ Not Implemented");
} }
else { else {
// TODO: Cancel IRQ // TODO: Cancel IRQ
EmuWarning("EmuNV2A: update_irq : Cancel IRQ Not Implemented"); EmuWarning("EmuNV2A update_irq() : Cancel IRQ Not Implemented");
} }
} }
#define DEBUG_START(DEV) const char *DebugNV_##DEV##(uint32_t addr) { switch (addr) { #define DEBUG_START(DEV) const char *DebugNV_##DEV##(uint32_t addr) { switch (addr) {
#define CASE(a, c) case a: return #a##c #define CASE(a, c) case a: return #a##c;
#define DEBUG_END(DEV) default: return "Unknown " #DEV " Address"; } } #define DEBUG_END(DEV) default: return "Unknown " #DEV " Address"; } }
DEBUG_START(PMC) DEBUG_START(PMC)
@ -251,9 +258,43 @@ DEBUG_START(PRMVIO)
DEBUG_END(PRMVIO) DEBUG_END(PRMVIO)
DEBUG_START(PFB) DEBUG_START(PFB)
CASE(NV_PFB_CFG0); CASE(NV_PFB_CFG0)
CASE(NV_PFB_CSTATUS); CASE(NV_PFB_CSTATUS)
CASE(NV_PFB_WBC); CASE(NV_PFB_REFCTRL)
CASE(NV_PFB_NVM) // NV_PFB_NVM_MODE_DISABLE
CASE(NV_PFB_PIN)
CASE(NV_PFB_PAD)
CASE(NV_PFB_TIMING0)
CASE(NV_PFB_TIMING1)
CASE(NV_PFB_TIMING2)
CASE(NV_PFB_TILE)
CASE(NV_PFB_TLIMIT)
CASE(NV_PFB_TSIZE)
CASE(NV_PFB_TSTATUS)
CASE(NV_PFB_MRS)
CASE(NV_PFB_EMRS)
CASE(NV_PFB_MRS_EXT)
CASE(NV_PFB_EMRS_EXT)
CASE(NV_PFB_REF)
CASE(NV_PFB_PRE)
CASE(NV_PFB_ZCOMP)
CASE(NV_PFB_ARB_PREDIVIDER)
CASE(NV_PFB_ARB_TIMEOUT)
CASE(NV_PFB_ARB_XFER_REM)
CASE(NV_PFB_ARB_DIFF_BANK)
CASE(NV_PFB_CLOSE_PAGE0)
CASE(NV_PFB_CLOSE_PAGE1)
CASE(NV_PFB_CLOSE_PAGE2)
CASE(NV_PFB_BPARB)
CASE(NV_PFB_CMDQ0)
CASE(NV_PFB_CMDQ1)
CASE(NV_PFB_ILL_INSTR)
CASE(NV_PFB_RT)
CASE(NV_PFB_AUTOCLOSE)
CASE(NV_PFB_WBC)
CASE(NV_PFB_CMDQ_PRT)
CASE(NV_PFB_CPU_RRQ)
CASE(NV_PFB_BYPASS);
DEBUG_END(PFB) DEBUG_END(PFB)
DEBUG_START(PSTRAPS) DEBUG_START(PSTRAPS)
@ -383,7 +424,7 @@ DEBUG_START(USER)
CASE(NV_USER_DMA_PUT); CASE(NV_USER_DMA_PUT);
CASE(NV_USER_DMA_GET); CASE(NV_USER_DMA_GET);
CASE(NV_USER_REF); CASE(NV_USER_REF);
DEBUG_END(USER) DEBUG_END(USER)
#define READ32_START(DEV) uint32_t EmuNV2A_##DEV##_Read32(uint32_t addr) { uint32_t result = 0; switch (addr) { #define READ32_START(DEV) uint32_t EmuNV2A_##DEV##_Read32(uint32_t addr) { uint32_t result = 0; switch (addr) {
@ -440,6 +481,10 @@ WRITE32_END(PBUS)
READ32_START(PFIFO) READ32_START(PFIFO)
case NV_PFIFO_RAMHT:
result = 0x03000100; // = NV_PFIFO_RAMHT_SIZE_4K | NV_PFIFO_RAMHT_BASE_ADDRESS(NumberOfPaddingBytes >> 12) | NV_PFIFO_RAMHT_SEARCH_128
case NV_PFIFO_RAMFC:
result = 0x00890110; // = ? | NV_PFIFO_RAMFC_SIZE_2K | ?
READ32_UNHANDLED(PFIFO) READ32_UNHANDLED(PFIFO)
READ32_END(PFIFO) READ32_END(PFIFO)
@ -559,6 +604,8 @@ WRITE32_END(PRMVIO)
READ32_START(PFB) READ32_START(PFB)
case NV_PFB_CFG0:
result = 3; // = NV_PFB_CFG0_PART_4
default: default:
result = pfb.regs[addr]; result = pfb.regs[addr];
READ32_END(PFB) READ32_END(PFB)
@ -669,11 +716,13 @@ WRITE32_END(PRMDIO)
READ32_START(PRAMIN) READ32_START(PRAMIN)
READ32_UNHANDLED(PRAMIN) default:
result = pramin.regs[addr];
READ32_END(PRAMIN) READ32_END(PRAMIN)
WRITE32_START(PRAMIN) WRITE32_START(PRAMIN)
WRITE32_UNHANDLED(PRAMIN) default:
pramin.regs[addr] = value;
WRITE32_END(PRAMIN) WRITE32_END(PRAMIN)
@ -783,6 +832,11 @@ static const NV2ABlockInfo regions[] = {{
EmuNV2A_PRMDIO_Read32, EmuNV2A_PRMDIO_Read32,
EmuNV2A_PRMDIO_Write32, EmuNV2A_PRMDIO_Write32,
}, { }, {
00710000,
0x100000,
EmuNV2A_PRAMIN_Read32,
EmuNV2A_PRAMIN_Write32,
},{
0x800000, 0x800000,
0x800000, 0x800000,
EmuNV2A_USER_Read32, EmuNV2A_USER_Read32,

34
src/CxbxKrnl/nv2a_int.h
View File

@ -616,8 +616,42 @@
#define NV_PFB_CFG0 0x00000200 #define NV_PFB_CFG0 0x00000200
# define NV_PFB_CFG0_PART 0x00000003 # define NV_PFB_CFG0_PART 0x00000003
#define NV_PFB_CSTATUS 0x0000020C #define NV_PFB_CSTATUS 0x0000020C
#define NV_PFB_REFCTRL 0x00000210
#define NV_PFB_NVM 0x00000214 // NV_PFB_NVM_MODE_DISABLE
#define NV_PFB_PIN 0x00000218
#define NV_PFB_PAD 0x0000021C
#define NV_PFB_TIMING0 0x00000220
#define NV_PFB_TIMING1 0x00000224
#define NV_PFB_TIMING2 0x00000228
#define NV_PFB_TILE 0x00000240
#define NV_PFB_TLIMIT 0x00000244
#define NV_PFB_TSIZE 0x00000248
#define NV_PFB_TSTATUS 0x0000024C
#define NV_PFB_MRS 0x000002C0
#define NV_PFB_EMRS 0x000002C4
#define NV_PFB_MRS_EXT 0x000002C8
#define NV_PFB_EMRS_EXT 0x000002CC
#define NV_PFB_REF 0x000002D0
#define NV_PFB_PRE 0x000002D4
#define NV_PFB_ZCOMP 0x00000300
#define NV_PFB_ARB_PREDIVIDER 0x00000328
#define NV_PFB_ARB_TIMEOUT 0x0000032C
#define NV_PFB_ARB_XFER_REM 0x00000334
#define NV_PFB_ARB_DIFF_BANK 0x00000338
#define NV_PFB_CLOSE_PAGE0 0x00000340
#define NV_PFB_CLOSE_PAGE1 0x00000344
#define NV_PFB_CLOSE_PAGE2 0x00000348
#define NV_PFB_BPARB 0x0000034C
#define NV_PFB_CMDQ0 0x00000350
#define NV_PFB_CMDQ1 0x00000354
#define NV_PFB_ILL_INSTR 0x00000360
#define NV_PFB_RT 0x00000400
#define NV_PFB_AUTOCLOSE 0x00000404
#define NV_PFB_WBC 0x00000410 #define NV_PFB_WBC 0x00000410
# define NV_PFB_WBC_FLUSH (1 << 16) # define NV_PFB_WBC_FLUSH (1 << 16)
#define NV_PFB_CMDQ_PRT 0x00000418
#define NV_PFB_CPU_RRQ 0x00000420
#define NV_PFB_BYPASS 0x00000424
#define NV_PRAMDAC_NVPLL_COEFF 0x00000500 #define NV_PRAMDAC_NVPLL_COEFF 0x00000500