From 057703e5296b3df5bc6b7c2c4e0d8f507dd239dd Mon Sep 17 00:00:00 2001 From: zeromus Date: Mon, 3 Aug 2009 02:15:35 +0000 Subject: [PATCH] fix linux compile, and some warnings --- desmume/ChangeLog | 1 + desmume/src/ctrlssdl.cpp | 10 ++-- .../gtk-glade/dTools/callbacks_3_palview.cpp | 40 +++++++------- .../gtk-glade/dTools/callbacks_4_tileview.cpp | 52 +++++++++---------- desmume/src/mc.cpp | 6 +-- 5 files changed, 55 insertions(+), 54 deletions(-) diff --git a/desmume/ChangeLog b/desmume/ChangeLog index 4f976ffc4..0412eda5f 100644 --- a/desmume/ChangeLog +++ b/desmume/ChangeLog @@ -23,6 +23,7 @@ Graphics: bug: fix color overflow in capture blending bug: fix disp fifo capture bug: fix simultaneous vram display and capture via same bank + bug: change 3d cores to use 18bit color bug: swrast: add clear image and scroll emulation bug: swrast: add fog emulation bug: swrast: fixes to shadow rendering diff --git a/desmume/src/ctrlssdl.cpp b/desmume/src/ctrlssdl.cpp index 6da156352..5c85f4c81 100644 --- a/desmume/src/ctrlssdl.cpp +++ b/desmume/src/ctrlssdl.cpp @@ -293,12 +293,12 @@ void set_mouse_coord(signed long x,signed long y) void update_keypad(u16 keys) { #ifdef WORDS_BIGENDIAN - ARM9Mem.ARM9_REG[0x130] = ~keys & 0xFF; - ARM9Mem.ARM9_REG[0x131] = (~keys >> 8) & 0x3; + MMU.ARM9_REG[0x130] = ~keys & 0xFF; + MMU.ARM9_REG[0x131] = (~keys >> 8) & 0x3; MMU.ARM7_REG[0x130] = ~keys & 0xFF; MMU.ARM7_REG[0x131] = (~keys >> 8) & 0x3; #else - ((u16 *)ARM9Mem.ARM9_REG)[0x130>>1] = ~keys & 0x3FF; + ((u16 *)MMU.ARM9_REG)[0x130>>1] = ~keys & 0x3FF; ((u16 *)MMU.ARM7_REG)[0x130>>1] = ~keys & 0x3FF; #endif /* Update X and Y buttons */ @@ -312,9 +312,9 @@ u16 get_keypad( void) keypad = ~MMU.ARM7_REG[0x136]; keypad = (keypad & 0x3) << 10; #ifdef WORDS_BIGENDIAN - keypad |= ~(ARM9Mem.ARM9_REG[0x130] | (ARM9Mem.ARM9_REG[0x131] << 8)) & 0x3FF; + keypad |= ~(MMU.ARM9_REG[0x130] | (MMU.ARM9_REG[0x131] << 8)) & 0x3FF; #else - keypad |= ~((u16 *)ARM9Mem.ARM9_REG)[0x130>>1] & 0x3FF; + keypad |= ~((u16 *)MMU.ARM9_REG)[0x130>>1] & 0x3FF; #endif return keypad; } diff --git a/desmume/src/gtk-glade/dTools/callbacks_3_palview.cpp b/desmume/src/gtk-glade/dTools/callbacks_3_palview.cpp index 85dcba76d..ca03496b4 100755 --- a/desmume/src/gtk-glade/dTools/callbacks_3_palview.cpp +++ b/desmume/src/gtk-glade/dTools/callbacks_3_palview.cpp @@ -33,26 +33,26 @@ void init_combo_palette(GtkComboBox *combo, u16 ** addresses) { gtk_list_store_set (model, &iter, 0, str,-1); \ addresses[i]=((u16*)(addr) r); i++; - DO("Main screen BG PAL", ARM9Mem.ARM9_VMEM,) - DO("Main screen SPR PAL", ARM9Mem.ARM9_VMEM,+0x100) - DO("Sub screen BG PAL", ARM9Mem.ARM9_VMEM,+0x200) - DO("Sub screen SPR PAL", ARM9Mem.ARM9_VMEM,+0x300) - DO("Main screen ExtPAL 0", ARM9Mem.ExtPal[0][0],) - DO("Main screen ExtPAL 1", ARM9Mem.ExtPal[0][1],) - DO("Main screen ExtPAL 2", ARM9Mem.ExtPal[0][2],) - DO("Main screen ExtPAL 3", ARM9Mem.ExtPal[0][3],) - DO("Sub screen ExtPAL 0", ARM9Mem.ExtPal[1][0],) - DO("Sub screen ExtPAL 1", ARM9Mem.ExtPal[1][1],) - DO("Sub screen ExtPAL 2", ARM9Mem.ExtPal[1][2],) - DO("Sub screen ExtPAL 3", ARM9Mem.ExtPal[1][3],) - DO("Main screen SPR ExtPAL 0", ARM9Mem.ObjExtPal[0][0],) - DO("Main screen SPR ExtPAL 1", ARM9Mem.ObjExtPal[0][1],) - DO("Sub screen SPR ExtPAL 0", ARM9Mem.ObjExtPal[1][0],) - DO("Sub screen SPR ExtPAL 1", ARM9Mem.ObjExtPal[1][1],) - DO("Texture PAL 0", ARM9Mem.texInfo.texPalSlot[0],) - DO("Texture PAL 1", ARM9Mem.texInfo.texPalSlot[1],) - DO("Texture PAL 2", ARM9Mem.texInfo.texPalSlot[2],) - DO("Texture PAL 3", ARM9Mem.texInfo.texPalSlot[3],) + DO("Main screen BG PAL", MMU.ARM9_VMEM,) + DO("Main screen SPR PAL", MMU.ARM9_VMEM,+0x100) + DO("Sub screen BG PAL", MMU.ARM9_VMEM,+0x200) + DO("Sub screen SPR PAL", MMU.ARM9_VMEM,+0x300) + DO("Main screen ExtPAL 0", MMU.ExtPal[0][0],) + DO("Main screen ExtPAL 1", MMU.ExtPal[0][1],) + DO("Main screen ExtPAL 2", MMU.ExtPal[0][2],) + DO("Main screen ExtPAL 3", MMU.ExtPal[0][3],) + DO("Sub screen ExtPAL 0", MMU.ExtPal[1][0],) + DO("Sub screen ExtPAL 1", MMU.ExtPal[1][1],) + DO("Sub screen ExtPAL 2", MMU.ExtPal[1][2],) + DO("Sub screen ExtPAL 3", MMU.ExtPal[1][3],) + DO("Main screen SPR ExtPAL 0", MMU.ObjExtPal[0][0],) + DO("Main screen SPR ExtPAL 1", MMU.ObjExtPal[0][1],) + DO("Sub screen SPR ExtPAL 0", MMU.ObjExtPal[1][0],) + DO("Sub screen SPR ExtPAL 1", MMU.ObjExtPal[1][1],) + DO("Texture PAL 0", MMU.texInfo.texPalSlot[0],) + DO("Texture PAL 1", MMU.texInfo.texPalSlot[1],) + DO("Texture PAL 2", MMU.texInfo.texPalSlot[2],) + DO("Texture PAL 3", MMU.texInfo.texPalSlot[3],) #undef DO gtk_combo_box_set_active(combo,0); } diff --git a/desmume/src/gtk-glade/dTools/callbacks_4_tileview.cpp b/desmume/src/gtk-glade/dTools/callbacks_4_tileview.cpp index dbf979c09..dda41d575 100755 --- a/desmume/src/gtk-glade/dTools/callbacks_4_tileview.cpp +++ b/desmume/src/gtk-glade/dTools/callbacks_4_tileview.cpp @@ -35,36 +35,36 @@ void init_combo_memory(GtkComboBox *combo, u8 ** addresses) { addresses[i]=(addr r); i++; // FIXME: update tileview to actually work -// DO("A-BG - 0x6000000",ARM9Mem.ARM9_ABG,) -// DO("A-BG - 0x6010000",ARM9Mem.ARM9_ABG,+0x10000) -// DO("A-BG - 0x6020000",ARM9Mem.ARM9_ABG,+0x20000) -// DO("A-BG - 0x6030000",ARM9Mem.ARM9_ABG,+0x30000) -// DO("A-BG - 0x6040000",ARM9Mem.ARM9_ABG,+0x40000) -// DO("A-BG - 0x6050000",ARM9Mem.ARM9_ABG,+0x50000) -// DO("A-BG - 0x6060000",ARM9Mem.ARM9_ABG,+0x60000) -// DO("A-BG - 0x6070000",ARM9Mem.ARM9_ABG,+0x70000) +// DO("A-BG - 0x6000000",MMU.ARM9_ABG,) +// DO("A-BG - 0x6010000",MMU.ARM9_ABG,+0x10000) +// DO("A-BG - 0x6020000",MMU.ARM9_ABG,+0x20000) +// DO("A-BG - 0x6030000",MMU.ARM9_ABG,+0x30000) +// DO("A-BG - 0x6040000",MMU.ARM9_ABG,+0x40000) +// DO("A-BG - 0x6050000",MMU.ARM9_ABG,+0x50000) +// DO("A-BG - 0x6060000",MMU.ARM9_ABG,+0x60000) +// DO("A-BG - 0x6070000",MMU.ARM9_ABG,+0x70000) -// DO("B-BG - 0x6200000",ARM9Mem.ARM9_BBG,) -// DO("B-BG - 0x6210000",ARM9Mem.ARM9_BBG,+0x10000) +// DO("B-BG - 0x6200000",MMU.ARM9_BBG,) +// DO("B-BG - 0x6210000",MMU.ARM9_BBG,+0x10000) -// DO("A-OBJ- 0x6400000",ARM9Mem.ARM9_AOBJ,) -// DO("A-OBJ- 0x6410000",ARM9Mem.ARM9_AOBJ,+0x10000) -// DO("A-OBJ- 0x6420000",ARM9Mem.ARM9_AOBJ,+0x20000) -// DO("A-OBJ- 0x6430000",ARM9Mem.ARM9_AOBJ,+0x30000) +// DO("A-OBJ- 0x6400000",MMU.ARM9_AOBJ,) +// DO("A-OBJ- 0x6410000",MMU.ARM9_AOBJ,+0x10000) +// DO("A-OBJ- 0x6420000",MMU.ARM9_AOBJ,+0x20000) +// DO("A-OBJ- 0x6430000",MMU.ARM9_AOBJ,+0x30000) -// DO("B-OBJ- 0x6600000",ARM9Mem.ARM9_BOBJ,) -// DO("B-OBJ- 0x6610000",ARM9Mem.ARM9_BOBJ,+0x10000) +// DO("B-OBJ- 0x6600000",MMU.ARM9_BOBJ,) +// DO("B-OBJ- 0x6610000",MMU.ARM9_BOBJ,+0x10000) - DO("LCD - 0x6800000",ARM9Mem.ARM9_LCD,) - DO("LCD - 0x6810000",ARM9Mem.ARM9_LCD,+0x10000) - DO("LCD - 0x6820000",ARM9Mem.ARM9_LCD,+0x20000) - DO("LCD - 0x6830000",ARM9Mem.ARM9_LCD,+0x30000) - DO("LCD - 0x6840000",ARM9Mem.ARM9_LCD,+0x40000) - DO("LCD - 0x6850000",ARM9Mem.ARM9_LCD,+0x50000) - DO("LCD - 0x6860000",ARM9Mem.ARM9_LCD,+0x60000) - DO("LCD - 0x6870000",ARM9Mem.ARM9_LCD,+0x70000) - DO("LCD - 0x6880000",ARM9Mem.ARM9_LCD,+0x80000) - DO("LCD - 0x6890000",ARM9Mem.ARM9_LCD,+0x90000) + DO("LCD - 0x6800000",MMU.ARM9_LCD,) + DO("LCD - 0x6810000",MMU.ARM9_LCD,+0x10000) + DO("LCD - 0x6820000",MMU.ARM9_LCD,+0x20000) + DO("LCD - 0x6830000",MMU.ARM9_LCD,+0x30000) + DO("LCD - 0x6840000",MMU.ARM9_LCD,+0x40000) + DO("LCD - 0x6850000",MMU.ARM9_LCD,+0x50000) + DO("LCD - 0x6860000",MMU.ARM9_LCD,+0x60000) + DO("LCD - 0x6870000",MMU.ARM9_LCD,+0x70000) + DO("LCD - 0x6880000",MMU.ARM9_LCD,+0x80000) + DO("LCD - 0x6890000",MMU.ARM9_LCD,+0x90000) #undef DO gtk_combo_box_set_active(combo,0); } diff --git a/desmume/src/mc.cpp b/desmume/src/mc.cpp index 7b5df7661..e9d105021 100644 --- a/desmume/src/mc.cpp +++ b/desmume/src/mc.cpp @@ -583,7 +583,7 @@ int no_gba_unpackSAV(void *in_buf, u32 fsize, void *out_buf, u32 &size) { size_unpacked = *((u32*)(src+0x48)); src_pos = 0x4C; - for (int i = 0; i < size_unpacked; i++) + for (u32 i = 0; i < size_unpacked; i++) { dst[dst_pos++] = src[src_pos++]; } @@ -661,7 +661,7 @@ u32 no_gba_fillLeft(u32 size) { for (int i = 1; i < ARRAY_SIZE(save_types); i++) { - if (size <= save_types[i][1]) + if (size <= (int)save_types[i][1]) return (size + (save_types[i][1] - size)); } return size; @@ -702,7 +702,7 @@ bool BackupDevice::load_no_gba(const char *fname) //printf("--- new size after fill %i byte(s)\n", size); raw_applyUserSettings(size); data.resize(size); - for (int tt = 0; tt < size; tt++) + for (u32 tt = 0; tt < size; tt++) data[tt] = out_buf[tt]; //dump back out as a dsv, just to keep things sane