Temporarily reverted r64524 until I (or someone else) find the time to sort out the stuff.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@64536 e17a0e51-4ae3-4d35-97c3-1a29b211df97

1 files changed, 316 insertions, 318 deletions

diff --git a/gui/DebugMemory.c b/gui/DebugMemory.c
index 59792cd3..bbce1f17 100644
--- a/gui/DebugMemory.c
+++ b/gui/DebugMemory.c
@@ -1,318 +1,316 @@
-/*  Memory Viewer/Dumper for PCSX-Reloaded
- *  Copyright (C) 2010, Wei Mingzhi <whistler_wmz@users.sf.net>.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
- */
-
-#include "Linux.h"
-#include "../libpcsxcore/psxmem.h"
-#include <glade/glade.h>
-#include "DebugMemory.h"
-
-#define MEMVIEW_MAX_LINES 256
-
-static GtkWidget *MemViewDlg = NULL;
-static u32 MemViewAddress = 0;
-
-static void UpdateMemViewDlg() {
-	s32 start, end;
-	int i;
-	char bufaddr[9], bufdata[16][3], buftext[17];
-
-	GtkListStore *store = gtk_list_store_new(18, G_TYPE_STRING, G_TYPE_STRING,
-		G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
-		G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
-		G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
-		G_TYPE_STRING);
-
-	GtkTreeIter iter;
-	GtkWidget *widget;
-	GladeXML *xml;
-
-	xml = glade_get_widget_tree(MemViewDlg);
-
-	MemViewAddress &= 0x1fffff;
-
-	sprintf(buftext, "%.8X", MemViewAddress | 0x80000000);
-	widget = glade_xml_get_widget(xml, "entry_address");
-	gtk_entry_set_text(GTK_ENTRY(widget), buftext);
-
-	start = MemViewAddress & 0x1ffff0;
-	end = start + MEMVIEW_MAX_LINES * 16;
-
-	if (end > 0x1fffff) end = 0x1fffff;
-
-	widget = glade_xml_get_widget(xml, "GtkCList_MemView");
-
-	buftext[16] = '\0';
-
-	while (start < end) {
-		sprintf(bufaddr, "%.8X", start | 0x80000000);
-
-		for (i = 0; i < 16; i++) {
-			buftext[i] = psxMs8(start + i);
-			sprintf(bufdata[i], "%.2X", (u8)buftext[i]);
-			if ((u8)buftext[i] < 32 || (u8)buftext[i] >= 127)
-				buftext[i] = '.';
-		}
-
-		gtk_list_store_append(store, &iter);
-		gtk_list_store_set(store, &iter, 0, bufaddr, 1, bufdata[0],
-			2, bufdata[1], 3, bufdata[2], 4, bufdata[3], 5, bufdata[4],
-			6, bufdata[5], 7, bufdata[6], 8, bufdata[7], 9, bufdata[8],
-			10, bufdata[9], 11, bufdata[10], 12, bufdata[11], 13, bufdata[12],
-			14, bufdata[13], 15, bufdata[14], 16, bufdata[15], 17, buftext, -1);
-
-		start += 16;
-	}
-
-	gtk_tree_view_set_model(GTK_TREE_VIEW(widget), GTK_TREE_MODEL(store));
-	g_object_unref(G_OBJECT(store));
-	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(widget), TRUE);
-	gtk_widget_show(widget);
-}
-
-static void MemView_Go() {
-	GtkWidget *widget;
-	GladeXML *xml;
-
-	xml = glade_get_widget_tree(MemViewDlg);
-	widget = glade_xml_get_widget(xml, "entry_address");
-
-	sscanf(gtk_entry_get_text(GTK_ENTRY(widget)), "%x", &MemViewAddress);
-
-	UpdateMemViewDlg();
-}
-
-static void MemView_Dump() {
-	GtkWidget *dlg;
-	GtkWidget *box, *table, *label, *start_edit, *length_edit;
-	char buf[10];
-
-	dlg = gtk_dialog_new_with_buttons(_("Memory Dump"), GTK_WINDOW(MemViewDlg),
-		GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
-
-	box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg)));
-
-	table = gtk_table_new(2, 2, FALSE);
-
-	label = gtk_label_new(_("Start Address (Hexadecimal):"));
-	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, 0, 0, 5, 5);
-	gtk_widget_show(label);
-
-	start_edit = gtk_entry_new_with_max_length(8);
-	sprintf(buf, "%.8X", MemViewAddress | 0x80000000);
-	gtk_entry_set_text(GTK_ENTRY(start_edit), buf);
-	gtk_table_attach(GTK_TABLE(table), start_edit, 1, 2, 0, 1, 0, 0, 5, 5);
-	gtk_widget_show(start_edit);
-
-	label = gtk_label_new(_("Length (Decimal):"));
-	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, 0, 0, 5, 5);
-	gtk_widget_show(label);
-
-	length_edit = gtk_entry_new();
-	gtk_table_attach(GTK_TABLE(table), length_edit, 1, 2, 1, 2, 0, 0, 5, 5);
-	gtk_widget_show(length_edit);
-
-	gtk_box_pack_start(GTK_BOX(box), table, FALSE, FALSE, 5);
-
-	gtk_window_set_position(GTK_WINDOW(dlg), GTK_WIN_POS_CENTER);
-	gtk_widget_show_all(dlg);
-
-	if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_ACCEPT) {
-		s32 start = 0, length = 0;
-
-		sscanf(gtk_entry_get_text(GTK_ENTRY(start_edit)), "%x", &start);
-		sscanf(gtk_entry_get_text(GTK_ENTRY(length_edit)), "%d", &length);
-
-		start &= 0x1fffff;
-
-		if (start + length > 0x1fffff) {
-			length = 0x1fffff - start;
-		}
-
-		if (length > 0) {
-			GtkWidget *file_chooser = gtk_file_chooser_dialog_new(_("Dump to File"),
-				NULL, GTK_FILE_CHOOSER_ACTION_SAVE,
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL);
-
-			gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(file_chooser), getenv("HOME"));
-
-			if (gtk_dialog_run(GTK_DIALOG(file_chooser)) == GTK_RESPONSE_ACCEPT) {
-				gchar *file = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(file_chooser));
-				FILE *fp = fopen(file, "wb");
-
-				if (fp != NULL) {
-					if(fwrite(&psxM[start], length, 1, fp) != 1)
-						SysMessage(_("Error writing to %s!"), file);
-					fclose(fp);
-				} else {
-					SysMessage(_("Error writing to %s!"), file);
-				}
-
-				g_free(file);
-			}
-
-			gtk_widget_destroy(file_chooser);
-		}
-	}
-
-	gtk_widget_destroy(dlg);
-}
-
-static void MemView_Patch() {
-	GtkWidget *dlg;
-	GtkWidget *box, *table, *label, *addr_edit, *val_edit;
-	char buf[10];
-
-	dlg = gtk_dialog_new_with_buttons(_("Memory Patch"), GTK_WINDOW(MemViewDlg),
-		GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
-
-	box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg)));
-
-	table = gtk_table_new(2, 2, FALSE);
-
-	label = gtk_label_new(_("Address (Hexadecimal):"));
-	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, 0, 0, 5, 5);
-	gtk_widget_show(label);
-
-	addr_edit = gtk_entry_new_with_max_length(8);
-	sprintf(buf, "%.8X", MemViewAddress | 0x80000000);
-	gtk_entry_set_text(GTK_ENTRY(addr_edit), buf);
-	gtk_table_attach(GTK_TABLE(table), addr_edit, 1, 2, 0, 1, 0, 0, 5, 5);
-	gtk_widget_show(addr_edit);
-
-	label = gtk_label_new(_("Value (Hexa string):"));
-	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, 0, 0, 5, 5);
-	gtk_widget_show(label);
-
-	val_edit = gtk_entry_new();
-	gtk_table_attach(GTK_TABLE(table), val_edit, 1, 2, 1, 2, 0, 0, 5, 5);
-	gtk_widget_show(val_edit);
-
-	gtk_box_pack_start(GTK_BOX(box), table, FALSE, FALSE, 5);
-
-	gtk_window_set_position(GTK_WINDOW(dlg), GTK_WIN_POS_CENTER);
-	gtk_widget_show_all(dlg);
-
-	if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_ACCEPT) {
-		u32 addr = 0xffffffff, val = 0;
-		const char *p = gtk_entry_get_text(GTK_ENTRY(val_edit));
-		int r = strlen(p);
-
-		sscanf(gtk_entry_get_text(GTK_ENTRY(addr_edit)), "%x", &addr);
-
-		if (r > 0 && addr != 0xffffffff) {
-			addr &= 0x1fffff;
-			MemViewAddress = addr;
-
-			while (r > 0 && addr <= 0x1fffff) {
-				sscanf(p, "%2x", &val);
-				p += 2;
-				r -= 2;
-
-				while (r > 0 && (*p == '\t' || *p == ' ')) {
-					p++;
-					r--;
-				}
-
-				psxMemWrite8(addr, (u8)val);
-				addr++;
-			}
-
-			UpdateMemViewDlg();
-		}
-	}
-
-	gtk_widget_destroy(dlg);
-}
-
-// close the memory viewer window
-static void MemView_Close(GtkWidget *widget, gpointer user_data) {
-	gtk_widget_destroy(MemViewDlg);
-	MemViewDlg = NULL;
-}
-
-void RunDebugMemoryDialog() {
-	GladeXML *xml;
-	GtkWidget *widget;
-	GtkCellRenderer *renderer;
-	GtkTreeViewColumn *column;
-	PangoFontDescription *pfd;
-	int i;
-
-	xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "MemViewDlg", NULL);
-	if (!xml) {
-		g_warning(_("Error: Glade interface could not be loaded!"));
-		return;
-	}
-
-	MemViewDlg = glade_xml_get_widget(xml, "MemViewDlg");
-	gtk_window_set_title(GTK_WINDOW(MemViewDlg), _("Memory Viewer"));
-
-	widget = glade_xml_get_widget(xml, "GtkCList_MemView");
-
-	renderer = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes(_("Address"),
-		renderer, "text", 0, NULL);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(widget), column);
-
-	for (i = 0; i < 16; i++) {
-		const char *p = "0123456789ABCDEF";
-		char buf[2];
-
-		buf[0] = p[i];
-		buf[1] = '\0';
-
-		renderer = gtk_cell_renderer_text_new();
-		column = gtk_tree_view_column_new_with_attributes(buf,
-			renderer, "text", i + 1, NULL);
-		gtk_tree_view_append_column(GTK_TREE_VIEW(widget), column);
-	}
-
-	renderer = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes(_("Text"),
-		renderer, "text", 17, NULL);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(widget), column);
-
-	pfd = pango_font_description_from_string("Bitstream Vera Sans Mono, "
-		"DejaVu Sans Mono, Liberation Mono, FreeMono, Sans Mono 9");
-#if GTK_CHECK_VERSION(3, 0, 0)
-	gtk_widget_override_font(widget, pfd);
-#else
-	gtk_widget_modify_font(widget, pfd);
-#endif
-	pango_font_description_free(pfd);
-
-	UpdateMemViewDlg();
-
-	widget = glade_xml_get_widget(xml, "btn_dump");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		G_CALLBACK(MemView_Dump), xml, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "btn_patch");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		G_CALLBACK(MemView_Patch), xml, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "btn_go");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		G_CALLBACK(MemView_Go), xml, NULL, G_CONNECT_AFTER);
-
-	g_signal_connect_data(GTK_OBJECT(MemViewDlg), "response",
-		G_CALLBACK(MemView_Close), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
-}
+/*  Memory Viewer/Dumper for PCSX-Reloaded

+ *  Copyright (C) 2010, Wei Mingzhi <whistler_wmz@users.sf.net>.

+ *

+ *  This program is free software; you can redistribute it and/or modify

+ *  it under the terms of the GNU General Public License as published by

+ *  the Free Software Foundation; either version 2 of the License, or

+ *  (at your option) any later version.

+ *

+ *  This program is distributed in the hope that it will be useful,

+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ *  GNU General Public License for more details.

+ *

+ *  You should have received a copy of the GNU General Public License

+ *  along with this program; if not, write to the Free Software

+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA

+ */

