From 54dec469b8c2c7cfd7fbfe754e1da7482c9cef9b Mon Sep 17 00:00:00 2001 From: thoduv Date: Sun, 20 May 2007 20:56:36 +0000 Subject: [PATCH] - Gtk-Glade: Corrected ARM9/ARM7 swap in the IO regs view tool. Added DISPCAPCNT register in IO regs view. - MMU: Added Write32 for DISPCAPCNT register --- desmume/src/MMU.c | 8 + .../src/gtk-glade/dTools/callbacks_1_ioregs.c | 5 +- .../src/gtk-glade/glade/DeSmuMe_Dtools.glade | 1303 +++++++---------- 3 files changed, 545 insertions(+), 771 deletions(-) diff --git a/desmume/src/MMU.c b/desmume/src/MMU.c index 25a7fb2f4..5490adb36 100644 --- a/desmume/src/MMU.c +++ b/desmume/src/MMU.c @@ -2793,6 +2793,14 @@ void FASTCALL MMU_write32(u32 proc, u32 adr, u32 val) } return; + case REG_DISPA_DISPCAPCNT : + if(proc == ARMCPU_ARM9) + { + GPU_set_DISPCAPCNT(MainScreen.gpu,val); + T1WriteLong(ARM9Mem.ARM9_REG, 0x64, val); + } + return; + case REG_DISPA_BG0CNT : if (proc == ARMCPU_ARM9) { diff --git a/desmume/src/gtk-glade/dTools/callbacks_1_ioregs.c b/desmume/src/gtk-glade/dTools/callbacks_1_ioregs.c index 4d3b4fdab..94fca036a 100755 --- a/desmume/src/gtk-glade/dTools/callbacks_1_ioregs.c +++ b/desmume/src/gtk-glade/dTools/callbacks_1_ioregs.c @@ -33,7 +33,7 @@ static void update_regs_fast(); static void update_regs(); /* Register name list */ -#define NBR_IO_REGS 6 +#define NBR_IO_REGS 7 typedef struct { @@ -49,7 +49,8 @@ const reg_name_addr Reg_Names_Addr[NBR_IO_REGS] = { "REG_IME", REG_IME, TRUE }, { "REG_IE", REG_IE, FALSE }, { "REG_IF", REG_IF, FALSE }, - { "REG_POWCNT1", REG_POWCNT1, TRUE } + { "REG_POWCNT1", REG_POWCNT1, TRUE }, + { "REG_DISPCAPCNT", REG_DISPA_DISPCAPCNT, FALSE } }; /* update */ diff --git a/desmume/src/gtk-glade/glade/DeSmuMe_Dtools.glade b/desmume/src/gtk-glade/glade/DeSmuMe_Dtools.glade index 15eb9adf9..efc5b2fd3 100755 --- a/desmume/src/gtk-glade/glade/DeSmuMe_Dtools.glade +++ b/desmume/src/gtk-glade/glade/DeSmuMe_Dtools.glade @@ -1,772 +1,537 @@ - - - + + + - - - IO registers - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - True - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - 2 - 2 - False - 0 - 5 - - - - True - cpu : ARM7 -cpu : ARM9 - False - True - - - - 0 - 1 - 0 - 1 - fill - fill - - - - - - True - GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - 0 - 2 - 1 - 2 - fill - - - - - 0 - True - True - - - - - - - - memory viewer - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - DeSmuME.xpm - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - -7 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - 2 - 2 - False - 0 - 0 - - - - True - GTK_UPDATE_CONTINUOUS - False - 0 0 0 0 0 0 - - - - 1 - 2 - 1 - 2 - fill - fill - - - - - - True - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - - 0 - 1 - 1 - 2 - - - - - - True - False - 0 - - - - True - True - 8 bit - True - GTK_RELIEF_NORMAL - True - True - False - True - - - - 0 - False - False - - - - - - True - True - 16 bit - True - GTK_RELIEF_NORMAL - True - False - False - True - wtools_2_r8 - - - - 0 - False - False - - - - - - True - True - 32 bit - True - GTK_RELIEF_NORMAL - True - False - False - True - wtools_2_r8 - - - - 0 - False - False - - - - - - True - ARM9 cpu + + IO registers + True + GDK_WINDOW_TYPE_HINT_DIALOG + + + + + + True + + + True + 2 + 2 + 5 + + + + + + True + GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + + 2 + 1 + 2 + GTK_FILL + + + + + True + cpu : ARM9 +cpu : ARM7 + + + + GTK_FILL + GTK_FILL + + + + + 2 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-ok + True + -5 + + + + + False + GTK_PACK_END + + + + + + + memory viewer + DeSmuME.xpm + GDK_WINDOW_TYPE_HINT_DIALOG + + + + + + True + + + True + 2 + 2 + + + + + + True + + + True + True + 8 bit + True + True + True + + + + False + False + + + + + True + True + 16 bit + True + True + wtools_2_r8 + + + + False + False + 1 + + + + + True + True + 32 bit + True + True + wtools_2_r8 + + + + False + False + 2 + + + + + True + ARM9 cpu ARM7 cpu - False - True - - - - 0 - False - False - - - - - - True - GoTo: - False - False - GTK_JUSTIFY_RIGHT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - False - - - - - - True - True - True - True - 10 - 0x00000000 - True - ● - False - - - - - 0 - False - True - - - - - - True - True - Go! - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - 0 - 1 - 0 - 1 - fill - fill - - - - - 0 - True - True - - - - - - - - Palette Viewer - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - DeSmuME.xpm - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - -7 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - 2 - 3 - False - 0 - 0 - - - - True - False - - True - - - - 0 - 1 - 0 - 1 - fill - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 15 1 2 1 - - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - Palette : - False - False - GTK_JUSTIFY_RIGHT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 0 - 1 - fill - - - - - - - 256 - 256 - True - - - - 0 - 3 - 1 - 2 - - - - - - - 0 - True - True - - - - - - - - False - Tile viewer - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - -7 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - 3 - 4 - False - 0 - 0 - - - - True - - False - True - - - - 0 - 1 - 0 - 1 - fill - - - - - - 256 - 256 - GDK_EXPOSURE_MASK | GDK_STRUCTURE_MASK - - - - 0 - 3 - 2 - 3 - - - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 15 1 2 1 - - - - 3 - 4 - 0 - 1 - - - - - - - True - Palette : - False - False - GTK_JUSTIFY_RIGHT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - True - 16c - True - GTK_RELIEF_NORMAL - True - True - False - True - - - - 3 - 4 - 1 - 2 - fill - - - - - - - True - True - 256c - True - GTK_RELIEF_NORMAL - True - True - False - True - wtools_4_r16 - - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - True - BMP - True - GTK_RELIEF_NORMAL - True - True - False - True - wtools_4_r16 - - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - - False - True - - - - 0 - 1 - 1 - 2 - fill - - - - - 0 - True - True - - - - - - + + + + False + False + 3 + + + + + True + 0.000000 + GoTo: + GTK_JUSTIFY_RIGHT + + + False + 4 + + + + + True + True + 10 + ● + 0x00000000 + + + + + False + 5 + + + + + True + True + Go! + True + + + + False + False + 6 + + + + + GTK_FILL + GTK_FILL + + + + + True + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + + + 1 + 2 + + + + + True + 0 0 0 0 0 0 + + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + 2 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-close + True + -7 + + + + + False + GTK_PACK_END + + + + + + + Palette Viewer + DeSmuME.xpm + GDK_WINDOW_TYPE_HINT_DIALOG + + + + + + True + + + True + 2 + 3 + + + 256 + 256 + True + + + + 3 + 1 + 2 + + + + + + + True + 0.000000 + Palette : + GTK_JUSTIFY_RIGHT + + + 1 + 2 + GTK_FILL + + + + + + True + True + 0 0 15 1 2 1 + 1 + + + + 2 + 3 + GTK_FILL + + + + + + True + + + + + GTK_FILL + + + + + 2 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-close + True + -7 + + + + + False + GTK_PACK_END + + + + + + + Tile viewer + False + GDK_WINDOW_TYPE_HINT_DIALOG + + + + + + True + + + True + 3 + 4 + + + + + + + + + True + + + + + 1 + 2 + GTK_FILL + + + + + True + True + BMP + True + True + True + wtools_4_r16 + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + True + True + 256c + True + True + True + wtools_4_r16 + + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + + True + True + 16c + True + True + True + + + + 3 + 4 + 1 + 2 + GTK_FILL + + + + + + True + 0.000000 + Palette : + GTK_JUSTIFY_RIGHT + + + 2 + 3 + GTK_FILL + + + + + + True + True + 0 0 15 1 2 1 + 1 + + + + 3 + 4 + + + + + + 256 + 256 + GDK_EXPOSURE_MASK | GDK_STRUCTURE_MASK + + + + 3 + 2 + 3 + + + + + + + True + + + + + GTK_FILL + + + + + 2 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-close + True + -7 + + + + + False + GTK_PACK_END + + + + +