|
From: <bla...@us...> - 2008-07-22 05:53:09
|
Revision: 19069
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19069&view=rev
Author: blackystardust
Date: 2008-07-22 05:53:17 +0000 (Tue, 22 Jul 2008)
Log Message:
-----------
Fixed alot of msvc warnings.
Modified Paths:
--------------
branches/viceplus/v2.0-x64dtv/vice/src/6510core.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvui.c
branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/make-msvc-bindist.bat
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvblitter.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvcpu.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvdma.c
branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvmem.c
branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c
Modified: branches/viceplus/v2.0-x64dtv/vice/src/6510core.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/6510core.c 2008-07-21 21:37:42 UTC (rev 19068)
+++ branches/viceplus/v2.0-x64dtv/vice/src/6510core.c 2008-07-22 05:53:17 UTC (rev 19069)
@@ -583,20 +583,20 @@
INC_PC(pc_inc); \
} while (0)
-#define ANC(value, pc_inc) \
- do { \
- reg_a_write = reg_a_read & (value); \
- LOCAL_SET_NZ(reg_a_read); \
- LOCAL_SET_CARRY(LOCAL_SIGN()); \
- INC_PC(pc_inc); \
+#define ANC(value, pc_inc) \
+ do { \
+ reg_a_write = (BYTE)(reg_a_read & (value)); \
+ LOCAL_SET_NZ(reg_a_read); \
+ LOCAL_SET_CARRY(LOCAL_SIGN()); \
+ INC_PC(pc_inc); \
} while (0)
-#define AND(value, clk_inc, pc_inc) \
- do { \
- reg_a_write = reg_a_read & (value); \
- LOCAL_SET_NZ(reg_a_read); \
- CLK_ADD(CLK, (clk_inc)); \
- INC_PC(pc_inc); \
+#define AND(value, clk_inc, pc_inc) \
+ do { \
+ reg_a_write = (BYTE)(reg_a_read & (value)); \
+ LOCAL_SET_NZ(reg_a_read); \
+ CLK_ADD(CLK, (clk_inc)); \
+ INC_PC(pc_inc); \
} while (0)
#define ANE(value, pc_inc) \
@@ -857,12 +857,12 @@
INC_PC(1); \
} while (0)
-#define EOR(value, clk_inc, pc_inc) \
- do { \
- reg_a_write = reg_a_read ^ (value); \
- LOCAL_SET_NZ(reg_a_read); \
- CLK_ADD(CLK, (clk_inc)); \
- INC_PC(pc_inc); \
+#define EOR(value, clk_inc, pc_inc) \
+ do { \
+ reg_a_write = (BYTE)(reg_a_read ^ (value)); \
+ LOCAL_SET_NZ(reg_a_read); \
+ CLK_ADD(CLK, (clk_inc)); \
+ INC_PC(pc_inc); \
} while (0)
#define INC(addr, clk_inc, pc_inc, load_func, store_func) \
@@ -1026,12 +1026,12 @@
INC_PC(pc_inc); \
} while (0)
-#define ORA(value, clk_inc, pc_inc) \
- do { \
- reg_a_write = reg_a_read | (value); \
- LOCAL_SET_NZ(reg_a_write); \
- CLK_ADD(CLK, (clk_inc)); \
- INC_PC(pc_inc); \
+#define ORA(value, clk_inc, pc_inc) \
+ do { \
+ reg_a_write = (BYTE)(reg_a_read | (value)); \
+ LOCAL_SET_NZ(reg_a_write); \
+ CLK_ADD(CLK, (clk_inc)); \
+ INC_PC(pc_inc); \
} while (0)
#define NOOP(clk_inc, pc_inc) \
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvui.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvui.c 2008-07-21 21:37:42 UTC (rev 19068)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/c64dtvui.c 2008-07-22 05:53:17 UTC (rev 19069)
@@ -1,162 +1,163 @@
-/*
- * c64ui.c - C64-specific user interface.
- *
- * Written by
- * Andreas Boose <vic...@t-...>
- * Ettore Perazzoli <et...@co...>
- * Tibor Biczo <cr...@ax...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#include "vice.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <windows.h>
-
-#include "c64ui.h"
-#include "res.h"
-#include "translate.h"
-#include "ui.h"
-#include "uic64dtv.h"
-#include "uidrivec64.h"
-#include "uikeyboard.h"
-#include "uirom.h"
-#include "uirs232user.h"
-#include "uisid.h"
-#include "uivicii.h"
-#include "uivideo.h"
-
-static const unsigned int romset_dialog_resources[UIROM_TYPE_MAX] = {
- IDD_C64ROM_RESOURCE_DIALOG,
- IDD_C64ROMDRIVE_RESOURCE_DIALOG,
- 0 };
-
-
-static const ui_menu_toggle_t c64dtv_ui_menu_toggles[] = {
- { "EmuID", IDM_TOGGLE_EMUID },
- { "VICIIDoubleSize", IDM_TOGGLE_DOUBLESIZE },
- { "VICIIDoubleScan", IDM_TOGGLE_DOUBLESCAN },
- { "VICIIScale2x", IDM_TOGGLE_SCALE2X },
- { "PALEmulation", IDM_TOGGLE_FASTPAL },
- { "VICIIVideoCache", IDM_TOGGLE_VIDEOCACHE },
- { "PS2Mouse", IDM_PS2MOUSE },
- { "Mouse", IDM_MOUSE },
- { "FlashTrueFS", IDM_TOGGLE_FLASH_TRUE_FILESYSTEM },
- { NULL, 0 }
-};
-
-static const uirom_settings_t uirom_settings[] = {
- { UIROM_TYPE_MAIN, TEXT("Kernal"), "KernalName",
- IDC_C64ROM_KERNAL_FILE, IDC_C64ROM_KERNAL_BROWSE,
- IDC_C64ROM_KERNAL_RESOURCE },
- { UIROM_TYPE_MAIN, TEXT("Basic"), "BasicName",
- IDC_C64ROM_BASIC_FILE, IDC_C64ROM_BASIC_BROWSE,
- IDC_C64ROM_BASIC_RESOURCE },
- { UIROM_TYPE_MAIN, TEXT("Character"), "ChargenName",
- IDC_C64ROM_CHARGEN_FILE, IDC_C64ROM_CHARGEN_BROWSE,
- IDC_C64ROM_CHARGEN_RESOURCE },
- { UIROM_TYPE_DRIVE, TEXT("1541"), "DosName1541",
- IDC_DRIVEROM_1541_FILE, IDC_DRIVEROM_1541_BROWSE,
- IDC_DRIVEROM_1541_RESOURCE },
- { UIROM_TYPE_DRIVE, TEXT("1541-II"), "DosName1541ii",
- IDC_DRIVEROM_1541II_FILE, IDC_DRIVEROM_1541II_BROWSE,
- IDC_DRIVEROM_1541II_RESOURCE },
- { UIROM_TYPE_DRIVE, TEXT("1570"), "DosName1570",
- IDC_DRIVEROM_1570_FILE, IDC_DRIVEROM_1570_BROWSE,
- IDC_DRIVEROM_1570_RESOURCE },
- { UIROM_TYPE_DRIVE, TEXT("1571"), "DosName1571",
- IDC_DRIVEROM_1571_FILE, IDC_DRIVEROM_1571_BROWSE,
- IDC_DRIVEROM_1571_RESOURCE },
- { UIROM_TYPE_DRIVE, TEXT("1581"), "DosName1581",
- IDC_DRIVEROM_1581_FILE, IDC_DRIVEROM_1581_BROWSE,
- IDC_DRIVEROM_1581_RESOURCE },
- { 0, NULL, NULL, 0, 0, 0 }
-};
-
-#define C64DTVUI_KBD_NUM_MAP 3
-
-static const uikeyboard_mapping_entry_t mapping_entry[C64DTVUI_KBD_NUM_MAP] = {
- { IDC_C64KBD_MAPPING_SELECT_SYM, IDC_C64KBD_MAPPING_SYM,
- IDC_C64KBD_MAPPING_SYM_BROWSE, "KeymapSymFile" },
- { IDC_C64KBD_MAPPING_SELECT_POS, IDC_C64KBD_MAPPING_POS,
- IDC_C64KBD_MAPPING_POS_BROWSE, "KeymapPosFile" },
- { IDC_C64KBD_MAPPING_SELECT_SYMDE, IDC_C64KBD_MAPPING_SYMDE,
- IDC_C64KBD_MAPPING_SYMDE_BROWSE, "KeymapSymDeFile" }
-};
-
-static uikeyboard_config_t uikeyboard_config =
- { IDD_C64KBD_MAPPING_SETTINGS_DIALOG, C64DTVUI_KBD_NUM_MAP, mapping_entry,
- IDC_C64KBD_MAPPING_DUMP };
-
-
-static void c64dtv_ui_specific(WPARAM wparam, HWND hwnd)
-{
- switch (wparam) {
- case IDM_VICII_SETTINGS:
- ui_vicii_settings_dialog(hwnd);
- break;
- case IDM_SID_SETTINGS:
- ui_sid_settings_dialog(hwnd);
- break;
- case IDM_ROM_SETTINGS:
- uirom_settings_dialog(hwnd, translate_res(IDD_C64ROM_SETTINGS_DIALOG),
- translate_res(IDD_C64DRIVEROM_SETTINGS_DIALOG),
- romset_dialog_resources, uirom_settings);
- break;
- case IDM_VIDEO_SETTINGS:
- ui_video_settings_dialog(hwnd, UI_VIDEO_CHIP_VICII, UI_VIDEO_CHIP_NONE);
- break;
- case IDM_DRIVE_SETTINGS:
- uidrivec64_settings_dialog(hwnd);
- break;
- case IDM_RS232USER_SETTINGS:
- ui_rs232user_settings_dialog(hwnd);
- break;
- case IDM_KEYBOARD_SETTINGS:
- uikeyboard_settings_dialog(hwnd, &uikeyboard_config);
- break;
- case IDM_ATTACH_DTV_FLASH:
- ui_c64dtv_attach_flash_dialog(hwnd);
- break;
- case IDM_DETACH_DTV_FLASH:
- resources_set_string("c64dtvromfilename", "");
- break;
- case IDM_CREATE_DTV_FLASH:
- ui_c64dtv_create_flash_dialog(hwnd);
- break;
- case IDM_C64DTV_SETTINGS:
- ui_c64dtv_settings_dialog(hwnd);
- break;
- }
-}
-
-int c64dtvui_init(void)
-{
- ui_register_machine_specific(c64dtv_ui_specific);
- ui_register_menu_toggles(c64dtv_ui_menu_toggles);
-
- return 0;
-}
-
-void c64dtvui_shutdown(void)
-{
-}
+/*
+ * c64ui.c - C64-specific user interface.
+ *
+ * Written by
+ * Andreas Boose <vic...@t-...>
+ * Ettore Perazzoli <et...@co...>
+ * Tibor Biczo <cr...@ax...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include "vice.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <windows.h>
+
+#include "c64ui.h"
+#include "res.h"
+#include "resources.h"
+#include "translate.h"
+#include "ui.h"
+#include "uic64dtv.h"
+#include "uidrivec64.h"
+#include "uikeyboard.h"
+#include "uirom.h"
+#include "uirs232user.h"
+#include "uisid.h"
+#include "uivicii.h"
+#include "uivideo.h"
+
+static const unsigned int romset_dialog_resources[UIROM_TYPE_MAX] = {
+ IDD_C64ROM_RESOURCE_DIALOG,
+ IDD_C64ROMDRIVE_RESOURCE_DIALOG,
+ 0 };
+
+
+static const ui_menu_toggle_t c64dtv_ui_menu_toggles[] = {
+ { "EmuID", IDM_TOGGLE_EMUID },
+ { "VICIIDoubleSize", IDM_TOGGLE_DOUBLESIZE },
+ { "VICIIDoubleScan", IDM_TOGGLE_DOUBLESCAN },
+ { "VICIIScale2x", IDM_TOGGLE_SCALE2X },
+ { "PALEmulation", IDM_TOGGLE_FASTPAL },
+ { "VICIIVideoCache", IDM_TOGGLE_VIDEOCACHE },
+ { "PS2Mouse", IDM_PS2MOUSE },
+ { "Mouse", IDM_MOUSE },
+ { "FlashTrueFS", IDM_TOGGLE_FLASH_TRUE_FILESYSTEM },
+ { NULL, 0 }
+};
+
+static const uirom_settings_t uirom_settings[] = {
+ { UIROM_TYPE_MAIN, TEXT("Kernal"), "KernalName",
+ IDC_C64ROM_KERNAL_FILE, IDC_C64ROM_KERNAL_BROWSE,
+ IDC_C64ROM_KERNAL_RESOURCE },
+ { UIROM_TYPE_MAIN, TEXT("Basic"), "BasicName",
+ IDC_C64ROM_BASIC_FILE, IDC_C64ROM_BASIC_BROWSE,
+ IDC_C64ROM_BASIC_RESOURCE },
+ { UIROM_TYPE_MAIN, TEXT("Character"), "ChargenName",
+ IDC_C64ROM_CHARGEN_FILE, IDC_C64ROM_CHARGEN_BROWSE,
+ IDC_C64ROM_CHARGEN_RESOURCE },
+ { UIROM_TYPE_DRIVE, TEXT("1541"), "DosName1541",
+ IDC_DRIVEROM_1541_FILE, IDC_DRIVEROM_1541_BROWSE,
+ IDC_DRIVEROM_1541_RESOURCE },
+ { UIROM_TYPE_DRIVE, TEXT("1541-II"), "DosName1541ii",
+ IDC_DRIVEROM_1541II_FILE, IDC_DRIVEROM_1541II_BROWSE,
+ IDC_DRIVEROM_1541II_RESOURCE },
+ { UIROM_TYPE_DRIVE, TEXT("1570"), "DosName1570",
+ IDC_DRIVEROM_1570_FILE, IDC_DRIVEROM_1570_BROWSE,
+ IDC_DRIVEROM_1570_RESOURCE },
+ { UIROM_TYPE_DRIVE, TEXT("1571"), "DosName1571",
+ IDC_DRIVEROM_1571_FILE, IDC_DRIVEROM_1571_BROWSE,
+ IDC_DRIVEROM_1571_RESOURCE },
+ { UIROM_TYPE_DRIVE, TEXT("1581"), "DosName1581",
+ IDC_DRIVEROM_1581_FILE, IDC_DRIVEROM_1581_BROWSE,
+ IDC_DRIVEROM_1581_RESOURCE },
+ { 0, NULL, NULL, 0, 0, 0 }
+};
+
+#define C64DTVUI_KBD_NUM_MAP 3
+
+static const uikeyboard_mapping_entry_t mapping_entry[C64DTVUI_KBD_NUM_MAP] = {
+ { IDC_C64KBD_MAPPING_SELECT_SYM, IDC_C64KBD_MAPPING_SYM,
+ IDC_C64KBD_MAPPING_SYM_BROWSE, "KeymapSymFile" },
+ { IDC_C64KBD_MAPPING_SELECT_POS, IDC_C64KBD_MAPPING_POS,
+ IDC_C64KBD_MAPPING_POS_BROWSE, "KeymapPosFile" },
+ { IDC_C64KBD_MAPPING_SELECT_SYMDE, IDC_C64KBD_MAPPING_SYMDE,
+ IDC_C64KBD_MAPPING_SYMDE_BROWSE, "KeymapSymDeFile" }
+};
+
+static uikeyboard_config_t uikeyboard_config =
+ { IDD_C64KBD_MAPPING_SETTINGS_DIALOG, C64DTVUI_KBD_NUM_MAP, mapping_entry,
+ IDC_C64KBD_MAPPING_DUMP };
+
+
+static void c64dtv_ui_specific(WPARAM wparam, HWND hwnd)
+{
+ switch (wparam) {
+ case IDM_VICII_SETTINGS:
+ ui_vicii_settings_dialog(hwnd);
+ break;
+ case IDM_SID_SETTINGS:
+ ui_sid_settings_dialog(hwnd);
+ break;
+ case IDM_ROM_SETTINGS:
+ uirom_settings_dialog(hwnd, translate_res(IDD_C64ROM_SETTINGS_DIALOG),
+ translate_res(IDD_C64DRIVEROM_SETTINGS_DIALOG),
+ romset_dialog_resources, uirom_settings);
+ break;
+ case IDM_VIDEO_SETTINGS:
+ ui_video_settings_dialog(hwnd, UI_VIDEO_CHIP_VICII, UI_VIDEO_CHIP_NONE);
+ break;
+ case IDM_DRIVE_SETTINGS:
+ uidrivec64_settings_dialog(hwnd);
+ break;
+ case IDM_RS232USER_SETTINGS:
+ ui_rs232user_settings_dialog(hwnd);
+ break;
+ case IDM_KEYBOARD_SETTINGS:
+ uikeyboard_settings_dialog(hwnd, &uikeyboard_config);
+ break;
+ case IDM_ATTACH_DTV_FLASH:
+ ui_c64dtv_attach_flash_dialog(hwnd);
+ break;
+ case IDM_DETACH_DTV_FLASH:
+ resources_set_string("c64dtvromfilename", "");
+ break;
+ case IDM_CREATE_DTV_FLASH:
+ ui_c64dtv_create_flash_dialog(hwnd);
+ break;
+ case IDM_C64DTV_SETTINGS:
+ ui_c64dtv_settings_dialog(hwnd);
+ break;
+ }
+}
+
+int c64dtvui_init(void)
+{
+ ui_register_machine_specific(c64dtv_ui_specific);
+ ui_register_menu_toggles(c64dtv_ui_menu_toggles);
+
+ return 0;
+}
+
+void c64dtvui_shutdown(void)
+{
+}
Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/make-msvc-bindist.bat
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/make-msvc-bindist.bat 2008-07-21 21:37:42 UTC (rev 19068)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/win32/make-msvc-bindist.bat 2008-07-22 05:53:17 UTC (rev 19069)
@@ -1,6 +1,7 @@
@echo off
set VICEDIR=WinVICE-2.0
if not exist ..\..\..\data\x64.exe goto missingmsvc
+if not exist ..\..\..\data\x64dtv.exe goto missingmsvc
if not exist ..\..\..\data\x128.exe goto missingmsvc
if not exist ..\..\..\data\xcbm2.exe goto missingmsvc
if not exist ..\..\..\data\xpet.exe goto missingmsvc
@@ -13,6 +14,7 @@
if exist %VICEDIR% goto removedir
mkdir %VICEDIR%
copy ..\..\..\data\x64.exe %VICEDIR%
+copy ..\..\..\data\x64dtv.exe %VICEDIR%
copy ..\..\..\data\x128.exe %VICEDIR%
copy ..\..\..\data\xvic.exe %VICEDIR%
copy ..\..\..\data\xpet.exe %VICEDIR%
@@ -36,6 +38,14 @@
copy ..\..\..\data\C64\*.vrs %VICEDIR%\C64
copy ..\..\..\data\C64\kernal %VICEDIR%\C64
copy ..\..\..\data\C64\win_*.v* %VICEDIR%\C64
+mkdir %VICEDIR%\C64DTV
+copy ..\..\..\data\C64\basic %VICEDIR%\C64DTV
+copy ..\..\..\data\C64\*.vpl %VICEDIR%\C64DTV
+copy ..\..\..\data\C64\c64mem.sym %VICEDIR%\C64DTV
+copy ..\..\..\data\C64\chargen %VICEDIR%\C64DTV
+copy ..\..\..\data\C64\*.vrs %VICEDIR%\C64DTV
+copy ..\..\..\data\C64\kernal %VICEDIR%\C64DTV
+copy ..\..\..\data\C64\win_*.v* %VICEDIR%\C64DTV
mkdir %VICEDIR%\CBM-II
copy ..\..\..\data\CBM-II\*.vpl %VICEDIR%\CBM-II
copy ..\..\..\data\CBM-II\basic.* %VICEDIR%\CBM-II
Modified: branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvblitter.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvblitter.c 2008-07-21 21:37:42 UTC (rev 19068)
+++ branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvblitter.c 2008-07-22 05:53:17 UTC (rev 19069)
@@ -485,7 +485,7 @@
addr &= 0x3f;
- if (addr & 0x20) c64dtv_blitter_store(addr & 0x1f, value);
+ if (addr & 0x20) c64dtv_blitter_store((WORD)(addr & 0x1f), value);
else c64dtv_dma_store(addr, value);
}
Modified: branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvcpu.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvcpu.c 2008-07-21 21:37:42 UTC (rev 19068)
+++ branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvcpu.c 2008-07-22 05:53:17 UTC (rev 19069)
@@ -248,18 +248,18 @@
/* let the DTV segment mapper (register 12-15) do its work */
#define STORE(addr, value) \
- mem_store(addr, value)
+ mem_store((WORD)(addr), (BYTE)(value))
#define LOAD(addr) \
- mem_read(addr)
+ mem_read((WORD)(addr))
/* Route zero page operations through register 10 (zeropage mapper) */
#define STORE_ZERO(addr, value) \
- mem_store((((WORD) dtv_registers[10]) << 8) + ((addr) & 0xff), value)
+ mem_store((WORD)((((WORD) dtv_registers[10]) << 8) + ((addr) & 0xff)), (BYTE)(value))
#define LOAD_ZERO(addr) \
- mem_read((((WORD) dtv_registers[10]) << 8) + ((addr) & 0xff))
+ mem_read((WORD)(((WORD) dtv_registers[10]) << 8) + ((WORD)((addr) & 0xff)))
/* Route stack operations through register 11 (stack mapper) */
Modified: branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvdma.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvdma.c 2008-07-21 21:37:42 UTC (rev 19068)
+++ branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvdma.c 2008-07-22 05:53:17 UTC (rev 19069)
@@ -140,7 +140,7 @@
break;
case 0x80: /* RAM+registers */
if ( (offs >= 0xd000) && (offs < 0xe000) )
- data = _mem_read_tab_ptr[offs >> 8](offs);
+ data = _mem_read_tab_ptr[offs >> 8]((WORD)offs);
else
data = mem_ram[offs];
break;
@@ -186,7 +186,7 @@
break;
case 0x80: /* RAM+registers */
if ( (offs>=0xd000) && (offs<0xe000) )
- _mem_write_tab_ptr[offs >> 8](offs, data);
+ _mem_write_tab_ptr[offs >> 8]((WORD)offs, data);
else
mem_ram[offs] = data;
break;
Modified: branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvmem.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvmem.c 2008-07-21 21:37:42 UTC (rev 19068)
+++ branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvmem.c 2008-07-22 05:53:17 UTC (rev 19069)
@@ -621,7 +621,7 @@
#endif
/* disable dummy write if skip cycle */
if(dtv_registers[9] & 1) maincpu_rmw_flag = 0;
- _mem_write_tab_ptr[paddr >> 8](paddr, value);
+ _mem_write_tab_ptr[paddr >> 8]((WORD)paddr, value);
} else {
#ifdef FEATURE_CPUMEMHISTORY
monitor_memmap_store(paddr, MEMMAP_RAM_W);
@@ -659,7 +659,7 @@
}
memmap_state &= ~(MEMMAP_STATE_OPCODE);
#endif
- return _mem_read_tab_ptr[paddr >> 8](paddr);
+ return _mem_read_tab_ptr[paddr >> 8]((WORD)paddr);
} else {
#ifdef FEATURE_CPUMEMHISTORY
monitor_memmap_store(paddr, (memmap_state&MEMMAP_STATE_OPCODE)?MEMMAP_RAM_X:(memmap_state&MEMMAP_STATE_INSTR)?0:MEMMAP_RAM_R);
Modified: branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c 2008-07-21 21:37:42 UTC (rev 19068)
+++ branches/viceplus/v2.0-x64dtv/vice/src/vicii/vicii-mem.c 2008-07-22 05:53:17 UTC (rev 19069)
@@ -1016,11 +1016,11 @@
vicii.raster.geometry->gfx_position.x = vicii.screen_leftborderwidth;
}
- d020_store(vicii.regs[0x20]);
- d021_store(vicii.regs[0x21]);
- ext_background_store(0x22,vicii.regs[0x22]);
- ext_background_store(0x23,vicii.regs[0x23]);
- ext_background_store(0x24,vicii.regs[0x24]);
+ d020_store((BYTE)vicii.regs[0x20]);
+ d021_store((BYTE)vicii.regs[0x21]);
+ ext_background_store(0x22,(BYTE)vicii.regs[0x22]);
+ ext_background_store(0x23,(BYTE)vicii.regs[0x23]);
+ ext_background_store(0x24,(BYTE)vicii.regs[0x24]);
vicii_update_video_mode(cycle);
vicii_update_memory_ptrs(cycle);
@@ -1180,21 +1180,21 @@
if (!vicii.extended_enable) return;
if (vicii.dtvpalette[addr&0xf]==value) return;
vicii.dtvpalette[addr&0xf]=value;
- d020_store(vicii.regs[0x20]);
- d021_store(vicii.regs[0x21]);
- ext_background_store(0x22,vicii.regs[0x22]);
- ext_background_store(0x23,vicii.regs[0x23]);
- ext_background_store(0x24,vicii.regs[0x24]);
- d025_store(vicii.regs[0x25]);
- d026_store(vicii.regs[0x26]);
- sprite_color_store(0x27,vicii.regs[0x27]);
- sprite_color_store(0x28,vicii.regs[0x28]);
- sprite_color_store(0x29,vicii.regs[0x29]);
- sprite_color_store(0x2a,vicii.regs[0x2a]);
- sprite_color_store(0x2b,vicii.regs[0x2b]);
- sprite_color_store(0x2c,vicii.regs[0x2c]);
- sprite_color_store(0x2d,vicii.regs[0x2d]);
- sprite_color_store(0x2e,vicii.regs[0x2e]);
+ d020_store((BYTE)vicii.regs[0x20]);
+ d021_store((BYTE)vicii.regs[0x21]);
+ ext_background_store(0x22,(BYTE)vicii.regs[0x22]);
+ ext_background_store(0x23,(BYTE)vicii.regs[0x23]);
+ ext_background_store(0x24,(BYTE)vicii.regs[0x24]);
+ d025_store((BYTE)vicii.regs[0x25]);
+ d026_store((BYTE)vicii.regs[0x26]);
+ sprite_color_store(0x27,(BYTE)vicii.regs[0x27]);
+ sprite_color_store(0x28,(BYTE)vicii.regs[0x28]);
+ sprite_color_store(0x29,(BYTE)vicii.regs[0x29]);
+ sprite_color_store(0x2a,(BYTE)vicii.regs[0x2a]);
+ sprite_color_store(0x2b,(BYTE)vicii.regs[0x2b]);
+ sprite_color_store(0x2c,(BYTE)vicii.regs[0x2c]);
+ sprite_color_store(0x2d,(BYTE)vicii.regs[0x2d]);
+ sprite_color_store(0x2e,(BYTE)vicii.regs[0x2e]);
if (vicii.raster.cache_enabled) vicii.raster.dont_cache = 1;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|