Remove some unnecessary includes, clean some ////////
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1961 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
parent
1dcd036b9e
commit
8f0ca9998b
|
|
@ -15,19 +15,12 @@
|
|||
// Official SVN repository and contact information can be found at
|
||||
// http://code.google.com/p/dolphin-emu/
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////
|
||||
// File description
|
||||
/*
|
||||
|
||||
All plugins from Core > Plugins are loaded and unloaded with this class when Dolpin is started
|
||||
and stopped.
|
||||
//////////////////////////////////////*/
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////
|
||||
// Includes
|
||||
// -----------
|
||||
#include <string.h>
|
||||
#ifdef _WIN32
|
||||
#include <windows.h>
|
||||
|
|
@ -40,8 +33,6 @@ and stopped.
|
|||
#include "FileUtil.h"
|
||||
#include "StringUtil.h"
|
||||
#include "DynamicLibrary.h"
|
||||
///////////////////////////////////
|
||||
|
||||
|
||||
DynamicLibrary::DynamicLibrary()
|
||||
{
|
||||
|
|
@ -70,18 +61,15 @@ std::string GetLastErrorAsString()
|
|||
}
|
||||
return s;
|
||||
#else
|
||||
static std::string errstr;
|
||||
char *tmp = dlerror();
|
||||
if (tmp)
|
||||
errstr = tmp;
|
||||
|
||||
return errstr;
|
||||
static std::string errstr;
|
||||
char *tmp = dlerror();
|
||||
if (tmp)
|
||||
errstr = tmp;
|
||||
|
||||
return errstr;
|
||||
#endif
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////
|
||||
// Includes
|
||||
// -----------
|
||||
/* Function: Loading means loading the dll with LoadLibrary() to get an instance to the dll.
|
||||
This is done when Dolphin is started to determine which dlls are good, and before opening
|
||||
the Config and Debugging windows from Plugin.cpp and before opening the dll for running
|
||||
|
|
@ -94,7 +82,7 @@ int DynamicLibrary::Load(const char* filename)
|
|||
if (!filename || strlen(filename) == 0)
|
||||
{
|
||||
LOG(MASTER_LOG, "Missing filename of dynamic library to load");
|
||||
PanicAlert("Missing filename of dynamic library to load");
|
||||
PanicAlert("Missing filename of dynamic library to load");
|
||||
return 0;
|
||||
}
|
||||
LOG(MASTER_LOG, "Trying to load library %s", filename);
|
||||
|
|
@ -121,7 +109,6 @@ int DynamicLibrary::Load(const char* filename)
|
|||
return 1;
|
||||
}
|
||||
|
||||
|
||||
int DynamicLibrary::Unload()
|
||||
{
|
||||
int retval;
|
||||
|
|
|
|||
|
|
@ -15,21 +15,12 @@
|
|||
// Official SVN repository and contact information can be found at
|
||||
// http://code.google.com/p/dolphin-emu/
|
||||
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// File description:
|
||||
/* -------------
|
||||
|
||||
/*
|
||||
These functions are primarily used by the interpreter versions of the LoadStore instructions.
|
||||
However, if a JITed instruction (for example lwz) wants to access a bad memory area that call
|
||||
may be redirected here (for example to Read_U32()).
|
||||
*/
|
||||
|
||||
//////////////////////////*/
|
||||
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Includes
|
||||
// ----------------
|
||||
#include "Common.h"
|
||||
#include "MemoryUtil.h"
|
||||
#include "MemArena.h"
|
||||
|
|
|
|||
|
|
@ -15,43 +15,14 @@
|
|||
// Official SVN repository and contact information can be found at
|
||||
// http://code.google.com/p/dolphin-emu/
|
||||
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Includes
|
||||
// ----------------
|
||||
#include "Common.h"
|
||||
#include "MemoryUtil.h"
|
||||
#include "MemArena.h"
|
||||
#include "ChunkFile.h"
|
||||
|
||||
#include "Memmap.h"
|
||||
#include "WII_IOB.h"
|
||||
#include "../Core.h"
|
||||
#include "../PowerPC/PowerPC.h"
|
||||
#include "../PowerPC/Jit64/Jit.h"
|
||||
#include "../PowerPC/Jit64/JitCache.h"
|
||||
#include "CPU.h"
|
||||
#include "PeripheralInterface.h"
|
||||
#include "DSP.h"
|
||||
#include "DVDInterface.h"
|
||||
#include "GPFifo.h"
|
||||
#include "VideoInterface.h"
|
||||
#include "SI.h"
|
||||
#include "EXI.h"
|
||||
#include "PixelEngine.h"
|
||||
#include "CommandProcessor.h"
|
||||
#include "AudioInterface.h"
|
||||
#include "MemoryInterface.h"
|
||||
#include "WII_IOB.h"
|
||||
#include "WII_IPC.h"
|
||||
|
||||
#include "../Debugger/Debugger_BreakPoints.h"
|
||||
#include "../Debugger/Debugger_SymbolMap.h"
|
||||
/////////////////////////////
|
||||
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Declarations and definitions
|
||||
// ----------------
|
||||
namespace Memory
|
||||
{
|
||||
|
||||
|
|
@ -61,7 +32,7 @@ namespace Memory
|
|||
|
||||
// Pointers to low memory
|
||||
extern u8* m_pFakeVMEM;
|
||||
extern u8* m_pEXRAM; //wii
|
||||
extern u8* m_pEXRAM; // Wii
|
||||
extern u8* m_pEFB;
|
||||
|
||||
// Init
|
||||
|
|
@ -89,21 +60,9 @@ extern readFn16 hwReadWii16[NUMHWMEMFUN];
|
|||
extern readFn32 hwReadWii32[NUMHWMEMFUN];
|
||||
extern readFn64 hwReadWii64[NUMHWMEMFUN];
|
||||
|
||||
// ==============
|
||||
|
||||
|
||||
// ===============
|
||||
|
||||
/////////////////////////////
|
||||
|
||||
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Read and write
|
||||
// ----------------
|
||||
|
||||
|
||||
// =================================
|
||||
// The read and write macros that direct us to the right functions
|
||||
// ----------------
|
||||
/* Instructions: To test the TLB functions in F-Zero disable the "&& ((_Address & 0xFE000000)
|
||||
|
|
@ -149,7 +108,7 @@ extern readFn64 hwReadWii64[NUMHWMEMFUN];
|
|||
else \
|
||||
{ \
|
||||
/*if (bFakeVMEM && ((_Address & 0xFE000000) == 0x7e000000) )*/ \
|
||||
/*F-Zero:*/ if (bFakeVMEM) \
|
||||
/*F-Zero:*/ if (bFakeVMEM) \
|
||||
{ \
|
||||
_var = bswap((*(u##_type*)&m_pFakeVMEM[_Address & FAKEVMEM_MASK])); \
|
||||
} \
|
||||
|
|
|
|||
Loading…
Reference in New Issue