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

A few more optimizations. It looks to be close to the end of the conversion. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3058 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2014-11-08 23:50:23 +00:00
parent b89dfa7436
commit 4f91fd96ed
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/FSNodeZIP.cxx
View File

@ -156,5 +156,5 @@ uInt32 FilesystemNodeZIP::read(uInt8*& image) const
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
AbstractFSNode* FilesystemNodeZIP::getParent() const AbstractFSNode* FilesystemNodeZIP::getParent() const
{ {
return _realNode ? _realNode->getParent() : 0; return _realNode ? _realNode->getParent() : nullptr;
} }

8
src/common/Stack.hxx
View File

@ -30,14 +30,14 @@
*/ */
namespace Common { namespace Common {
template <class T, int MAX_SIZE = 10> template <class T, int MAX_SIZE = 50>
class FixedStack class FixedStack
{ {
public: public:
FixedStack<T, MAX_SIZE>() : _size(0) {} FixedStack<T, MAX_SIZE>() : _size(0) {}
bool empty() const { return _size <= 0; } bool empty() const { return _size <= 0; }
bool full() const {return _size >= MAX_SIZE; } bool full() const { return _size >= MAX_SIZE; }
void clear() { _size = 0; } void clear() { _size = 0; }
void push(const T& x) void push(const T& x)
{ {
@ -53,10 +53,8 @@ class FixedStack
} }
T pop() T pop()
{ {
T tmp;
assert(_size > 0); assert(_size > 0);
tmp = _stack[--_size]; return std::move(_stack[--_size]);
return tmp;
} }
int size() const { return _size; } int size() const { return _size; }
T operator [](int i) const T operator [](int i) const

3
src/common/bspf.hxx
View File

@ -72,6 +72,7 @@
#include <cstring> #include <cstring>
#include <cctype> #include <cctype>
#include <cstdio> #include <cstdio>
#include <utility>
#include <vector> #include <vector>
using namespace std; using namespace std;
@ -128,7 +129,7 @@ std::unique_ptr<Value> make_ptr(Arguments && ... arguments_for_constructor)
); );
} }
template<typename T> inline void BSPF_swap(T& a, T& b) { T tmp = a; a = b; b = tmp; } template<typename T> inline void BSPF_swap(T& a, T& b) { std::swap(a, b); }
template<typename T> inline T BSPF_abs (T x) { return (x>=0) ? x : -x; } template<typename T> inline T BSPF_abs (T x) { return (x>=0) ? x : -x; }
template<typename T> inline T BSPF_min (T a, T b) { return (a<b) ? a : b; } template<typename T> inline T BSPF_min (T a, T b) { return (a<b) ? a : b; }
template<typename T> inline T BSPF_max (T a, T b) { return (a>b) ? a : b; } template<typename T> inline T BSPF_max (T a, T b) { return (a>b) ? a : b; }

2
src/emucore/FrameBuffer.cxx
View File

@ -737,7 +737,7 @@ void FrameBuffer::setAvailableVidModes(uInt32 baseWidth, uInt32 baseHeight)
for(auto& mode: myFullscreenModeLists) for(auto& mode: myFullscreenModeLists)
mode.clear(); mode.clear();
for(int i = (int)myFullscreenModeLists.size(); i < myDisplays.size(); ++i) for(size_t i = myFullscreenModeLists.size(); i < myDisplays.size(); ++i)
myFullscreenModeLists.push_back(VideoModeList()); myFullscreenModeLists.push_back(VideoModeList());
// Check if zooming is allowed for this state (currently only allowed // Check if zooming is allowed for this state (currently only allowed