+

+#include "Linux.h"

+#include "../libpcsxcore/psxmem.h"

+#include <glade/glade.h>

+

+#define MEMVIEW_MAX_LINES 256

+

+static GtkWidget *MemViewDlg = NULL;

+static u32 MemViewAddress = 0;

+

+static void UpdateMemViewDlg() {

+	s32 start, end;

+	int i;

+	char bufaddr[9], bufdata[16][3], buftext[17];

+

+	GtkListStore *store = gtk_list_store_new(18, G_TYPE_STRING, G_TYPE_STRING,

+		G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,

+		G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,

+		G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,

+		G_TYPE_STRING);

+

+	GtkTreeIter iter;

+	GtkWidget *widget;

+	GladeXML *xml;

+

+	xml = glade_get_widget_tree(MemViewDlg);

+

+	MemViewAddress &= 0x1fffff;

+

+	sprintf(buftext, "%.8X", MemViewAddress | 0x80000000);

+	widget = glade_xml_get_widget(xml, "entry_address");

+	gtk_entry_set_text(GTK_ENTRY(widget), buftext);

+

+	start = MemViewAddress & 0x1ffff0;

+	end = start + MEMVIEW_MAX_LINES * 16;

+

+	if (end > 0x1fffff) end = 0x1fffff;

+

+	widget = glade_xml_get_widget(xml, "GtkCList_MemView");

+

+	buftext[16] = '\0';

+

+	while (start < end) {

+		sprintf(bufaddr, "%.8X", start | 0x80000000);

+

+		for (i = 0; i < 16; i++) {

+			buftext[i] = psxMs8(start + i);

+			sprintf(bufdata[i], "%.2X", (u8)buftext[i]);

+			if ((u8)buftext[i] < 32 || (u8)buftext[i] >= 127)

+				buftext[i] = '.';

+		}

+

+		gtk_list_store_append(store, &iter);

+		gtk_list_store_set(store, &iter, 0, bufaddr, 1, bufdata[0],

+			2, bufdata[1], 3, bufdata[2], 4, bufdata[3], 5, bufdata[4],

+			6, bufdata[5], 7, bufdata[6], 8, bufdata[7], 9, bufdata[8],

+			10, bufdata[9], 11, bufdata[10], 12, bufdata[11], 13, bufdata[12],

+			14, bufdata[13], 15, bufdata[14], 16, bufdata[15], 17, buftext, -1);

+

+		start += 16;

+	}

+

+	gtk_tree_view_set_model(GTK_TREE_VIEW(widget), GTK_TREE_MODEL(store));

+	g_object_unref(G_OBJECT(store));

+	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(widget), TRUE);

