fixed some portability issues

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@336 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/Pico/Draw.c b/Pico/Draw.c
index 989d9bd..6f60a03 100644 (file)
--- a/Pico/Draw.c
+++ b/Pico/Draw.c
@@ -610,8 +610,8 @@ static void DrawTilesFromCacheShPrep(void)
   {\r
     // as some layer has covered whole line with hi priority tiles,\r
     // we can process whole line and then act as if sh/hi mode was off.\r
-    rendstatus|=0x80;\r
     int c = 320/4, *zb = (int *)(HighCol+8);\r
+    rendstatus|=0x80;\r
     while (c--)\r
     {\r
       int tmp = *zb;\r

diff --git a/Pico/Memory.c b/Pico/Memory.c
index 48c32a6..847d1bd 100644 (file)
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -37,6 +37,8 @@ extern unsigned int ppop;
 \r
 #ifdef IO_STATS\r
 void log_io(unsigned int addr, int bits, int rw);\r
+#elif defined(_MSC_VER)\r
+#define log_io\r
 #else\r
 #define log_io(...)\r
 #endif\r

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index e2ce1ad..dab9fe2 100644 (file)
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -169,7 +169,7 @@ extern int SekCycleAimS68k;
 // ----------------------- Z80 CPU -----------------------\r
 \r
 #if defined(_USE_MZ80)\r
-#include "../../cpu/mz80/mz80.h"\r
+#include "../cpu/mz80/mz80.h"\r
 \r
 #define z80_run(cycles)    mz80_run(cycles)\r
 #define z80_run_nr(cycles) mz80_run(cycles)\r
@@ -177,7 +177,7 @@ extern int SekCycleAimS68k;
 #define z80_resetCycles()  mz80GetElapsedTicks(1)\r
 \r
 #elif defined(_USE_DRZ80)\r
-#include "../../cpu/DrZ80/drz80.h"\r
+#include "../cpu/DrZ80/drz80.h"\r
 \r
 extern struct DrZ80 drZ80;\r
 \r
@@ -190,7 +190,7 @@ extern struct DrZ80 drZ80;
 #define z80_resetCycles()\r
 \r
 #elif defined(_USE_CZ80)\r
-#include "../../cpu/cz80/cz80.h"\r
+#include "../cpu/cz80/cz80.h"\r
 \r
 #define z80_run(cycles)    Cz80_Exec(&CZ80, cycles)\r
 #define z80_run_nr(cycles) Cz80_Exec(&CZ80, cycles)\r
@@ -335,10 +335,10 @@ typedef struct
        union {                                         // 0a0000: 256K\r
                struct {\r
                        unsigned char word_ram2M[0x40000];\r
-                       unsigned char unused[0x20000];\r
+                       unsigned char unused0[0x20000];\r
                };\r
                struct {\r
-                       unsigned char unused[0x20000];\r
+                       unsigned char unused1[0x20000];\r
                        unsigned char word_ram1M[2][0x20000];\r
                };\r
        };\r
@@ -503,9 +503,17 @@ extern void lprintf(const char *fmt, ...);
        if ((w) & EL_LOGMASK) \\r
                lprintf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__); \\r
 }\r
+#elif defined(_MSC_VER)\r
+#define elprintf\r
 #else\r
 #define elprintf(w,f,...)\r
 #endif\r
 \r
+#ifdef _MSC_VER\r
+#define cdprintf\r
+#else\r
+#define cdprintf(x...)\r
+#endif\r
+\r
 #endif // PICO_INTERNAL_INCLUDED\r
 \r

diff --git a/Pico/cd/LC89510.c b/Pico/cd/LC89510.c
index 05ac5d1..efad005 100644 (file)
--- a/Pico/cd/LC89510.c
+++ b/Pico/cd/LC89510.c
@@ -9,9 +9,6 @@
 \r
 #include "../PicoInt.h"\r
 \r
-#define cdprintf(x...)\r
-\r
-\r
 #define CDC_DMA_SPEED 256\r
 \r
 \r

diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c
index 2d08fd4..b1faacd 100644 (file)
--- a/Pico/cd/Memory.c
+++ b/Pico/cd/Memory.c
@@ -18,10 +18,15 @@ typedef unsigned int   u32;
 #define UTYPES_DEFINED\r
 #endif\r
 \r
+#ifdef _MSC_VER\r
+#define rdprintf\r
+#define wrdprintf\r
+#else\r
 //#define rdprintf dprintf\r
 #define rdprintf(...)\r
 //#define wrdprintf dprintf\r
 #define wrdprintf(...)\r
+#endif\r
 \r
 #ifdef EMU_CORE_DEBUG\r
 extern u32 lastread_a, lastread_d[16], lastwrite_cyc_d[16];\r
@@ -1158,11 +1163,12 @@ static u32 PicoReadS68k32(u32 a)
   // word RAM (1M area)\r
   if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff\r
     int bank;\r
+    u16 *pm;\r
     wrdprintf("s68k_wram1M r32: [%06x] @%06x", a, SekPcS68k);\r
 //    if (!(Pico_mcd->s68k_regs[3]&4))\r
 //      dprintf("s68k_wram1M FIXME: wrong mode");\r
     bank = (Pico_mcd->s68k_regs[3]&1)^1;\r
-    u16 *pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); d = (pm[0]<<16)|pm[1];\r
+    pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); d = (pm[0]<<16)|pm[1];\r
     wrdprintf("ret = %08x", d);\r
     goto end;\r
   }\r

diff --git a/Pico/cd/cd_file.c b/Pico/cd/cd_file.c
index 9c898a9..838d8d7 100644 (file)
--- a/Pico/cd/cd_file.c
+++ b/Pico/cd/cd_file.c
@@ -10,7 +10,6 @@
 #include "../PicoInt.h"
 #include "cd_file.h"
 
-#define cdprintf(x...)
 //#define cdprintf(f,...) printf(f "\n",##__VA_ARGS__) // tmp
 #define DEBUG_CD
 

diff --git a/Pico/cd/cd_sys.c b/Pico/cd/cd_sys.c
index 713b995..581583b 100644 (file)
--- a/Pico/cd/cd_sys.c
+++ b/Pico/cd/cd_sys.c
@@ -13,7 +13,6 @@
 #include "cd_sys.h"\r
 #include "cd_file.h"\r
 \r
-#define cdprintf(x...)\r
 #define DEBUG_CD\r
 \r
 #define TRAY_OPEN      0x0500          // TRAY OPEN CDD status\r

diff --git a/Pico/sound/ym2612.c b/Pico/sound/ym2612.c
index 8e081b4..144c334 100644 (file)
--- a/Pico/sound/ym2612.c
+++ b/Pico/sound/ym2612.c
@@ -1085,7 +1085,7 @@ static void chan_render_loop(chan_rend_context *ct, int *buffer, int length)
 void chan_render_loop(chan_rend_context *ct, int *buffer, unsigned short length);\r
 #endif\r
 \r
-static chan_rend_context __attribute__((aligned(64))) crct;\r
+static chan_rend_context crct;\r
 \r
 static int chan_render(int *buffer, int length, int c, UINT32 flags) // flags: stereo, ?, disabled, ?, pan_r, pan_l\r
 {\r