Removed toggling of displaying HMOVE blanks. With the old core, what

it drew in that area was sometimes garbage, and with the new core it
draws nothing at all (which is the correct behaviour).  Hence the
feature is obsolete.
This commit is contained in:
Stephen Anthony 2016-12-06 16:36:04 -03:30
parent 12bdff67b6
commit 072015c82a
8 changed files with 9 additions and 56 deletions

View File

@ -1425,12 +1425,6 @@
<td>Shift-Cmd + n</td>
</tr>
<tr>
<td>Toggle TIA HMOVE blanks</td>
<td>Alt + m</td>
<td>Cmd + m</td>
</tr>
<tr>
<td>Toggle TIA 'Fixed Debug Colors' mode</td>
<td>Alt + Comma</td>

View File

@ -46,9 +46,7 @@ class AbstractTIA: public Device
virtual uInt8* previousFrameBuffer() const = 0;
virtual uInt32 width() const {
return 160;
}
virtual uInt32 width() const { return 160; }
virtual uInt32 height() const = 0;
@ -82,8 +80,6 @@ class AbstractTIA: public Device
virtual bool toggleCollisions() = 0;
virtual bool toggleHMOVEBlank() = 0;
virtual bool toggleFixedColors(uInt8 mode = 2) = 0;
virtual bool driveUnusedPinsRandom(uInt8 mode = 2) = 0;
@ -92,20 +88,18 @@ class AbstractTIA: public Device
virtual void setJitterRecoveryFactor(Int32 f) = 0;
#ifdef DEBUGGER_SUPPORT
#ifdef DEBUGGER_SUPPORT
virtual void updateScanline() = 0;
virtual void updateScanline() = 0;
virtual void updateScanlineByStep() = 0;
virtual void updateScanlineByStep() = 0;
virtual void updateScanlineByTrace(int targetAddress) = 0;
virtual void updateScanlineByTrace(int targetAddress) = 0;
#endif
#endif
protected:
AbstractTIA() {}
};
#endif
#endif

View File

@ -904,15 +904,6 @@ void Console::toggleCollisions() const
myOSystem.frameBuffer().showMessage(message);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void Console::toggleHMOVE() const
{
if(myTIA->toggleHMOVEBlank())
myOSystem.frameBuffer().showMessage("HMOVE blanking enabled");
else
myOSystem.frameBuffer().showMessage("HMOVE blanking disabled");
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void Console::toggleFixedColors() const
{

View File

@ -261,7 +261,6 @@ class Console : public Serializable
void toggleM1Bit() const { toggleTIABit(M1Bit, "M1"); }
void toggleBLBit() const { toggleTIABit(BLBit, "BL"); }
void togglePFBit() const { toggleTIABit(PFBit, "PF"); }
void toggleHMOVE() const;
void toggleBits() const;
/**

View File

@ -395,10 +395,6 @@ void EventHandler::handleKeyEvent(StellaKey key, StellaMod mod, bool state)
myOSystem.console().togglePFBit();
break;
case KBDK_M:
myOSystem.console().toggleHMOVE();
break;
case KBDK_COMMA:
myOSystem.console().toggleFixedColors();
break;

View File

@ -139,9 +139,6 @@ class TIA : public AbstractTIA
bool toggleCollisions() override;
// TODO - remove this completely, as it doesn't work in the new core
bool toggleHMOVEBlank() override { return true; }
bool toggleFixedColors(uInt8 mode = 2) override;
bool driveUnusedPinsRandom(uInt8 mode = 2) override;

View File

@ -111,7 +111,6 @@ void TIA::initialize()
myCurrentHMOVEPos = myPreviousHMOVEPos = 0x7FFFFFFF;
myHMOVEBlankEnabled = false;
myAllowHMOVEBlanks = true;
myTIAPinsDriven = mySettings.getBool("tiadriven");
@ -451,7 +450,6 @@ bool TIA::load(Serializer& in)
// Reset TIA bits to be on
enableBits(true);
toggleFixedColors(0);
myAllowHMOVEBlanks = true;
}
catch(...)
{
@ -830,13 +828,6 @@ bool TIA::toggleCollisions()
return myCollisionsEnabled;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool TIA::toggleHMOVEBlank()
{
myAllowHMOVEBlanks = myAllowHMOVEBlanks ? false : true;
return myAllowHMOVEBlanks;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool TIA::toggleFixedColors(uInt8 mode)
{
@ -2146,8 +2137,7 @@ bool TIA::poke(uInt16 addr, uInt8 value)
myCurrentHMOVEPos = hpos;
// See if we need to enable the HMOVE blank bug
myHMOVEBlankEnabled = myAllowHMOVEBlanks ?
TIATables::HMOVEBlankEnableCycles[((clock - myClockWhenFrameStarted) % 228) / 3] : false;
myHMOVEBlankEnabled = TIATables::HMOVEBlankEnableCycles[((clock - myClockWhenFrameStarted) % 228) / 3];
// Do we have to undo some of the already applied cycles from an
// active graphics latch?
@ -2492,4 +2482,4 @@ inline void TIA::applyPreviousHMOVEMotion(int hpos, Int16& pos, uInt8 motion)
}
}
} // namespace TIADefaultCore
} // namespace TIADefaultCore

View File

@ -286,13 +286,6 @@ class TIA : public AbstractTIA
bool toggleCollision(TIABit b, uInt8 mode = 2) override;
bool toggleCollisions() override;
/**
Toggle the display of HMOVE blanks.
@return Whether the HMOVE blanking was enabled or disabled
*/
bool toggleHMOVEBlank() override;
/**
Enables/disable/toggle 'fixed debug colors' mode.
@ -588,7 +581,6 @@ class TIA : public AbstractTIA
Int32 myCurrentHMOVEPos;
Int32 myPreviousHMOVEPos;
bool myHMOVEBlankEnabled;
bool myAllowHMOVEBlanks;
// Indicates if unused TIA pins are randomly driven high or low
// Otherwise, they take on the value previously on the databus