2017-09-09 Release version with help pages in GUI

Author: PandTomB

Makefile

@@ -234,6 +234,7 @@ OBJS =	\
 	src/od-pandora/gui/UaeListBox.o \
 	src/od-pandora/gui/InGameMessage.o \
 	src/od-pandora/gui/SelectorEntry.o \
+	src/od-pandora/gui/ShowHelp.o \
 	src/od-pandora/gui/ShowMessage.o \
 	src/od-pandora/gui/SelectFolder.o \
 	src/od-pandora/gui/SelectFile.o \

Readme_Pandora.txt

@@ -194,10 +194,9 @@ Select the required Amiga CPU (68000 - 68040).
 If you select 68020, you can choose between 24-bit addressing (68EC020) or 32-bit addressing (68020). 
 
 The option "More compatible" is only available if 68000 or 68010 is selected and emulates simple prefetch of the 68000. This may 
-improve compatibility in few situations but it's not required for most games and demos.
+improve compatibility in few situations but is not required for most games and demos.
 
-JIT enables the Just-in-time compiler. This may breaks compatibility in some games. You will not notice a big performance
-improvement as long as you didn't select "Fastest" in "CPU Speed".
+JIT enables the Just-in-time compiler. This may breaks compatibility in some games.
 
 What options are available for FPU depends on the selected CPU.
 
@@ -239,10 +238,10 @@ Select the amount of RAM for each type you want in your Amiga.
 3.8 Floppy drives
 
 You can enable/disable each drive by clicking the checkbox next to DFx or select the drive type in the dropdown control.
-"3.5'' DD" is the right choose for nearly all ADF and ADZ files. 
+"3.5'' DD" is the right choise for nearly all ADF and ADZ files. 
 The option "Write-protected" indicates if the emulator can write to the ADF.
 The button "..." opens a dialog to select the required disk file.
-With the big dropdown control, you can select one of the disks you recently used.
+With the dropdown control, you can select one of the disks you recently used.
 
 You can reduce the loading time for lot of games by increasing the floppy drive emulation speed. A few games will not load
 with higher drive speed and you have to select 100%.
@@ -262,7 +261,7 @@ create the new hard disk. You have to format the new HDD in Amiga via the Workbe
 
 If "Master harddrive write protection" is selected, you can't write to any HD.
 
-Select "CD drive" to emulate CD for CD32. Use "Eject"" to remove currentCD and click on "..." to open a dialog to select
+Select "CD drive" to emulate CD for CD32. Use "Eject" to remove current CD and click on "..." to open a dialog to select
 the iso/cue file for CD emulation.
 In current version, WAV, MP3 and FLAC is supported for audio tracks.
 
@@ -313,7 +312,7 @@ current frame rate. When you have a HDD in your Amiga emulation, the HD indicato
 to the HDD. The next values are showing the track number for each disk drive and indicates disk access.
 
 When you deactivate the option "Show GUI on startup" and use this configuration by specifying it with the command line
-parameter "-config=<file>", the emulations starts directly without showing the GUI.
+parameter "-config=<file>", the emulation starts directly without showing the GUI.
 
 Set the speed for the Pandora CPU to overclock it for games which need more power. Be careful with this parameter.
 

changelog.txt

@@ -1,3 +1,9 @@
+2017-09-09 - Release version
+   - Fixed frameskip (was broken in last two beta versions)
+   - Fixed Picasso framerate (Pandora switches now to 60 Hz like the Amiga side)
+   - Added help page for every panel in GUI (Help button or F1)
+   - Fixed bug when emulator crashes or hangs after switching configs
+
 2017-09-06 - Beta version
    - Merged lot of changes from WinUAE 3.5.0
    - Fixed possible segfault and bus error on two locations

src/custom.cpp

@@ -2289,7 +2289,7 @@ static void record_sprite (int line, int num, int sprxp, uae_u16 *data, uae_u16
 			stb1[6] |= state;
 			stb1[7] |= state;
 			stb1 += 8;
-		}
+  	}
 		e->has_attached = 1;
 	}
 }
@@ -2688,6 +2688,7 @@ static void compute_framesync (void)
 			else
 				v = cr->rate;
 			changed_prefs.chipset_refreshrate = currprefs.chipset_refreshrate = v;
+			vsync_switchmode((int)v);
     }
 		found = true;
 		break;
