[Vice-emu-commit] SF.net SVN: vice-emu:[19079] branches/viceplus/v2.0-x64dtv/vice/src

Revision: 19079
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19079&view=rev
Author:   blackystardust
Date:     2008-07-24 20:41:25 +0000 (Thu, 24 Jul 2008)

Log Message:
-----------
Fixed the msvc warnings.

Modified Paths:
--------------
    branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvcpu.c
    branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/flash-trap.c
    branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciidtv-snapshot.c

Modified: branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvcpu.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvcpu.c	2008-07-24 14:45:22 UTC (rev 19078)
+++ branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/c64dtvcpu.c	2008-07-24 20:41:25 UTC (rev 19079)
@@ -133,10 +133,10 @@
                    (((DWORD) mrtf(paddr + 2)) << 8) +
                    (((DWORD) mrtf(paddr + 3)) << 0);
 #else
-            return (((DWORD) mrtf(paddr + 3)) << 24) +
-                   (((DWORD) mrtf(paddr + 2)) << 16) +
-                   (((DWORD) mrtf(paddr + 1)) << 8) +
-                   (((DWORD) mrtf(paddr + 0)) << 0);
+            return (((DWORD) mrtf((WORD)(paddr + 3))) << 24) +
+                   (((DWORD) mrtf((WORD)(paddr + 2))) << 16) +
+                   (((DWORD) mrtf((WORD)(paddr + 1))) << 8) +
+                   (((DWORD) mrtf((WORD)(paddr + 0))) << 0);
 #endif
         }
     }
@@ -256,10 +256,10 @@
 /* Route zero page operations through register 10 (zeropage mapper) */
 
 #define STORE_ZERO(addr, value) \
-    mem_store((WORD)((((WORD) dtv_registers[10]) << 8) + ((addr) & 0xff)), (BYTE)(value))
+    mem_store((WORD)((((WORD) dtv_registers[10]) << 8) + ((WORD)(addr) & 0xff)), (BYTE)(value))
 
 #define LOAD_ZERO(addr) \
-    mem_read((WORD)(((WORD) dtv_registers[10]) << 8) + ((WORD)((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/flash-trap.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/flash-trap.c	2008-07-24 14:45:22 UTC (rev 19078)
+++ branches/viceplus/v2.0-x64dtv/vice/src/c64dtv/flash-trap.c	2008-07-24 20:41:25 UTC (rev 19079)
@@ -30,6 +30,8 @@
 
 #include "vice.h"
 
+#define C64DTV
+
 #include <stdio.h>
 #include <string.h>
 
@@ -41,7 +43,6 @@
 #include "log.h"
 #include "maincpu.h"
 #include "mem.h"
-#include "mos6510.h"
 #include "mos6510dtv.h"
 #include "traps.h"
 #include "types.h"
@@ -129,7 +130,7 @@
     name_len = mem_read(0xB7);
     fname = mem_read(0xBB) | (mem_read(0xBC) << 8);
     for (i=0; i<name_len; i++) {
-        name[i] = mem_read(fname + i);
+        name[i] = mem_read((WORD)(fname + i));
     }
     name[i]=0x00;
 }
@@ -193,9 +194,9 @@
 	direntry[0x1A] = 0x02;
 
 	/* load_address */
-	direntry[0x1B] = load_addr & 0xff;
-	direntry[0x1C] = (load_addr >> 8) & 0xff;
-	direntry[0x1D] = (load_addr >> 16) & 0xff;
+	direntry[0x1B] = (BYTE)(load_addr & 0xff);
+	direntry[0x1C] = (BYTE)((load_addr >> 8) & 0xff);
+	direntry[0x1D] = (BYTE)((load_addr >> 16) & 0xff);
 
 	/* sys_address (non-standard) */
 	direntry[0x1E] = 0x00;
@@ -218,7 +219,7 @@
 
     /* write out directory entry to the buffer at $0100-$011F */
     for (i=0; i < sizeof(direntry); i++)
-        mem_store(0x0100 + i, direntry[i]);
+        mem_store((WORD)(0x0100 + i), direntry[i]);
 
     return 1;
 }
@@ -248,14 +249,14 @@
     }
 
     /* set exit values for success and return */
-    laddr = addr & 0xff;
-    maddr = (addr >> 8) & 0xff;
-    haddr = (addr >> 16) & 0xff;
+    laddr = (BYTE)(addr & 0xff);
+    maddr = (BYTE)((addr >> 8) & 0xff);
+    haddr = (BYTE)((addr >> 16) & 0xff);
     mem_store((WORD)0xFB, laddr);
     mem_store((WORD)0xFC, maddr);
     mem_store((WORD)0xFD, haddr);
-    MOS6510_REGS_SET_X(&maincpu_regs, laddr);
-    MOS6510_REGS_SET_Y(&maincpu_regs, maddr);
+    MOS6510DTV_REGS_SET_X(&maincpu_regs, laddr);
+    MOS6510DTV_REGS_SET_Y(&maincpu_regs, maddr);
     mem_store((WORD)0xAE, laddr);
     mem_store((WORD)0xAF, maddr);
 

Modified: branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciidtv-snapshot.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciidtv-snapshot.c	2008-07-24 14:45:22 UTC (rev 19078)
+++ branches/viceplus/v2.0-x64dtv/vice/src/vicii/viciidtv-snapshot.c	2008-07-24 20:41:25 UTC (rev 19079)
@@ -517,7 +517,7 @@
 
     vicii_update_video_mode(VICII_RASTER_CYCLE(maincpu_clk));
 
-    vicii_store(0x3c, vicii.regs[0x3c]);
+    vicii_store(0x3c, (BYTE)vicii.regs[0x3c]);
 
     vicii.draw_clk = maincpu_clk + (vicii.draw_cycle
                      - VICII_RASTER_CYCLE(maincpu_clk));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.