+	gtk_widget_show(widget);

+}

+

+static void MemView_Go() {

+	GtkWidget *widget;

+	GladeXML *xml;

+

+	xml = glade_get_widget_tree(MemViewDlg);

+	widget = glade_xml_get_widget(xml, "entry_address");

+

+	sscanf(gtk_entry_get_text(GTK_ENTRY(widget)), "%x", &MemViewAddress);

+

+	UpdateMemViewDlg();

+}

+

+static void MemView_Dump() {

+	GtkWidget *dlg;

+	GtkWidget *box, *table, *label, *start_edit, *length_edit;

+	char buf[10];

+

+	dlg = gtk_dialog_new_with_buttons(_("Memory Dump"), GTK_WINDOW(MemViewDlg),

+		GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,

+		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);

+

+	box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg)));

+

+	table = gtk_table_new(2, 2, FALSE);

+

+	label = gtk_label_new(_("Start Address (Hexadecimal):"));

+	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, 0, 0, 5, 5);

+	gtk_widget_show(label);

+

+	start_edit = gtk_entry_new_with_max_length(8);

+	sprintf(buf, "%.8X", MemViewAddress | 0x80000000);

+	gtk_entry_set_text(GTK_ENTRY(start_edit), buf);

+	gtk_table_attach(GTK_TABLE(table), start_edit, 1, 2, 0, 1, 0, 0, 5, 5);

