piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

constification, code style, changed vector<FileInfo*> to vector<FileInfo> for less allocs and more speed in debug mode

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@611 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2008-09-22 20:35:44 +00:00
parent 38f04809f1
commit cca92d4e38
12 changed files with 136 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
Source/Core/DiscIO/Src/FileSystemGCWii.cpp
View File

@ -36,97 +36,69 @@ CFileSystemGCWii::CFileSystemGCWii(const IVolume *_rVolume)
CFileSystemGCWii::~CFileSystemGCWii()
{
while(m_FileInfoVector.size() > 0) {
SFileInfo *sfi = m_FileInfoVector.back();
m_FileInfoVector.pop_back();
delete sfi;
}
}
bool
CFileSystemGCWii::IsInitialized()
bool CFileSystemGCWii::IsInitialized() const
{
return(m_Initialized);
return m_Initialized;
}
size_t
CFileSystemGCWii::GetFileSize(const char* _rFullPath)
size_t CFileSystemGCWii::GetFileSize(const char* _rFullPath) const
{
if (!m_Initialized)
{
return(0);
}
return 0;
const SFileInfo* pFileInfo = FindFileInfo(_rFullPath);
if (pFileInfo != NULL)
{
return(pFileInfo->m_FileSize);
}
return pFileInfo->m_FileSize;
return(0);
return 0;
}
const char*
CFileSystemGCWii::GetFileName(u64 _Address)
const char* CFileSystemGCWii::GetFileName(u64 _Address) const
{
for (size_t i = 0; i < m_FileInfoVector.size(); i++)
{
if ((m_FileInfoVector[i]->m_Offset <= _Address) &&
((m_FileInfoVector[i]->m_Offset + m_FileInfoVector[i]->m_FileSize) > _Address))
if ((m_FileInfoVector[i].m_Offset <= _Address) &&
((m_FileInfoVector[i].m_Offset + m_FileInfoVector[i].m_FileSize) > _Address))
{
return(m_FileInfoVector[i]->m_FullPath);
return m_FileInfoVector[i].m_FullPath;
}
}
return(NULL);
return NULL;
}
size_t
CFileSystemGCWii::ReadFile(const char* _rFullPath, u8* _pBuffer, size_t _MaxBufferSize)
size_t CFileSystemGCWii::ReadFile(const char* _rFullPath, u8* _pBuffer, size_t _MaxBufferSize) const
{
if (!m_Initialized)
{
return(0);
}
return 0;
const SFileInfo* pFileInfo = FindFileInfo(_rFullPath);
if (pFileInfo == NULL)
{
return(0);
}
return 0;
if (pFileInfo->m_FileSize > _MaxBufferSize)
{
return(0);
}
return 0;
m_rVolume->Read(pFileInfo->m_Offset, pFileInfo->m_FileSize, _pBuffer);
return(pFileInfo->m_FileSize);
return pFileInfo->m_FileSize;
}
bool
CFileSystemGCWii::ExportFile(const char* _rFullPath, const char* _rExportFilename)
bool CFileSystemGCWii::ExportFile(const char* _rFullPath, const char* _rExportFilename) const
{
size_t filesize = GetFileSize(_rFullPath);
if (filesize == 0)
{
return(false);
}
return false;
u8* buffer = new u8[filesize];
if (!ReadFile(_rFullPath, buffer, filesize))
{
delete[] buffer;
return(false);
return false;
}
FILE* f = fopen(_rExportFilename, "wb");
@ -136,62 +108,52 @@ CFileSystemGCWii::ExportFile(const char* _rFullPath, const char* _rExportFilenam
fwrite(buffer, filesize, 1, f);
fclose(f);
delete[] buffer;
return(true);
return true;
}
delete[] buffer;
return(false);
return false;
}
bool
CFileSystemGCWii::ExportAllFiles(const char* _rFullPath)
bool CFileSystemGCWii::ExportAllFiles(const char* _rFullPath) const
{
return(false);
return false;
}
u32
CFileSystemGCWii::Read32(u64 _Offset) const
u32 CFileSystemGCWii::Read32(u64 _Offset) const
{
u32 Temp = 0;
m_rVolume->Read(_Offset, 4, (u8*)&Temp);
return(Common::swap32(Temp));
return Common::swap32(Temp);
}
void CFileSystemGCWii::GetStringFromOffset(u64 _Offset, char* Filename) const
{
m_rVolume->Read(_Offset, 255, (u8*)Filename);
}
size_t CFileSystemGCWii::GetFileList(std::vector<SFileInfo *> &_rFilenames)
size_t CFileSystemGCWii::GetFileList(std::vector<const SFileInfo *> &_rFilenames) const
{
if (_rFilenames.size())
PanicAlert("GetFileList : input list has contents?");
_rFilenames.clear();
for (size_t i = 0; i < m_FileInfoVector.size(); i++)
{
_rFilenames.push_back(new SFileInfo(*m_FileInfoVector[i]));
}
_rFilenames.push_back(&m_FileInfoVector[i]);
return m_FileInfoVector.size();
}
const SFileInfo*
CFileSystemGCWii::FindFileInfo(const char* _rFullPath) const
const SFileInfo* CFileSystemGCWii::FindFileInfo(const char* _rFullPath) const
{
for (size_t i = 0; i < m_FileInfoVector.size(); i++)
{
if (!strcasecmp(m_FileInfoVector[i]->m_FullPath, _rFullPath))
{
return(m_FileInfoVector[i]);
}
if (!strcasecmp(m_FileInfoVector[i].m_FullPath, _rFullPath))
return &m_FileInfoVector[i];
}
return(NULL);
return NULL;
}
bool
CFileSystemGCWii::InitFileSystem()
bool CFileSystemGCWii::InitFileSystem()
{
if (Read32(0x18) == 0x5D1C9EA3)
{
@ -203,7 +165,7 @@ CFileSystemGCWii::InitFileSystem()
}
else
{
return(false);
return false;
}
// read the whole FST
@ -225,11 +187,11 @@ CFileSystemGCWii::InitFileSystem()
for (u32 i = 0; i < Root.m_FileSize; i++)
{
SFileInfo *sfi = new SFileInfo();
SFileInfo sfi;
u64 Offset = FSTOffset + (i * 0xC);
sfi->m_NameOffset = Read32(Offset + 0x0);
sfi->m_Offset = (u64)Read32(Offset + 0x4) << m_OffsetShift;
sfi->m_FileSize = Read32(Offset + 0x8);
sfi.m_NameOffset = Read32(Offset + 0x0);
sfi.m_Offset = (u64)Read32(Offset + 0x4) << m_OffsetShift;
sfi.m_FileSize = Read32(Offset + 0x8);
m_FileInfoVector.push_back(sfi);
@ -239,24 +201,23 @@ CFileSystemGCWii::InitFileSystem()
BuildFilenames(1, m_FileInfoVector.size(), NULL, NameTableOffset);
}
return(true);
return true;
}
// __________________________________________________________________________________________________
//
// Changed this stuff from C++ string to C strings for speed in debug mode. Doesn't matter in release, but
// std::string is SLOW in debug mode.
size_t
CFileSystemGCWii::BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, const char* _szDirectory, u64 _NameTableOffset)
size_t CFileSystemGCWii::BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, const char* _szDirectory, u64 _NameTableOffset)
{
size_t CurrentIndex = _FirstIndex;
while (CurrentIndex < _LastIndex)
{
SFileInfo *rFileInfo = m_FileInfoVector[CurrentIndex];
SFileInfo *rFileInfo = &m_FileInfoVector[CurrentIndex];
u64 uOffset = _NameTableOffset + (rFileInfo->m_NameOffset & 0xFFFFFF);
char filename[512];
memset(filename, 0, sizeof(filename));
GetStringFromOffset(uOffset, filename);
// check next index
@ -264,13 +225,9 @@ CFileSystemGCWii::BuildFilenames(const size_t _FirstIndex, const size_t _LastInd
{
// this is a directory, build up the new szDirectory
if (_szDirectory != NULL)
{
CharArrayFromFormat(rFileInfo->m_FullPath, "%s%s\\", _szDirectory, filename);
}
else
{
CharArrayFromFormat(rFileInfo->m_FullPath, "%s\\", filename);
}
CurrentIndex = BuildFilenames(CurrentIndex + 1, rFileInfo->m_FileSize, rFileInfo->m_FullPath, _NameTableOffset);
}
@ -278,19 +235,16 @@ CFileSystemGCWii::BuildFilenames(const size_t _FirstIndex, const size_t _LastInd
{
// this is a filename
if (_szDirectory != NULL)
{
CharArrayFromFormat(rFileInfo->m_FullPath, "%s%s", _szDirectory, filename);
}
else
{
CharArrayFromFormat(rFileInfo->m_FullPath, "%s", filename);
}
CurrentIndex++;
}
}
return(CurrentIndex);
return CurrentIndex;
}
} // namespace

59
Source/Core/DiscIO/Src/FileSystemGCWii.h
View File

@ -24,48 +24,33 @@
namespace DiscIO
{
class CFileSystemGCWii
: public IFileSystem
class CFileSystemGCWii : public IFileSystem
{
public:
CFileSystemGCWii(const IVolume *_rVolume);
virtual ~CFileSystemGCWii();
virtual bool IsInitialized();
virtual size_t GetFileSize(const char* _rFullPath);
virtual const char* GetFileName(u64 _Address);
virtual size_t ReadFile(const char* _rFullPath, u8* _pBuffer, size_t _MaxBufferSize);
virtual bool ExportFile(const char* _rFullPath, const char* _rExportFilename);
virtual bool ExportAllFiles(const char* _rFullPath);
public:
CFileSystemGCWii(const IVolume *_rVolume);
virtual ~CFileSystemGCWii();
virtual bool IsInitialized() const;
virtual size_t GetFileSize(const char* _rFullPath) const;
virtual const char* GetFileName(u64 _Address) const;
virtual size_t ReadFile(const char* _rFullPath, u8* _pBuffer, size_t _MaxBufferSize) const;
virtual bool ExportFile(const char* _rFullPath, const char* _rExportFilename) const;
virtual bool ExportAllFiles(const char* _rFullPath) const;
private:
private:
std::vector <SFileInfo> m_FileInfoVector;
std::vector<SFileInfo *> m_FileInfoVector;
bool m_Initialized;
u32 m_OffsetShift; // WII offsets are all shifted
u32 Read32(u64 _Offset) const;
virtual size_t GetFileList(std::vector<SFileInfo *> &_rFilenames);
void GetStringFromOffset(u64 _Offset, char* Filename) const;
const SFileInfo* FindFileInfo(const char* _rFullPath) const;
bool InitFileSystem();
size_t BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, const char* _szDirectory, u64 _NameTableOffset);
bool m_Initialized;
u32 m_OffsetShift; // WII offsets are all shifted
u32 Read32(u64 _Offset) const;
virtual size_t GetFileList(std::vector<const SFileInfo *> &_rFilenames) const;
void GetStringFromOffset(u64 _Offset, char* Filename) const;
const SFileInfo* FindFileInfo(const char* _rFullPath) const;
bool InitFileSystem();
size_t BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, const char* _szDirectory, u64 _NameTableOffset);
};
} // namespace
#endif

