christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

++coding-style.

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1386 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
adrian
2012-06-27 07:56:41 +00:00
parent 22c5cdbde2
commit 1dd7f40e30
2 changed files with 62 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/sal/Memory.hpp
View File

@ -14,9 +14,8 @@ namespace fail {
* Defines an abstract interface to access the simulated memory pool * Defines an abstract interface to access the simulated memory pool
* and query meta information, e.g. the memory size. * and query meta information, e.g. the memory size.
*/ */
class MemoryManager class MemoryManager {
{ public:
public:
virtual ~MemoryManager() { } virtual ~MemoryManager() { }
/** /**
* Retrieves the size of the available simulated memory. * Retrieves the size of the available simulated memory.

21
src/core/sal/Register.cc
View File

@ -5,13 +5,13 @@ namespace fail {
Register* UniformRegisterSet::getRegister(size_t i) Register* UniformRegisterSet::getRegister(size_t i)
{ {
assert(i < m_Regs.size() && "FATAL ERROR: Invalid index provided!"); assert(i < m_Regs.size() && "FATAL ERROR: Invalid index provided!");
return (m_Regs[i]); return m_Regs[i];
} }
Register* RegisterManager::getRegister(size_t i) Register* RegisterManager::getRegister(size_t i)
{ {
assert(i < m_Registers.size() && "FATAL ERROR: Invalid index provided!"); assert(i < m_Registers.size() && "FATAL ERROR: Invalid index provided!");
return (m_Registers[i]); return m_Registers[i];
} }
void RegisterManager::add(Register* reg) void RegisterManager::add(Register* reg)
@ -20,7 +20,7 @@ void RegisterManager::add(Register* reg)
m_Registers.push_back(reg); m_Registers.push_back(reg);
UniformRegisterSet* urs = getSetOfType(reg->getType()); UniformRegisterSet* urs = getSetOfType(reg->getType());
if(urs == NULL) { if (urs == NULL) {
urs = new UniformRegisterSet(reg->getType()); urs = new UniformRegisterSet(reg->getType());
m_Subsets.push_back(urs); m_Subsets.push_back(urs);
} }
@ -38,29 +38,28 @@ void UniformRegisterSet::m_add(Register* preg)
size_t RegisterManager::count() const size_t RegisterManager::count() const
{ {
return (m_Registers.size()); return m_Registers.size();
} }
UniformRegisterSet& RegisterManager::getSet(size_t i) UniformRegisterSet& RegisterManager::getSet(size_t i)
{ {
assert(i < m_Subsets.size() && "FATAL ERROR: Invalid index provided!"); assert(i < m_Subsets.size() && "FATAL ERROR: Invalid index provided!");
return (*m_Subsets[i]); return *m_Subsets[i];
} }
UniformRegisterSet* RegisterManager::getSetOfType(RegisterType t) UniformRegisterSet* RegisterManager::getSetOfType(RegisterType t)
{ {
for(std::vector< UniformRegisterSet* >::iterator it = m_Subsets.begin(); for (std::vector< UniformRegisterSet* >::iterator it = m_Subsets.begin();
it != m_Subsets.end(); it++) it != m_Subsets.end(); it++) {
{
if((*it)->getType() == t) if((*it)->getType() == t)
return (*it); return *it;
} }
return (NULL); return NULL;
} }
void RegisterManager::clear() void RegisterManager::clear()
{ {
for(std::vector< UniformRegisterSet* >::iterator it = m_Subsets.begin(); for (std::vector< UniformRegisterSet* >::iterator it = m_Subsets.begin();
it != m_Subsets.end(); it++) it != m_Subsets.end(); it++)
delete (*it); delete (*it);
m_Subsets.clear(); m_Subsets.clear();