+	gtk_widget_show(start_edit);

+

+	label = gtk_label_new(_("Length (Decimal):"));

+	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, 0, 0, 5, 5);

+	gtk_widget_show(label);

+

+	length_edit = gtk_entry_new();

+	gtk_table_attach(GTK_TABLE(table), length_edit, 1, 2, 1, 2, 0, 0, 5, 5);

+	gtk_widget_show(length_edit);

+

+	gtk_box_pack_start(GTK_BOX(box), table, FALSE, FALSE, 5);

+

+	gtk_window_set_position(GTK_WINDOW(dlg), GTK_WIN_POS_CENTER);

+	gtk_widget_show_all(dlg);

+

+	if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_ACCEPT) {

+		s32 start = 0, length = 0;

+

+		sscanf(gtk_entry_get_text(GTK_ENTRY(start_edit)), "%x", &start);

+		sscanf(gtk_entry_get_text(GTK_ENTRY(length_edit)), "%d", &length);

+

+		start &= 0x1fffff;

+

+		if (start + length > 0x1fffff) {

+			length = 0x1fffff - start;

+		}

+

+		if (length > 0) {

+			GtkWidget *file_chooser = gtk_file_chooser_dialog_new(_("Dump to File"),

+				NULL, GTK_FILE_CHOOSER_ACTION_SAVE,

+				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,

+				GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL);

+

+			gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(file_chooser), getenv("HOME"));

+

+			if (gtk_dialog_run(GTK_DIALOG(file_chooser)) == GTK_RESPONSE_ACCEPT) {

+				gchar *file = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(file_chooser));

+				FILE *fp = fopen(file, "wb");

+

+				if (fp != NULL) {

+					fwrite(&psxM[start], 1, length, fp);

+					fclose(fp);

+				} else {

+					SysMessage(_("Error writing to %s!"), file);

+				}

+

+				g_free(file);

+			}

