[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [347] branches/Release-0_8_0/fuse

[<fr...@us...>]

Revision: 347
          http://svn.sourceforge.net/fuse-for-macosx/?rev=347&view=rev
Author:   fredm
Date:     2007-04-09 04:42:58 -0700 (Mon, 09 Apr 2007)

Log Message:
-----------
Merge in changes from Fuse to reset rzx_instructions_offset on rollback
to fix replay of rolled back recordings (and some refactoring).

Modified Paths:
--------------
    branches/Release-0_8_0/fuse/fusepb/controllers/FuseController.m
    branches/Release-0_8_0/fuse/fusepb/controllers/RollbackController.m
    branches/Release-0_8_0/fuse/rzx.c
    branches/Release-0_8_0/fuse/rzx.h

Modified: branches/Release-0_8_0/fuse/fusepb/controllers/FuseController.m
===================================================================
--- branches/Release-0_8_0/fuse/fusepb/controllers/FuseController.m	2007-04-09 11:40:55 UTC (rev 346)
+++ branches/Release-0_8_0/fuse/fusepb/controllers/FuseController.m	2007-04-09 11:42:58 UTC (rev 347)
@@ -531,15 +531,9 @@
 
   fuse_emulation_pause();
 
-  error = libspectrum_rzx_rollback( rzx, &snap );
+  error = rzx_rollback();
   if( error ) { fuse_emulation_unpause(); return; }
 
-  error = snapshot_copy_from( snap );
-  if( error ) { fuse_emulation_unpause(); return; }
-
-  error = libspectrum_rzx_start_input( rzx, tstates );
-  if( error ) { fuse_emulation_unpause(); return; }
-
   fuse_emulation_unpause();
 }
 

Modified: branches/Release-0_8_0/fuse/fusepb/controllers/RollbackController.m
===================================================================
--- branches/Release-0_8_0/fuse/fusepb/controllers/RollbackController.m	2007-04-09 11:40:55 UTC (rev 346)
+++ branches/Release-0_8_0/fuse/fusepb/controllers/RollbackController.m	2007-04-09 11:42:58 UTC (rev 347)
@@ -79,10 +79,8 @@
                                          [rollbackPoints selectedRow] );
     if( error ) [self cancel:self];
 
-    error = snapshot_copy_from( snap );
+    error = rzx_start_after_rollback( snap );
     if( error ) [self cancel:self];
-
-    libspectrum_rzx_start_input( rzx, tstates );
   }
 
   [self cancel:self];

Modified: branches/Release-0_8_0/fuse/rzx.c
===================================================================
--- branches/Release-0_8_0/fuse/rzx.c	2007-04-09 11:40:55 UTC (rev 346)
+++ branches/Release-0_8_0/fuse/rzx.c	2007-04-09 11:42:58 UTC (rev 347)
@@ -480,8 +480,8 @@
   return rollback_points;
 }
 
-static int
-start_after_rollback( libspectrum_snap *snap )
+int
+rzx_start_after_rollback( libspectrum_snap *snap )
 {
   int error;
 
@@ -506,7 +506,7 @@
   error = libspectrum_rzx_rollback( rzx, &snap );
   if( error ) return error;
 
-  error = start_after_rollback( snap );
+  error = rzx_start_after_rollback( snap );
   if( error ) return error;
 
   return 0;
@@ -528,7 +528,7 @@
   error = libspectrum_rzx_rollback_to( rzx, &snap, which );
   if( error ) return error;
 
-  error = start_after_rollback( snap );
+  error = rzx_start_after_rollback( snap );
   if( error ) return error;
 
   return 0;

Modified: branches/Release-0_8_0/fuse/rzx.h
===================================================================
--- branches/Release-0_8_0/fuse/rzx.h	2007-04-09 11:40:55 UTC (rev 346)
+++ branches/Release-0_8_0/fuse/rzx.h	2007-04-09 11:42:58 UTC (rev 347)
@@ -80,6 +80,8 @@
 
 int rzx_rollback_to( void );
 
+int rzx_start_after_rollback( libspectrum_snap *snap );
+
 GSList* rzx_get_rollback_list( libspectrum_rzx *rzx );
 
 #endif			/* #ifndef FUSE_RZX_H */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.