@@ -4972,6 +4973,7 @@ static bool framewait (void)
 {
 	frame_time_t curr_time;
 	frame_time_t start;
+  frame_time_t time_for_next_frame = vsynctimebase;
 	int vs = isvsync_chipset ();
 	int status = 0;
 
@@ -4984,21 +4986,29 @@ static bool framewait (void)
 
 	if (vs > 0) {
 
-		if (!frame_rendered && !picasso_on)
-			frame_rendered = render_screen (false);
+		if(!nodraw()) {
+  		if (!frame_rendered && !picasso_on)
+  			frame_rendered = render_screen (false);
+  
+  		if (!frame_shown) {
+  			show_screen (1);
+  		}
+      curr_time = target_lastsynctime();
+    }
+    else {
+      curr_time = target_lastsynctime() + vsynctimebase;
 
-		if (!frame_shown) {
-			show_screen (1);
-		}
+      if(read_processor_time () > curr_time)
+        time_for_next_frame = curr_time - read_processor_time ();
+    }
 
-    curr_time = target_lastsynctime();
 		vsyncwaittime = vsyncmaxtime = curr_time + vsynctimebase;
     vsyncmintime = curr_time;
-
+    
 		if (currprefs.m68k_speed < 0) {
-			vsynctimeperline = (vsynctimebase) / (maxvpos_display + 1);
+			vsynctimeperline = (time_for_next_frame) / (maxvpos_display + 1);
 		} else {
-			vsynctimeperline = (vsynctimebase) / 3;
+			vsynctimeperline = (time_for_next_frame) / 3;
 		}
 
 		if (vsynctimeperline < 1)
@@ -5083,7 +5093,7 @@ void fpscounter_reset (void)
 	idletime = 0;
 }
 
-static void fpscounter (bool frameok)
+static void fpscounter (void)
 {
   frame_time_t now, last;
 
@@ -5094,6 +5104,9 @@ static void fpscounter (bool frameok)
 	if ((int)last < 0)
 		return;
 
+	if(currprefs.gfx_framerate)
+	  idletime >>= 1;
+
 	mavg (&fps_mavg, last / 10, FPSCOUNTER_MAVG_SIZE);
 	mavg (&idle_mavg, idletime / 10, FPSCOUNTER_MAVG_SIZE);
 	idletime = 0;
@@ -5109,10 +5122,6 @@ static void fpscounter (bool frameok)
 			idle = 0;
 		if (idle > 100 * 10)
 			idle = 100 * 10;
-		if (fake_vblank_hz * 10 > fps) {
-			float mult = (float)fake_vblank_hz * 10.0 / fps;
-			idle *= mult;
-		}
 		gui_data.fps = fps;
     gui_data.idle = (int)idle;
   }
@@ -5139,18 +5148,22 @@ static void vsync_handler_pre (void)
 		frameskiptime += end - start;
 	}
 
-	bool frameok = framewait ();
+  framewait ();
 
