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

Tools: Ram -> RAM #669

This commit is contained in:
Isotarge 2016-07-22 01:32:54 +09:30
parent 7b19db2d64
commit 5a20a520bd
14 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
BizHawk.Client.Common/config/Binding.cs
View File

@ -202,8 +202,8 @@ namespace BizHawk.Client.Common
Bind("Movie", "Movie Poke"), Bind("Movie", "Movie Poke"),
Bind("Movie", "Scrub Input"), Bind("Movie", "Scrub Input"),
Bind("Tools", "Ram Watch"), Bind("Tools", "RAM Watch"),
Bind("Tools", "Ram Search"), Bind("Tools", "RAM Search"),
Bind("Tools", "Hex Editor"), Bind("Tools", "Hex Editor"),
Bind("Tools", "Trace Logger"), Bind("Tools", "Trace Logger"),
Bind("Tools", "Lua Console"), Bind("Tools", "Lua Console"),
@ -212,12 +212,12 @@ namespace BizHawk.Client.Common
Bind("Tools", "ToolBox", "Shift+T"), Bind("Tools", "ToolBox", "Shift+T"),
Bind("Tools", "Virtual Pad"), Bind("Tools", "Virtual Pad"),
Bind("Ram Search", "New Search"), Bind("RAM Search", "New Search"),
Bind("Ram Search", "Do Search"), Bind("RAM Search", "Do Search"),
Bind("Ram Search", "Previous Compare To"), Bind("RAM Search", "Previous Compare To"),
Bind("Ram Search", "Next Compare To"), Bind("RAM Search", "Next Compare To"),
Bind("Ram Search", "Previous Operator"), Bind("RAM Search", "Previous Operator"),
Bind("Ram Search", "Next Operator"), Bind("RAM Search", "Next Operator"),
Bind("TAStudio", "Add Branch", "Alt+Insert"), Bind("TAStudio", "Add Branch", "Alt+Insert"),
Bind("TAStudio", "Delete Branch", "Alt+Delete"), Bind("TAStudio", "Delete Branch", "Alt+Delete"),

2
BizHawk.Client.Common/tools/RamSearchEngine.cs
View File

@ -358,7 +358,7 @@ namespace BizHawk.Client.Common
_history.AddState(_watchList); _history.AddState(_watchList);
} }
var removeList = indices.Select(i => _watchList[i]); // This will fail after int.MaxValue but Ram Search fails on domains that large anyway var removeList = indices.Select(i => _watchList[i]); // This will fail after int.MaxValue but RAM Search fails on domains that large anyway
_watchList = _watchList.Except(removeList).ToList(); _watchList = _watchList.Except(removeList).ToList();
} }

4
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1288,8 +1288,8 @@ namespace BizHawk.Client.EmuHawk
private void ToolsSubMenu_DropDownOpened(object sender, EventArgs e) private void ToolsSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
ToolBoxMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["ToolBox"].Bindings; ToolBoxMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["ToolBox"].Bindings;
RamWatchMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Ram Watch"].Bindings; RamWatchMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["RAM Watch"].Bindings;
RamSearchMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Ram Search"].Bindings; RamSearchMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["RAM Search"].Bindings;
HexEditorMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Hex Editor"].Bindings; HexEditorMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Hex Editor"].Bindings;
LuaConsoleMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Lua Console"].Bindings; LuaConsoleMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Lua Console"].Bindings;
CheatsMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Cheats"].Bindings; CheatsMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Cheats"].Bindings;

6
BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
View File

@ -298,10 +298,10 @@ namespace BizHawk.Client.EmuHawk
break; break;
// Tools // Tools
case "Ram Watch": case "RAM Watch":
GlobalWin.Tools.LoadRamWatch(true); GlobalWin.Tools.LoadRamWatch(true);
break; break;
case "Ram Search": case "RAM Search":
GlobalWin.Tools.Load<RamSearch>(); GlobalWin.Tools.Load<RamSearch>();
break; break;
case "Hex Editor": case "Hex Editor":
@ -326,7 +326,7 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Load<VirtualpadTool>(); GlobalWin.Tools.Load<VirtualpadTool>();
break; break;
// Ram Search // RAM Search
case "Do Search": case "Do Search":
if (GlobalWin.Tools.IsLoaded<RamSearch>()) if (GlobalWin.Tools.IsLoaded<RamSearch>())
GlobalWin.Tools.RamSearch.DoSearch(); GlobalWin.Tools.RamSearch.DoSearch();

