Another fix for the RIOT code. Reading SWCHA also depends on the last

value written if SWACNT as been set to output.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1477 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

stella/src/emucore/AtariVox.cxx

@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: AtariVox.cxx,v 1.14 2008-04-13 23:43:14 stephena Exp $
+// $Id: AtariVox.cxx,v 1.15 2008-04-17 13:39:14 stephena Exp $
 //============================================================================
 
 #ifdef SPEAKJET_EMULATION
@@ -109,7 +109,6 @@ void AtariVox::write(DigitalPin pin, bool value)
     // Pin 3: EEPROM SDA
     //        output data to the 24LC256 EEPROM using the I2C protocol
     case Three:
-      // TODO - implement this
       if(DEBUG_ATARIVOX)
         cerr << "AtariVox: value "
              << value
@@ -122,7 +121,6 @@ void AtariVox::write(DigitalPin pin, bool value)
     // Pin 4: EEPROM SCL
     //        output clock data to the 24LC256 EEPROM using the I2C protocol
     case Four:
-      // TODO - implement this
       if(DEBUG_ATARIVOX)
         cerr << "AtariVox: value "
              << value

stella/src/emucore/M6532.cxx

@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: M6532.cxx,v 1.17 2008-04-08 19:17:26 stephena Exp $
+// $Id: M6532.cxx,v 1.18 2008-04-17 13:39:14 stephena Exp $
 //============================================================================
 
 #include <assert.h>
@@ -55,10 +55,10 @@ void M6532::reset()
   myTimer = 25 + (random.next() % 75);
   myIntervalShift = 6;
   myCyclesWhenTimerSet = 0;
-  myCyclesWhenInterruptReset = 0;
   myTimerReadAfterInterrupt = false;
 
   // Zero the I/O registers
+  myOutA = 0x00;
   myDDRA = 0x00;
   myDDRB = 0x00;
 }
@@ -69,7 +69,6 @@ void M6532::systemCyclesReset()
   // System cycles are being reset to zero so we need to adjust
   // the cycle count we remembered when the timer was last set
   myCyclesWhenTimerSet -= mySystem->cycles();
-  myCyclesWhenInterruptReset -= mySystem->cycles();
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -142,7 +141,9 @@ uInt8 M6532::peek(uInt16 addr)
       if(myConsole.controller(Controller::Right).read(Controller::Four))
         value |= 0x08;
 
-      return value;
+      // Return the input bits set by the controller *and* the
+      // output bits set by the last write to SWCHA
+      return (value & ~myDDRA) | (myOutA & myDDRA);
     }
 
     case 0x01:    // Port A Data Direction Register 
@@ -176,7 +177,6 @@ uInt8 M6532::peek(uInt16 addr)
       else
       {
         myTimerReadAfterInterrupt = true;
-        myCyclesWhenInterruptReset = mySystem->cycles();
         return timer & 0xff;
       }
     }
@@ -213,9 +213,10 @@ void M6532::poke(uInt16 addr, uInt8 value)
   {
     myRAM[addr & 0x007f] = value;
   }
-  else if((addr & 0x07) == 0x00)         // Port A I/O Register (Joystick)
+  else if((addr & 0x07) == 0x00)    // Port A I/O Register (Joystick)
   {
-    uInt8 a = value & myDDRA;
+    myOutA = value;
+    uInt8 a = myOutA & myDDRA;
 
     myConsole.controller(Controller::Left).write(Controller::One, a & 0x10);
     myConsole.controller(Controller::Left).write(Controller::Two, a & 0x20);
@@ -264,12 +265,11 @@ void M6532::poke(uInt16 addr, uInt8 value)
   }
   else if((addr & 0x07) == 0x02)    // Port B I/O Register (Console switches)
   {
-    return;
+    return;  // hardwired as read-only
   }
   else if((addr & 0x07) == 0x03)    // Port B Data Direction Register
   {
-//        myDDRB = value;
+    return;  // hardwired as read-only
-    return;
   }
   else if((addr & 0x17) == 0x14)    // Write timer divide by 1 
   {
@@ -334,8 +334,8 @@ bool M6532::save(Serializer& out) const
     out.putInt(myTimer);
     out.putInt(myIntervalShift);
     out.putInt(myCyclesWhenTimerSet);
-    out.putInt(myCyclesWhenInterruptReset);
     out.putBool(myTimerReadAfterInterrupt);
+    out.putByte((char)myOutA);
     out.putByte((char)myDDRA);
     out.putByte((char)myDDRB);
   }