-	if (!picasso_on) {
+	if (!picasso_on && !nodraw()) {
 		if (!frame_rendered) {
 			frame_rendered = render_screen (false);
 		}
 		if (frame_rendered && !frame_shown) {
 			frame_shown = show_screen_maybe (true);
 		}
 	}
-
-  fpscounter(frameok);
+#ifdef PICASSO96
+  if(!nodraw() || (picasso_on && picasso_rendered))
+#else
+  if(!nodraw() )
+#endif
+    fpscounter();
 
 	handle_events ();
 

src/include/memory.h

@@ -547,12 +547,12 @@ STATIC_INLINE void put_pointer (uaecptr addr, void *v)
 
 STATIC_INLINE uae_u8 *get_real_address(uaecptr addr)
 {
-    return get_mem_bank(addr).xlateaddr(addr);
+  return get_mem_bank(addr).xlateaddr(addr);
 }
 
 STATIC_INLINE int valid_address(uaecptr addr, uae_u32 size)
 {
-    return get_mem_bank(addr).check(addr, size);
+  return get_mem_bank(addr).check(addr, size);
 }
 
 STATIC_INLINE void put_quad_host(void *addr, uae_u64 v)

src/memory.cpp

@@ -935,8 +935,8 @@ static void allocate_memory (void)
   }
 
   if (bogomem_bank.reserved_size != currprefs.bogomem_size) {
-			mapped_free (&bogomem_bank);
-			bogomem_bank.reserved_size = 0;
+		mapped_free (&bogomem_bank);
+		bogomem_bank.reserved_size = 0;
 
 		if(currprefs.bogomem_size > 0x1c0000)
       currprefs.bogomem_size = 0x1c0000;
@@ -1032,6 +1032,7 @@ void map_overlay (int chip)
 {
   int size;
   addrbank *cb;
+  
   int currPC = m68k_getpc();
 
   size = chipmem_bank.allocated_size >= 0x180000 ? (chipmem_bank.allocated_size >> 16) : 32;
@@ -1165,6 +1166,7 @@ void memory_reset (void)
   int bnk, bnk_end;
 	bool gayleorfatgary;
 
+
 	need_hardreset = false;
 	/* Use changed_prefs, as m68k_reset is called later.  */
 	if (last_address_space_24 != changed_prefs.address_space_24)

src/newcpu.cpp

@@ -1713,6 +1713,7 @@ void m68k_go (int may_quit)
 
 	cpu_prefs_changed_flag = 0;
   in_m68k_go++;
+  
   for (;;) {
   	void (*run_func)(void);
 
@@ -1815,6 +1816,12 @@ void m68k_go (int may_quit)
 	  run_func ();
   }
 	protect_roms (false);
+
+  // Prepare for a restart: reset pc
+  regs.pc = 0;
+  regs.pc_p = NULL;
+  regs.pc_oldp = NULL;
+
   in_m68k_go--;
 }
 

src/od-pandora/gui/Navigation.cpp

@@ -40,9 +40,10 @@ static NavigationMap navMap[] =
   { "Miscellaneous",    "StatusLine",     "StatusLine",     "Input",            "Savestates" },
   { "Savestates",       "State0",         "State0",         "Miscellaneous",    "Reset" },
   { "Reset",            "Start",          "Quit",           "Savestates",       "Paths" },
-  { "Quit",             "Reset",          "Start",          "Savestates",       "Paths" },
+  { "Quit",             "Reset",          "Help",          "Savestates",       "Paths" },
 //  { "Restart",          "Quit",           "Start",          "Savestates",       "Paths" },
-  { "Start",            "Quit",           "Reset",          "Savestates",       "Paths" },
+  { "Help",             "Quit",           "Start",          "Savestates",       "Paths" },
+  { "Start",            "Help",           "Reset",          "Savestates",       "Paths" },
 
 // PanelPaths
   { "SystemROMs",     "Paths",          "Paths",          "RescanROMs",     "ConfigPath" },

src/od-pandora/gui/PanelCPU.cpp

@@ -404,3 +404,27 @@ void RefreshPanelCPU(void)
   else if (changed_prefs.m68k_speed == -1)
     optFastest->setSelected(true);
 }
+
+
+bool HelpPanelCPU(std::vector<std::string> &helptext)
+{
+  helptext.clear();
+  helptext.push_back("Select the required Amiga CPU (68000 - 68040).");
+  helptext.push_back("If you select 68020, you can choose between 24-bit addressing (68EC020) or 32-bit addressing (68020).");
+  helptext.push_back("The option \"More compatible\" is only available if 68000 or 68010 is selected and emulates simple prefetch of");
+  helptext.push_back("the 68000. This may improve compatibility in few situations but is not required for most games and demos.");
+  helptext.push_back("");
+  helptext.push_back("JIT enables the Just-in-time compiler. This may breaks compatibility in some games.");
+  helptext.push_back("");
+  helptext.push_back("The available FPU models depending on the selected CPU.");
+  helptext.push_back("The option \"More compatible\" activates more accurate rounding and compare of two floats.");
+  helptext.push_back("\"Softfloat FPU emul.\" aktivates the FPU emulation from QEMU. This is more accurate, but a bit slower.");
+  helptext.push_back("");
+  helptext.push_back("With \"CPU Speed\" you can choose the clock rate of the Amiga.");
+  helptext.push_back("");
+  helptext.push_back("In current version, you will not see a difference in the performance for 68020, 68030 and 68040 CPUs. The cpu");
+  helptext.push_back("cycles for the opcodes are based on 68020. The different cycles for 68030 and 68040 may come in a later");
+  helptext.push_back("version.");
+  return true;
+}
+  

src/od-pandora/gui/PanelChipset.cpp

@@ -377,3 +377,24 @@ void RefreshPanelChipset(void)
   else
     optCollFull->setSelected(true);
 }
