dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r26171) -Codechange: Make TemporaryStorageArray keep track of assigned registers. Also make clearing the array 'cheaper'.

Browse Source
This commit is contained in:
frosch
2013-12-23 18:07:57 +00:00
parent 8860bb5c8d
commit 71e2ca5822
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/newgrf_storage.h
View File

@@ -135,11 +135,15 @@ struct PersistentStorageArray : BaseStorageArray {
template <typename TYPE, uint SIZE> template <typename TYPE, uint SIZE>
struct TemporaryStorageArray : BaseStorageArray { struct TemporaryStorageArray : BaseStorageArray {
TYPE storage[SIZE]; ///< Memory to for the storage array TYPE storage[SIZE]; ///< Memory to for the storage array
uint16 init[SIZE]; ///< Storage has been assigned, if this equals 'init_key'.
uint16 init_key; ///< Magic key to 'init'.
/** Simply construct the array */ /** Simply construct the array */
TemporaryStorageArray() TemporaryStorageArray()
{ {
memset(this->storage, 0, sizeof(this->storage)); memset(this->storage, 0, sizeof(this->storage)); // not exactly needed, but makes code analysers happy
memset(this->init, 0, sizeof(this->init));
this->init_key = 1;
} }
/** /**
@@ -153,6 +157,7 @@ struct TemporaryStorageArray : BaseStorageArray {
if (pos >= SIZE) return; if (pos >= SIZE) return;
this->storage[pos] = value; this->storage[pos] = value;
this->init[pos] = this->init_key;
AddChangedStorage(this); AddChangedStorage(this);
} }
@@ -166,12 +171,23 @@ struct TemporaryStorageArray : BaseStorageArray {
/* Out of the scope of the array */ /* Out of the scope of the array */
if (pos >= SIZE) return 0; if (pos >= SIZE) return 0;
if (this->init[pos] != this->init_key) {
/* Unassigned since last call to ClearChanges */
return 0;
}
return this->storage[pos]; return this->storage[pos];
} }
void ClearChanges(bool keep_changes) void ClearChanges(bool keep_changes)
{ {
memset(this->storage, 0, sizeof(this->storage)); /* Increment init_key to invalidate all storage */
this->init_key++;
if (this->init_key == 0) {
/* When init_key wraps around, we need to reset everything */
memset(this->init, 0, sizeof(this->init));
this->init_key = 1;
}
} }
}; };