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

Cleaned up a few more warnings. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3292 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2016-02-27 22:18:30 +00:00
parent 983c6361f2
commit dae8205029
4 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/debugger/CpuDebug.cxx
View File

@ -74,13 +74,13 @@ void CpuDebug::saveOldState()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CpuDebug::setPC(int pc) void CpuDebug::setPC(int pc)
{ {
my6502.PC = pc; my6502.PC = uInt16(pc);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CpuDebug::setSP(int sp) void CpuDebug::setSP(int sp)
{ {
my6502.SP = sp; my6502.SP = uInt8(sp);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -92,19 +92,19 @@ void CpuDebug::setPS(int ps)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CpuDebug::setA(int a) void CpuDebug::setA(int a)
{ {
my6502.A = a; my6502.A = uInt8(a);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CpuDebug::setX(int x) void CpuDebug::setX(int x)
{ {
my6502.X = x; my6502.X = uInt8(x);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CpuDebug::setY(int y) void CpuDebug::setY(int y)
{ {
my6502.Y = y; my6502.Y = uInt8(y);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -120,7 +120,7 @@ void CpuDebug::setV(bool on)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CpuDebug::setB(bool on) void CpuDebug::setB(bool)
{ {
// nop - B is always true // nop - B is always true
} }

9
src/emucore/Device.hxx
View File

@ -112,12 +112,17 @@ class Device : public Serializable
virtual bool poke(uInt16 address, uInt8 value) = 0; virtual bool poke(uInt16 address, uInt8 value) = 0;
/** /**
Query/change the given address type to use the given disassembly flags Query the given address for its disassembly flags
@param address The address to modify @param address The address to modify
@param flags A bitfield of DisasmType directives for the given address
*/ */
virtual uInt8 getAccessFlags(uInt16 address) const { return 0; } virtual uInt8 getAccessFlags(uInt16 address) const { return 0; }
/**
Change the given address type to use the given disassembly flags
@param address The address to modify
@param flags A bitfield of DisasmType directives for the given address
*/
virtual void setAccessFlags(uInt16 address, uInt8 flags) { } virtual void setAccessFlags(uInt16 address, uInt8 flags) { }
protected: protected:

2
src/emucore/TIA.hxx
View File

@ -217,7 +217,7 @@ class TIA : public Device
based on how many frames of out the total count are PAL frames. based on how many frames of out the total count are PAL frames.
*/ */
bool isPAL() const bool isPAL() const
{ return float(myPALFrameCounter) / myFrameCounter >= (25.0/60.0); } { return double(myPALFrameCounter) / myFrameCounter >= (25.0/60.0); }
/** /**
Answers the current color clock we've gotten to on this scanline. Answers the current color clock we've gotten to on this scanline.

8
src/gui/Rect.hxx
View File

@ -34,15 +34,15 @@ namespace GUI {
*/ */
struct Point struct Point
{ {
int x; //!< The horizontal part of the point uInt32 x; //!< The horizontal part of the point
int y; //!< The vertical part of the point uInt32 y; //!< The vertical part of the point
Point() : x(0), y(0) { } Point() : x(0), y(0) { }
Point(const Point& p) : x(p.x), y(p.y) { } Point(const Point& p) : x(p.x), y(p.y) { }
explicit Point(int x1, int y1) : x(x1), y(y1) { } explicit Point(uInt32 x1, uInt32 y1) : x(x1), y(y1) { }
Point(const string& p) { Point(const string& p) {
char c = '\0'; char c = '\0';
x = y = -1; x = y = 0;
istringstream buf(p); istringstream buf(p);
buf >> x >> c >> y; buf >> x >> c >> y;
if(c != 'x') if(c != 'x')