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

Project64-core: General Code clean up

This commit is contained in:
zilmar 2022-01-04 10:26:14 +10:30
parent d88ea539b1
commit 7e80d952cb
5 changed files with 82 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64-core/N64System/Interpreter/InterpreterCPU.cpp
View File

@ -287,7 +287,7 @@ void CInterpreterCPU::ExecuteCPU()
continue; continue;
} }
if (CDebugSettings::HaveDebugger()) if (HaveDebugger())
{ {
if (HaveExecutionBP() && g_Debugger->ExecutionBP(PROGRAM_COUNTER)) if (HaveExecutionBP() && g_Debugger->ExecutionBP(PROGRAM_COUNTER))
{ {

16
Source/Project64-core/N64System/Mips/MemoryVirtualMem.h
View File

@ -85,6 +85,7 @@ public:
int32_t MemoryFilter(uint32_t dwExptCode, void * lpExceptionPointer); int32_t MemoryFilter(uint32_t dwExptCode, void * lpExceptionPointer);
void UpdateFieldSerration(uint32_t interlaced); void UpdateFieldSerration(uint32_t interlaced);
#ifndef _WIN32 #ifndef _WIN32
static bool SetupSegvHandler(void); static bool SetupSegvHandler(void);
static void segv_handler(int signal, siginfo_t *siginfo, void *sigcontext); static void segv_handler(int signal, siginfo_t *siginfo, void *sigcontext);
@ -180,36 +181,25 @@ private:
static void DumpArmExceptionInfo(uint32_t MemAddress, mcontext_t & context); static void DumpArmExceptionInfo(uint32_t MemAddress, mcontext_t & context);
static bool FilterArmException(uint32_t MemAddress, mcontext_t & context); static bool FilterArmException(uint32_t MemAddress, mcontext_t & context);
#endif #endif
void UpdateHalfLine();
void FreeMemory();
// Memory locations
static uint8_t * m_Reserve1, *m_Reserve2; static uint8_t * m_Reserve1, *m_Reserve2;
uint8_t * m_RDRAM, *m_DMEM, *m_IMEM; uint8_t * m_RDRAM, *m_DMEM, *m_IMEM;
uint32_t m_AllocatedRdramSize; uint32_t m_AllocatedRdramSize;
// ROM information
bool m_RomMapped; bool m_RomMapped;
uint8_t * m_Rom; uint8_t * m_Rom;
uint32_t m_RomSize; uint32_t m_RomSize;
bool m_RomWrittenTo; bool m_RomWrittenTo;
uint32_t m_RomWroteValue; uint32_t m_RomWroteValue;
// DDRom information
bool m_DDRomMapped; bool m_DDRomMapped;
uint8_t * m_DDRom; uint8_t * m_DDRom;
uint32_t m_DDRomSize; uint32_t m_DDRomSize;
//Current half line
void UpdateHalfLine();
uint32_t m_HalfLine; uint32_t m_HalfLine;
uint32_t m_HalfLineCheck; uint32_t m_HalfLineCheck;
uint32_t m_FieldSerration; uint32_t m_FieldSerration;
// Initializing and resetting information about the memory system
void FreeMemory();
mutable char m_strLabelName[100]; mutable char m_strLabelName[100];
// Big look up table to quickly translate the TLB to real memory addresses
size_t * m_TLB_ReadMap; size_t * m_TLB_ReadMap;
size_t * m_TLB_WriteMap; size_t * m_TLB_WriteMap;

26
Source/Project64-core/N64System/Mips/Register.h
View File

@ -586,6 +586,19 @@ class CRegisters :
public: public:
CRegisters(CN64System * System, CSystemEvents * SystemEvents); CRegisters(CN64System * System, CSystemEvents * SystemEvents);
void CheckInterrupts();
void DoAddressError( bool DelaySlot, uint32_t BadVaddr, bool FromRead );
void DoBreakException( bool DelaySlot );
void DoTrapException( bool DelaySlot );
void DoCopUnusableException( bool DelaySlot, int32_t Coprocessor );
bool DoIntrException( bool DelaySlot );
void DoTLBReadMiss(bool DelaySlot, uint32_t BadVaddr);
void DoTLBWriteMiss(bool DelaySlot, uint32_t BadVaddr);
void DoSysCallException ( bool DelaySlot);
void FixFpuLocations();
void Reset();
void SetAsCurrentSystem();
// General registers // General registers
uint32_t m_PROGRAM_COUNTER; uint32_t m_PROGRAM_COUNTER;
MIPS_DWORD m_GPR[32]; MIPS_DWORD m_GPR[32];
@ -616,19 +629,6 @@ public:
uint32_t m_GfxIntrReg; uint32_t m_GfxIntrReg;
uint32_t m_RspIntrReg; uint32_t m_RspIntrReg;
void CheckInterrupts();
void DoAddressError( bool DelaySlot, uint32_t BadVaddr, bool FromRead );
void DoBreakException( bool DelaySlot );
void DoTrapException( bool DelaySlot );
void DoCopUnusableException( bool DelaySlot, int32_t Coprocessor );
bool DoIntrException( bool DelaySlot );
void DoTLBReadMiss(bool DelaySlot, uint32_t BadVaddr);
void DoTLBWriteMiss(bool DelaySlot, uint32_t BadVaddr);
void DoSysCallException ( bool DelaySlot);
void FixFpuLocations();
void Reset();
void SetAsCurrentSystem();
private: private:
CRegisters(); CRegisters();
CRegisters(const CRegisters&); CRegisters(const CRegisters&);