@@ -371,9 +371,9 @@ bool M6532::load(Deserializer& in)
     myTimer = (uInt32) in.getInt();
     myIntervalShift = (uInt32) in.getInt();
     myCyclesWhenTimerSet = (uInt32) in.getInt();
-    myCyclesWhenInterruptReset = (uInt32) in.getInt();
     myTimerReadAfterInterrupt = in.getBool();
 
+    myOutA = (uInt8) in.getByte();
     myDDRA = (uInt8) in.getByte();
     myDDRB = (uInt8) in.getByte();
   }

stella/src/emucore/M6532.hxx

@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: M6532.hxx,v 1.8 2008-02-19 12:33:05 stephena Exp $
+// $Id: M6532.hxx,v 1.9 2008-04-17 13:39:14 stephena Exp $
 //============================================================================
 
 #ifndef M6532_HXX
@@ -31,7 +31,7 @@ class Deserializer;
   RIOT
 
   @author  Bradford W. Mott
-  @version $Id: M6532.hxx,v 1.8 2008-02-19 12:33:05 stephena Exp $
+  @version $Id: M6532.hxx,v 1.9 2008-04-17 13:39:14 stephena Exp $
 */
 class M6532 : public Device
 {
@@ -135,12 +135,12 @@ class M6532 : public Device
     // Indicates the number of cycles when the timer was last set
     Int32 myCyclesWhenTimerSet;
 
-    // Indicates when the timer was read after timer interrupt occured
-    Int32 myCyclesWhenInterruptReset;
-
     // Indicates if a read from timer has taken place after interrupt occured
     bool myTimerReadAfterInterrupt;
 
+    // Last value written to Port A
+    uInt8 myOutA;
+
     // Data Direction Register for Port A
     uInt8 myDDRA;
 

stella/src/emucore/MT24LC256.cxx

@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: MT24LC256.cxx,v 1.3 2008-04-14 01:39:59 stephena Exp $
+// $Id: MT24LC256.cxx,v 1.4 2008-04-17 13:39:14 stephena Exp $
 //============================================================================
 
 #include <cassert>
@@ -86,6 +86,7 @@ MT24LC256::~MT24LC256()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 bool MT24LC256::readSDA()
 {
+//cerr << "readSDA: <== " << (jpee_mdat && jpee_sdat) << endl;
   return jpee_mdat && jpee_sdat;
 }
 
@@ -330,7 +331,7 @@ cerr << " --> elapsed: " << elapsed << endl;
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 int MT24LC256::jpee_logproc(char const *st)
 {
-  cerr << st << endl;
+//  cerr << "    " << st << endl;
   return 0;
 }
 

stella/src/emucore/TIA.cxx

@@ -13,10 +13,10 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: TIA.cxx,v 1.88 2008-04-13 00:14:38 stephena Exp $
+// $Id: TIA.cxx,v 1.89 2008-04-17 13:39:14 stephena Exp $
 //============================================================================
 
-//#define DEBUG_HMOVE
+#define DEBUG_HMOVE
 
 #include <cassert>
 #include <cstdlib>
@@ -2505,7 +2505,7 @@ void TIA::poke(uInt16 addr, uInt8 value)
       // TODO: Remove the following special hack for Solaris by
       // figuring out what really happens when Reset Missle 
       // occurs 9 cycles after an HMOVE (04/11/08).
-      if(((clock - myLastHMOVEClock) == (9 * 3)) && (hpos == 36))
+      else if(((clock - myLastHMOVEClock) == (9 * 3)) && (hpos == 36))
       {
         myPOSM0 = 8;
       }