+

+			gtk_widget_destroy(file_chooser);

+		}

+	}

+

+	gtk_widget_destroy(dlg);

+}

+

+static void MemView_Patch() {

+	GtkWidget *dlg;

+	GtkWidget *box, *table, *label, *addr_edit, *val_edit;

+	char buf[10];

+

+	dlg = gtk_dialog_new_with_buttons(_("Memory Patch"), GTK_WINDOW(MemViewDlg),

+		GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,

+		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);

+

+	box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg)));

+

+	table = gtk_table_new(2, 2, FALSE);

+

+	label = gtk_label_new(_("Address (Hexadecimal):"));

+	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, 0, 0, 5, 5);

+	gtk_widget_show(label);

+

+	addr_edit = gtk_entry_new_with_max_length(8);

+	sprintf(buf, "%.8X", MemViewAddress | 0x80000000);

+	gtk_entry_set_text(GTK_ENTRY(addr_edit), buf);

+	gtk_table_attach(GTK_TABLE(table), addr_edit, 1, 2, 0, 1, 0, 0, 5, 5);

+	gtk_widget_show(addr_edit);

+

+	label = gtk_label_new(_("Value (Hexa string):"));

+	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, 0, 0, 5, 5);

+	gtk_widget_show(label);

+

+	val_edit = gtk_entry_new();

+	gtk_table_attach(GTK_TABLE(table), val_edit, 1, 2, 1, 2, 0, 0, 5, 5);

+	gtk_widget_show(val_edit);

+

+	gtk_box_pack_start(GTK_BOX(box), table, FALSE, FALSE, 5);

+

+	gtk_window_set_position(GTK_WINDOW(dlg), GTK_WIN_POS_CENTER);

+	gtk_widget_show_all(dlg);

+