+
+
+bool HelpPanelChipset(std::vector<std::string> &helptext)
+{
+  helptext.clear();
+  helptext.push_back("If you want to emulate an Amiga 1200, select AGA. For most Amiga 500 games, select \"Full ECS\". Some older");
+  helptext.push_back("Amiga games requires \"OCS\" or \"ECS Agnus\". You have to play with these options if a game won't work as");
+  helptext.push_back("expected. By selecting an entry in \"Extra\", all internal chipset settings will become the required values for the specified");
+  helptext.push_back("Amiga model.");
+  helptext.push_back("For some games, you have to activate \"NTSC\" (60 Hz instead of 50 Hz) for correct timing.");
+  helptext.push_back("");
+  helptext.push_back("When you see some graphic issues in a game, try \"Immediate\" or \"Wait for blit.\" for blitter and/or disable");
+  helptext.push_back("\"Fast copper\".");
+  helptext.push_back("");
+  helptext.push_back("\"Fast copper\" uses a prediction algorithm instead of checking the copper state on a more regular basis. This may");
+  helptext.push_back("cause issues but brings a big performance improvement. The option was removed in WinUAE in an early state,");
+  helptext.push_back("but for most games, it works fine and the better performance is helpful for low powered devices.");
+  helptext.push_back("");
+  helptext.push_back("For \"Collision Level\", select \"Sprites and Sprites vs. Playfield\" which is fine for nearly all games.");
+  return true;
+}

src/od-pandora/gui/PanelConfig.cpp

@@ -89,9 +89,9 @@ class ConfigsListModel : public gcn::ListModel
         strncpy(tmp, ConfigFilesList[i]->Name, MAX_DPATH);
         if(strlen(ConfigFilesList[i]->Description) > 0)
         {
-          strncat(tmp, " (", MAX_DPATH);
-          strncat(tmp, ConfigFilesList[i]->Description, MAX_DPATH);
-          strncat(tmp, ")", MAX_DPATH);
+          strncat(tmp, " (", MAX_DPATH - 1);
+          strncat(tmp, ConfigFilesList[i]->Description, MAX_DPATH - 1);
+          strncat(tmp, ")", MAX_DPATH - 1);
         }
         configs.push_back(tmp);
       }
@@ -131,7 +131,7 @@ class ConfigButtonActionListener : public gcn::ActionListener
         if(!txtName->getText().empty())
         {
           fetch_configurationpath(filename, MAX_DPATH);
-          strncat(filename, txtName->getText().c_str(), MAX_DPATH);
+          strncat(filename, txtName->getText().c_str(), MAX_DPATH - 1);
           strncat(filename, ".uae", MAX_DPATH);
           strncpy(changed_prefs.description, txtDesc->getText().c_str(), 256);
           if(cfgfile_save(&changed_prefs, filename, 0))
@@ -357,3 +357,17 @@ void RefreshPanelConfig(void)
     }
   }
 }
+
+
+bool HelpPanelConfig(std::vector<std::string> &helptext)
+{
+  helptext.clear();
+  helptext.push_back("To load a configuration, select the entry in the list and then click on \"Load\". If you doubleclick on an entry");
+  helptext.push_back("in the list, the emulation starts with this configuration.");
+  helptext.push_back("");
+  helptext.push_back("If you want to create a new configuration, setup all options, enter a new name in \"Name\", provide a short");
+  helptext.push_back("description and then click on \"Save\".");
+  helptext.push_back("");
+  helptext.push_back("\"Delete\" will delete the selected configuration.");
+  return true;
+}

src/od-pandora/gui/PanelDisplay.cpp

@@ -283,3 +283,22 @@ void RefreshPanelDisplay(void)
   chkLineDbl->setSelected(changed_prefs.gfx_vresolution != VRES_NONDOUBLE);
   chkFrameskip->setSelected(changed_prefs.gfx_framerate);
 }
+
+
+bool HelpPanelDisplay(std::vector<std::string> &helptext)
+{
+  helptext.clear();
+  helptext.push_back("Select the required width and height of the Amiga screen. If you select \"NTSC\" in chipset, a value greater than");
+  helptext.push_back("240 for \"Height\" makes no sense. When the game, demo or workbench uses Hires mode and you selected a");
+  helptext.push_back("value for \"Width\" lower than 640, you will only see half of the pixels.");
+  helptext.push_back("");
+  helptext.push_back("With \"Vert. offset\" you can adjust the position of the first drawn line of the Amiga screen.");
+  helptext.push_back("");
+  helptext.push_back("Enable 4/3 shrink if you want correct aspect ratio on modern 16/9 screen.");
+  helptext.push_back("");
+  helptext.push_back("Activate line doubling to remove flicker in interlace modes.");
+  helptext.push_back("");
+  helptext.push_back("When you activate \"Frameskip\", only every second frame is drawn. This will improve performance and some");
+  helptext.push_back("more games are playable.");
+  return true;
+}