4
BizHawk.Client.EmuHawk/Watch.cs
View File

@ -1,11 +1,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk
{ {
//Data structure for a watch item in the Ram Watch Dialog //Data structure for a watch item in the RAM Watch Dialog
public enum atype { BYTE, WORD, DWORD, SEPARATOR }; //TODO: more custom types too like 12.4 and 24.12 fixed point public enum atype { BYTE, WORD, DWORD, SEPARATOR }; //TODO: more custom types too like 12.4 and 24.12 fixed point
public enum asigned { SIGNED, UNSIGNED, HEX }; public enum asigned { SIGNED, UNSIGNED, HEX };
public class Watch public class Watch

4
BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs generated
View File

@ -358,7 +358,7 @@
this.AddToRamWatchMenuItem.Name = "AddToRamWatchMenuItem"; this.AddToRamWatchMenuItem.Name = "AddToRamWatchMenuItem";
this.AddToRamWatchMenuItem.ShortcutKeyDisplayString = "Ctrl+W"; this.AddToRamWatchMenuItem.ShortcutKeyDisplayString = "Ctrl+W";
this.AddToRamWatchMenuItem.Size = new System.Drawing.Size(217, 22); this.AddToRamWatchMenuItem.Size = new System.Drawing.Size(217, 22);
this.AddToRamWatchMenuItem.Text = "Add to Ram Watch"; this.AddToRamWatchMenuItem.Text = "Add to RAM Watch";
this.AddToRamWatchMenuItem.Click += new System.EventHandler(this.AddToRamWatchMenuItem_Click); this.AddToRamWatchMenuItem.Click += new System.EventHandler(this.AddToRamWatchMenuItem_Click);
// //
// FreezeAddressMenuItem // FreezeAddressMenuItem
@ -497,7 +497,7 @@
this.AddToRamWatchContextItem.Name = "AddToRamWatchContextItem"; this.AddToRamWatchContextItem.Name = "AddToRamWatchContextItem";
this.AddToRamWatchContextItem.ShortcutKeyDisplayString = "Ctrl+W"; this.AddToRamWatchContextItem.ShortcutKeyDisplayString = "Ctrl+W";
this.AddToRamWatchContextItem.Size = new System.Drawing.Size(206, 22); this.AddToRamWatchContextItem.Size = new System.Drawing.Size(206, 22);
this.AddToRamWatchContextItem.Text = "&Add to Ram Watch"; this.AddToRamWatchContextItem.Text = "&Add to RAM Watch";
this.AddToRamWatchContextItem.Click += new System.EventHandler(this.AddToRamWatchMenuItem_Click); this.AddToRamWatchContextItem.Click += new System.EventHandler(this.AddToRamWatchMenuItem_Click);
// //
// UnfreezeAllContextItem // UnfreezeAllContextItem

4
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
View File

@ -227,7 +227,7 @@ namespace BizHawk.Client.EmuHawk
[LuaMethodAttributes( [LuaMethodAttributes(
"openramwatch", "openramwatch",
"opens the Ram Watch dialog" "opens the RAM Watch dialog"
)] )]
public static void OpenRamWatch() public static void OpenRamWatch()
{ {
@ -236,7 +236,7 @@ namespace BizHawk.Client.EmuHawk
[LuaMethodAttributes( [LuaMethodAttributes(
"openramsearch", "openramsearch",
"opens the Ram Search dialog" "opens the RAM Search dialog"
)] )]
public static void OpenRamSearch() public static void OpenRamSearch()
{ {

12
BizHawk.Client.EmuHawk/tools/ToolManager.cs
View File

@ -400,7 +400,7 @@ namespace BizHawk.Client.EmuHawk
foreach (var tool in beforeList) foreach (var tool in beforeList)
{ {
if (!tool.IsDisposed || if (!tool.IsDisposed ||
(tool is RamWatch && Global.Config.DisplayRamWatch)) // Ram Watch hack, on screen display should run even if Ram Watch is closed (tool is RamWatch && Global.Config.DisplayRamWatch)) // RAM Watch hack, on screen display should run even if RAM Watch is closed
{ {
tool.UpdateValues(); tool.UpdateValues();
} }
@ -413,7 +413,7 @@ namespace BizHawk.Client.EmuHawk
foreach (var tool in afterList) foreach (var tool in afterList)
{ {
if (!tool.IsDisposed || if (!tool.IsDisposed ||
(tool is RamWatch && Global.Config.DisplayRamWatch)) // Ram Watch hack, on screen display should run even if Ram Watch is closed (tool is RamWatch && Global.Config.DisplayRamWatch)) // RAM Watch hack, on screen display should run even if RAM Watch is closed
{ {
tool.UpdateValues(); tool.UpdateValues();
} }
@ -429,7 +429,7 @@ namespace BizHawk.Client.EmuHawk
if (tool != null) if (tool != null)
{ {
if (!tool.IsDisposed || if (!tool.IsDisposed ||
(tool is RamWatch && Global.Config.DisplayRamWatch)) // Ram Watch hack, on screen display should run even if Ram Watch is closed (tool is RamWatch && Global.Config.DisplayRamWatch)) // RAM Watch hack, on screen display should run even if RAM Watch is closed
{ {
tool.UpdateValues(); tool.UpdateValues();
} }
@ -452,7 +452,7 @@ namespace BizHawk.Client.EmuHawk
{ {
ServiceInjector.UpdateServices(Global.Emulator.ServiceProvider, tool); ServiceInjector.UpdateServices(Global.Emulator.ServiceProvider, tool);
bool restartTool = false; bool restartTool = false;
if ((tool.IsHandleCreated && !tool.IsDisposed) || tool is RamWatch) // Hack for Ram Watch - in display watches mode it wants to keep running even closed, it will handle disposed logic if ((tool.IsHandleCreated && !tool.IsDisposed) || tool is RamWatch) // Hack for RAM Watch - in display watches mode it wants to keep running even closed, it will handle disposed logic
restartTool = true; restartTool = true;
if (tool is LuaConsole && ((LuaConsole)tool).IsRebootingCore) if (tool is LuaConsole && ((LuaConsole)tool).IsRebootingCore)
restartTool = false; restartTool = false;
@ -656,7 +656,7 @@ namespace BizHawk.Client.EmuHawk
foreach (var tool in beforeList) foreach (var tool in beforeList)
{ {
if (!tool.IsDisposed || if (!tool.IsDisposed ||
(tool is RamWatch && Global.Config.DisplayRamWatch)) // Ram Watch hack, on screen display should run even if Ram Watch is closed (tool is RamWatch && Global.Config.DisplayRamWatch)) // RAM Watch hack, on screen display should run even if RAM Watch is closed
{ {
tool.FastUpdate(); tool.FastUpdate();
} }
@ -674,7 +674,7 @@ namespace BizHawk.Client.EmuHawk
foreach (var tool in afterList) foreach (var tool in afterList)
{ {
if (!tool.IsDisposed || if (!tool.IsDisposed ||
(tool is RamWatch && Global.Config.DisplayRamWatch)) // Ram Watch hack, on screen display should run even if Ram Watch is closed (tool is RamWatch && Global.Config.DisplayRamWatch)) // RAM Watch hack, on screen display should run even if RAM Watch is closed
{ {
tool.FastUpdate(); tool.FastUpdate();
} }

8
BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs generated
View File

@ -298,7 +298,7 @@
this.AddToRamWatchContextMenuItem.Name = "AddToRamWatchContextMenuItem"; this.AddToRamWatchContextMenuItem.Name = "AddToRamWatchContextMenuItem";
this.AddToRamWatchContextMenuItem.ShortcutKeyDisplayString = "Ctrl+R"; this.AddToRamWatchContextMenuItem.ShortcutKeyDisplayString = "Ctrl+R";
this.AddToRamWatchContextMenuItem.Size = new System.Drawing.Size(215, 22); this.AddToRamWatchContextMenuItem.Size = new System.Drawing.Size(215, 22);
this.AddToRamWatchContextMenuItem.Text = "Add to Ram Watch"; this.AddToRamWatchContextMenuItem.Text = "Add to RAM Watch";
this.AddToRamWatchContextMenuItem.Click += new System.EventHandler(this.AddToRamWatchMenuItem_Click); this.AddToRamWatchContextMenuItem.Click += new System.EventHandler(this.AddToRamWatchMenuItem_Click);
// //
// PokeContextMenuItem // PokeContextMenuItem
@ -708,7 +708,7 @@
this.AddToRamWatchMenuItem.Name = "AddToRamWatchMenuItem"; this.AddToRamWatchMenuItem.Name = "AddToRamWatchMenuItem";
this.AddToRamWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W))); this.AddToRamWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W)));
this.AddToRamWatchMenuItem.Size = new System.Drawing.Size(219, 22); this.AddToRamWatchMenuItem.Size = new System.Drawing.Size(219, 22);
this.AddToRamWatchMenuItem.Text = "&Add to Ram Watch"; this.AddToRamWatchMenuItem.Text = "&Add to RAM Watch";
this.AddToRamWatchMenuItem.Click += new System.EventHandler(this.AddToRamWatchMenuItem_Click); this.AddToRamWatchMenuItem.Click += new System.EventHandler(this.AddToRamWatchMenuItem_Click);
// //
// PokeAddressMenuItem // PokeAddressMenuItem
@ -792,7 +792,7 @@
// //
this.ExcludeRamWatchMenuItem.Name = "ExcludeRamWatchMenuItem"; this.ExcludeRamWatchMenuItem.Name = "ExcludeRamWatchMenuItem";
this.ExcludeRamWatchMenuItem.Size = new System.Drawing.Size(240, 22); this.ExcludeRamWatchMenuItem.Size = new System.Drawing.Size(240, 22);
this.ExcludeRamWatchMenuItem.Text = "Always E&xclude Ram Search List"; this.ExcludeRamWatchMenuItem.Text = "Always E&xclude RAM Search List";
this.ExcludeRamWatchMenuItem.Click += new System.EventHandler(this.ExcludeRamWatchMenuItem_Click); this.ExcludeRamWatchMenuItem.Click += new System.EventHandler(this.ExcludeRamWatchMenuItem_Click);
// //
// UseUndoHistoryMenuItem // UseUndoHistoryMenuItem
@ -1395,7 +1395,7 @@
this.MinimumSize = new System.Drawing.Size(290, 399); this.MinimumSize = new System.Drawing.Size(290, 399);
this.Name = "RamSearch"; this.Name = "RamSearch";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Ram Search"; this.Text = "RAM Search";
this.Activated += new System.EventHandler(this.NewRamSearch_Activated); this.Activated += new System.EventHandler(this.NewRamSearch_Activated);
this.Load += new System.EventHandler(this.RamSearch_Load); this.Load += new System.EventHandler(this.RamSearch_Load);
this.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewRamSearch_DragDrop); this.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewRamSearch_DragDrop);

4
BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Drawing; using System.Drawing;
@ -43,7 +43,7 @@ namespace BizHawk.Client.EmuHawk
private bool _dropdownDontfire; // Used as a hack to get around lame .net dropdowns, there's no way to set their index without firing the selectedindexchanged event! private bool _dropdownDontfire; // Used as a hack to get around lame .net dropdowns, there's no way to set their index without firing the selectedindexchanged event!
public const int MaxDetailedSize = 1024 * 1024; // 1mb, semi-arbituary decision, sets the size to check for and automatically switch to fast mode for the user public const int MaxDetailedSize = 1024 * 1024; // 1mb, semi-arbituary decision, sets the size to check for and automatically switch to fast mode for the user
public const int MaxSupportedSize = 1024 * 1024 * 64; // 64mb, semi-arbituary decision, sets the maximum size ram search will support (as it will crash beyond this) public const int MaxSupportedSize = 1024 * 1024 * 64; // 64mb, semi-arbituary decision, sets the maximum size RAM Search will support (as it will crash beyond this)
#region Initialize, Load, and Save #region Initialize, Load, and Save

2
BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs generated
View File

@ -932,7 +932,7 @@
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "RamWatch"; this.Name = "RamWatch";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = " Ram Watch"; this.Text = " RAM Watch";
this.Activated += new System.EventHandler(this.NewRamWatch_Activated); this.Activated += new System.EventHandler(this.NewRamWatch_Activated);
this.Load += new System.EventHandler(this.NewRamWatch_Load); this.Load += new System.EventHandler(this.NewRamWatch_Load);
this.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewRamWatch_DragDrop); this.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewRamWatch_DragDrop);

2
BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
View File

@ -129,7 +129,7 @@ namespace BizHawk.Client.EmuHawk
if (_watches.Changes) if (_watches.Changes)
{ {
GlobalWin.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = MessageBox.Show("Save Changes?", "Ram Watch", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button3); var result = MessageBox.Show("Save Changes?", "RAM Watch", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button3);
GlobalWin.Sound.StartSound(); GlobalWin.Sound.StartSound();
if (result == DialogResult.Yes) if (result == DialogResult.Yes)
{ {

2
BizHawk.Emulation.Common/Interfaces/Services/IMemoryDomains.cs
View File

@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Common
/// All cores sould implement a SystemBus that represents the standard cpu bus range used for cheats for that system, /// All cores sould implement a SystemBus that represents the standard cpu bus range used for cheats for that system,
/// In order to have a cheat system available for the core /// In order to have a cheat system available for the core
/// All domains should implement both peek and poke. However, if something isn't developed it should throw NotImplementedException rather than silently fail /// All domains should implement both peek and poke. However, if something isn't developed it should throw NotImplementedException rather than silently fail
/// If this service is available the client will expose many RAM related tools such as the Hex Editor, Ram Search/Watch, and Cheats /// If this service is available the client will expose many RAM related tools such as the Hex Editor, RAM Search/Watch, and Cheats
/// In addition, this is an essential service for effective lua scripting /// In addition, this is an essential service for effective lua scripting
/// </summary> /// </summary>
public interface IMemoryDomains : IEnumerable<MemoryDomain>, IEmulatorService public interface IMemoryDomains : IEnumerable<MemoryDomain>, IEmulatorService

14
Dist/changelog.txt
View File

@ -65,9 +65,9 @@
*** Markers - adding markers updates dialog *** Markers - adding markers updates dialog
*** Don't ever remove marker 0 *** Don't ever remove marker 0
**Ram Watch **RAM Watch
Ram Watch - fix "Display watches on Screen" feature RAM Watch - fix "Display watches on Screen" feature
Ram Watch - fixed saving of separators RAM Watch - fixed saving of separators
**Movies **Movies
*** Save to Disk option (intended for large movies) *** Save to Disk option (intended for large movies)
@ -76,8 +76,8 @@ Ram Watch - fixed saving of separators
*** Save as menu item *** Save as menu item
*** Flag for SG-1000 movies, fixes TASVideos submission parser *** Flag for SG-1000 movies, fixes TASVideos submission parser
**Ram Search **RAM Search
***Fix "Exclude Ram Watch" option ***Fix "Exclude RAM Watch" option
***Fix leadings zeros in the Difference and Differnet By boxes ***Fix leadings zeros in the Difference and Differnet By boxes
**Basic Bot **Basic Bot
@ -102,7 +102,7 @@ Ram Watch - fixed saving of separators
**Streamline editing RAM Watches **Streamline editing RAM Watches
**Tidy main form context menu **Tidy main form context menu
**Add more options for U+D/L+R forbid/mutex **Add more options for U+D/L+R forbid/mutex
**Fix Ram Search, Ram Watch, Cheats recent file lists **Fix RAM Search, RAM Watch, Cheats recent file lists
**Fix ffmpeg path for AV writer broken a couple of releases ago **Fix ffmpeg path for AV writer broken a couple of releases ago
**Add menu command to record avi skipping av writer selection **Add menu command to record avi skipping av writer selection
**Remember codec selection between program sessions **Remember codec selection between program sessions
@ -199,7 +199,7 @@ Ram Watch - fixed saving of separators
**Fix Direct3D display method sleep/ctrl+alt+del crashes **Fix Direct3D display method sleep/ctrl+alt+del crashes
**Fix built-in shaders **Fix built-in shaders
**Reduce shader level requirements for basic d3d display method functionality **Reduce shader level requirements for basic d3d display method functionality
**Fix Ram Search/Ram Watch recent files menu **Fix RAM Search/RAM Watch recent files menu
**Import PJM and PXM movies **Import PJM and PXM movies
**Sequentially number screenshots taken in the same second without crashing after the 3rd one **Sequentially number screenshots taken in the same second without crashing after the 3rd one