add ROM memorydomain to n64

This commit is contained in:
zeromus 2014-09-14 18:39:26 +00:00
parent 81e1cfe549
commit ed4c715a9f
6 changed files with 16 additions and 3 deletions

View File

@ -81,6 +81,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
//zero 07-sep-2014 - made RDRAM big endian domain, but none others. others need to be studied individually. //zero 07-sep-2014 - made RDRAM big endian domain, but none others. others need to be studied individually.
MakeMemoryDomain("RDRAM", mupen64plusApi.N64_MEMORY.RDRAM, MemoryDomain.Endian.Big, true); MakeMemoryDomain("RDRAM", mupen64plusApi.N64_MEMORY.RDRAM, MemoryDomain.Endian.Big, true);
MakeMemoryDomain("ROM", mupen64plusApi.N64_MEMORY.THE_ROM, MemoryDomain.Endian.Big, true);
MakeMemoryDomain("PI Register", mupen64plusApi.N64_MEMORY.PI_REG, MemoryDomain.Endian.Little); MakeMemoryDomain("PI Register", mupen64plusApi.N64_MEMORY.PI_REG, MemoryDomain.Endian.Little);
MakeMemoryDomain("SI Register", mupen64plusApi.N64_MEMORY.SI_REG, MemoryDomain.Endian.Little); MakeMemoryDomain("SI Register", mupen64plusApi.N64_MEMORY.SI_REG, MemoryDomain.Endian.Little);
MakeMemoryDomain("VI Register", mupen64plusApi.N64_MEMORY.VI_REG, MemoryDomain.Endian.Little); MakeMemoryDomain("VI Register", mupen64plusApi.N64_MEMORY.VI_REG, MemoryDomain.Endian.Little);

View File

@ -112,7 +112,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi
MEMPAK1, MEMPAK1,
MEMPAK2, MEMPAK2,
MEMPAK3, MEMPAK3,
MEMPAK4 MEMPAK4,
THE_ROM
} }
// Core Specifc functions // Core Specifc functions

View File

@ -93,7 +93,6 @@
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile> </ClCompile>
@ -105,6 +104,7 @@
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<AdditionalOptions>/PDBALTPATH:%_PDB%.%_EXT% %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command> <Command>

View File

@ -38,6 +38,7 @@
#include "debugger/debugger.h" #include "debugger/debugger.h"
#include "memory/memory.h" #include "memory/memory.h"
#include "r4300/r4300.h" #include "r4300/r4300.h"
#include "main/rom.h"
extern unsigned int op; /* this is in r4300/pure_interp.c */ extern unsigned int op; /* this is in r4300/pure_interp.c */
@ -231,6 +232,9 @@ EXPORT void * CALL DebugMemGetPointer(m64p_dbg_memptr_type mem_ptr_type)
return mempack[2]; return mempack[2];
case MEMPAK4: case MEMPAK4:
return mempack[3]; return mempack[3];
case THE_ROM:
return rom;
default: default:
DebugMessage(M64MSG_ERROR, "Bug: DebugMemGetPointer() called with invalid m64p_dbg_memptr_type"); DebugMessage(M64MSG_ERROR, "Bug: DebugMemGetPointer() called with invalid m64p_dbg_memptr_type");
return NULL; return NULL;
@ -264,6 +268,9 @@ EXPORT int CALL MemGetSize(m64p_dbg_memptr_type mem_ptr_type)
return 0x8000; return 0x8000;
case MEMPAK4: case MEMPAK4:
return 0x8000; return 0x8000;
case THE_ROM:
return rom_size;
default: default:
DebugMessage(M64MSG_ERROR, "Bug: MemGetSize() called with invalid m64p_dbg_memptr_type"); DebugMessage(M64MSG_ERROR, "Bug: MemGetSize() called with invalid m64p_dbg_memptr_type");
return NULL; return NULL;

View File

@ -269,7 +269,9 @@ typedef enum {
MEMPAK1, MEMPAK1,
MEMPAK2, MEMPAK2,
MEMPAK3, MEMPAK3,
MEMPAK4 MEMPAK4,
THE_ROM,
} m64p_dbg_memptr_type; } m64p_dbg_memptr_type;
typedef enum { typedef enum {

Binary file not shown.