14
Source/Core/DiscIO/Src/Filesystem.cpp
View File

@ -36,15 +36,15 @@ IFileSystem* CreateFileSystem(const IVolume* _rVolume)
{
IFileSystem* pFileSystem = new CFileSystemGCWii(_rVolume);
if (pFileSystem)
if (!pFileSystem)
return 0;
if (!pFileSystem->IsInitialized())
{
if (!pFileSystem->IsInitialized())
{
delete pFileSystem;
pFileSystem = NULL;
}
delete pFileSystem;
pFileSystem = NULL;
}
return(pFileSystem);
return pFileSystem;
}
} // namespace

44
Source/Core/DiscIO/Src/Filesystem.h
View File

@ -31,10 +31,10 @@ struct SFileInfo
u32 m_FileSize;
char m_FullPath[512];
bool IsDirectory() {return((m_NameOffset& 0xFF000000) != 0 ? true : false);}
bool IsDirectory() const { return (m_NameOffset & 0xFF000000) != 0 ? true : false; }
SFileInfo() : m_NameOffset(0), m_Offset(0), m_FileSize(0) {
memset(m_FullPath, 0, 512);
memset(m_FullPath, 0, sizeof(m_FullPath));
}
SFileInfo(const SFileInfo &rhs) : m_NameOffset(rhs.m_NameOffset),
@ -42,39 +42,29 @@ struct SFileInfo
strcpy(m_FullPath, rhs.m_FullPath);
}
};
class IFileSystem
{
public:
public:
IFileSystem(const IVolume *_rVolume);
IFileSystem(const IVolume *_rVolume);
virtual ~IFileSystem();
virtual bool IsInitialized() const = 0;
virtual size_t GetFileList(std::vector<const SFileInfo *> &_rFilenames) const = 0;
virtual size_t GetFileSize(const char* _rFullPath) const = 0;
virtual ~IFileSystem();
virtual size_t ReadFile(const char* _rFullPath, u8* _pBuffer, size_t _MaxBufferSize) const = 0;
virtual bool ExportFile(const char* _rFullPath, const char* _rExportFilename) const = 0;
virtual bool ExportAllFiles(const char* _rFullPath) const = 0;
virtual const char* GetFileName(u64 _Address) const = 0;
virtual bool IsInitialized() = 0;
virtual size_t GetFileList(std::vector<SFileInfo *> &_rFilenames) = 0;
virtual size_t GetFileSize(const char* _rFullPath) = 0;
virtual size_t ReadFile(const char* _rFullPath, u8* _pBuffer, size_t _MaxBufferSize) = 0;
virtual bool ExportFile(const char* _rFullPath, const char* _rExportFilename) = 0;
virtual bool ExportAllFiles(const char* _rFullPath) = 0;
virtual const char* GetFileName(u64 _Address) = 0;
virtual const IVolume *GetVolume() {return(m_rVolume);}
protected:
const IVolume *m_rVolume;
virtual const IVolume *GetVolume() const { return m_rVolume; }
protected:
const IVolume *m_rVolume;
};
IFileSystem* CreateFileSystem(const IVolume *_rVolume);
} // namespace
#endif