+	if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_ACCEPT) {

+		u32 addr = 0xffffffff, val = 0;

+		const char *p = gtk_entry_get_text(GTK_ENTRY(val_edit));

+		int r = strlen(p);

+

+		sscanf(gtk_entry_get_text(GTK_ENTRY(addr_edit)), "%x", &addr);

+

+		if (r > 0 && addr != 0xffffffff) {

+			addr &= 0x1fffff;

+			MemViewAddress = addr;

+

+			while (r > 0 && addr <= 0x1fffff) {

+				sscanf(p, "%2x", &val);

+				p += 2;

+				r -= 2;

+

+				while (r > 0 && (*p == '\t' || *p == ' ')) {

+					p++;

+					r--;

+				}

+

+				psxMemWrite8(addr, (u8)val);

+				addr++;

+			}

+

+			UpdateMemViewDlg();

+		}

+	}

+

+	gtk_widget_destroy(dlg);

+}

+

+// close the memory viewer window

+static void MemView_Close(GtkWidget *widget, gpointer user_data) {

+	gtk_widget_destroy(MemViewDlg);

+	MemViewDlg = NULL;

+}

+

+void RunDebugMemoryDialog() {

+	GladeXML *xml;

+	GtkWidget *widget;

+	GtkCellRenderer *renderer;

+	GtkTreeViewColumn *column;

+	PangoFontDescription *pfd;

+	int i;

+

+	xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "MemViewDlg", NULL);

+	if (!xml) {

+		g_warning(_("Error: Glade interface could not be loaded!"));

+		return;

+	}

+

+	MemViewDlg = glade_xml_get_widget(xml, "MemViewDlg");

+	gtk_window_set_title(GTK_WINDOW(MemViewDlg), _("Memory Viewer"));

+

+	widget = glade_xml_get_widget(xml, "GtkCList_MemView");

+

+	renderer = gtk_cell_renderer_text_new();

+	column = gtk_tree_view_column_new_with_attributes(_("Address"),

+		renderer, "text", 0, NULL);

+	gtk_tree_view_append_column(GTK_TREE_VIEW(widget), column);

+

+	for (i = 0; i < 16; i++) {

+		const char *p = "0123456789ABCDEF";

+		char buf[2];

+

+		buf[0] = p[i];

+		buf[1] = '\0';

+

+		renderer = gtk_cell_renderer_text_new();

+		column = gtk_tree_view_column_new_with_attributes(buf,

+			renderer, "text", i + 1, NULL);

+		gtk_tree_view_append_column(GTK_TREE_VIEW(widget), column);

+	}

+

+	renderer = gtk_cell_renderer_text_new();

+	column = gtk_tree_view_column_new_with_attributes(_("Text"),

+		renderer, "text", 17, NULL);

+	gtk_tree_view_append_column(GTK_TREE_VIEW(widget), column);

+

+	pfd = pango_font_description_from_string("Bitstream Vera Sans Mono, "

+		"DejaVu Sans Mono, Liberation Mono, FreeMono, Sans Mono 9");

+#if GTK_CHECK_VERSION(3, 0, 0)

+	gtk_widget_override_font(widget, pfd);

+#else

+	gtk_widget_modify_font(widget, pfd);

+#endif

+	pango_font_description_free(pfd);

+

+	UpdateMemViewDlg();

+

+	widget = glade_xml_get_widget(xml, "btn_dump");

+	g_signal_connect_data(GTK_OBJECT(widget), "clicked",

+		G_CALLBACK(MemView_Dump), xml, NULL, G_CONNECT_AFTER);

+

+	widget = glade_xml_get_widget(xml, "btn_patch");

+	g_signal_connect_data(GTK_OBJECT(widget), "clicked",

+		G_CALLBACK(MemView_Patch), xml, NULL, G_CONNECT_AFTER);

+

+	widget = glade_xml_get_widget(xml, "btn_go");

+	g_signal_connect_data(GTK_OBJECT(widget), "clicked",

+		G_CALLBACK(MemView_Go), xml, NULL, G_CONNECT_AFTER);

+

+	g_signal_connect_data(GTK_OBJECT(MemViewDlg), "response",

+		G_CALLBACK(MemView_Close), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);

+}