linux compile fixed

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

diff --git a/Pico/Memory.c b/Pico/Memory.c
index 828360c..dc9c738 100644 (file)
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -448,7 +448,7 @@ PICO_INTERNAL_ASM void CPU_CALL PicoWrite8(u32 a,u8 d)
   log_io(a, 8, 1);\r
 \r
   a&=0xffffff;\r
-  OtherWrite8(a,d,8);\r
+  OtherWrite8(a,d);\r
 }\r
 #endif\r
 \r

diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c
index 71ec377..a6267fe 100644 (file)
--- a/Pico/cd/Memory.c
+++ b/Pico/cd/Memory.c
@@ -643,7 +643,7 @@ static void PicoWriteM68k8(u32 a,u8 d)
     return;\r
   }\r
 \r
-  OtherWrite8(a,d,8);\r
+  OtherWrite8(a,d);\r
 }\r
 #endif\r
 \r

diff --git a/Pico/cd/Pico.c b/Pico/cd/Pico.c
index 5dcb39c..5669238 100644 (file)
--- a/Pico/cd/Pico.c
+++ b/Pico/cd/Pico.c
@@ -122,7 +122,7 @@ void SekRunPS(int cyc_m68k, int cyc_s68k);
 static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
 {
   int cycn, cycn_s68k, cyc_do;
-  int d_cm = 0, d_cs = 0, ex;
+  int ex;
   SekCycleAim+=cyc_m68k;
   SekCycleAimS68k+=cyc_s68k;
 
@@ -134,7 +134,6 @@ static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
   {
     ex = 0;
     cycn_s68k = (cycn + cycn/2 + cycn/8) >> 16;
-//fprintf(stderr, "%3i/%3i:  ", cycn>>16, cycn_s68k);
     if ((cyc_do = SekCycleAim-SekCycleCnt-(cycn>>16)) > 0) {
 #if defined(EMU_C68K)
       PicoCpu.cycles = cyc_do;
@@ -145,7 +144,6 @@ static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
       SekCycleCnt += (ex = m68k_execute(cyc_do));
 #endif
     }
-//fprintf(stderr, "%3i ", ex); d_cm += ex; ex = 0;
     if ((cyc_do = SekCycleAimS68k-SekCycleCntS68k-cycn_s68k) > 0) {
 #if defined(EMU_C68K)
       PicoCpuS68k.cycles = cyc_do;
@@ -156,10 +154,7 @@ static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
       SekCycleCntS68k += (ex = m68k_execute(cyc_do));
 #endif
     }
-//fprintf(stderr, "%3i\n", ex); d_cs += ex;
   }
-
-//fprintf(stderr, "==    end %3i/%3i    ==\n", d_cm, d_cs);
 }
 #endif
 

diff --git a/platform/linux/Makefile b/platform/linux/Makefile
index 015da6e..12cb4a2 100644 (file)
--- a/platform/linux/Makefile
+++ b/platform/linux/Makefile
@@ -56,9 +56,7 @@ OBJS += ../../cpu/mz80/mz80.o
 
 # faked asm
 #DEFINC += -D_ASM_DRAW_C
-#DEFINC += -D_ASM_MEMORY_C
-#DEFINC += -D_ASM_YM2612_C
-OBJS += fakedasm.o
+#OBJS += fakedasm.o
 
 
 all: PicoDrive
@@ -100,7 +98,7 @@ PicoDrive : $(OBJS) ../gp2x/helix/helix_mp3_x86.a
        @$(GCC) $(COPT_COMMON) $(DEFINC) -c $< -o $@ # -mtune=arm940t -DEXTERNAL_YM2612
 
 # faked asm
-../../Pico/Draw.o : ../../Pico/Draw.c
-       @echo $<
-       @$(GCC) $(COPT) $(DEFINC) -D_ASM_DRAW_C -c $< -o $@
+#../../Pico/Draw.o : ../../Pico/Draw.c
+#      @echo $<
+#      @$(GCC) $(COPT) $(DEFINC) -D_ASM_DRAW_C -c $< -o $@
 

diff --git a/platform/linux/fakedasm.c b/platform/linux/fakedasm.c
index d0e357c..137116f 100644 (file)
--- a/platform/linux/fakedasm.c
+++ b/platform/linux/fakedasm.c
@@ -23,7 +23,7 @@ extern int Scanline; // Scanline
 struct TileStrip
 {
   int nametab; // Position in VRAM of name table (for this tile line)
-  int line;    // Line number in pixels 0x000-0x3ff within the virtual tilemap 
+  int line;    // Line number in pixels 0x000-0x3ff within the virtual tilemap
   int hscroll; // Horizontal scroll value in pixels for the line
   int xmask;   // X-Mask (0x1f - 0x7f) for horizontal wraparound in the tilemap
   int *hc;     // cache for high tile codes and their positions
@@ -166,7 +166,7 @@ static void DrawStrip(struct TileStrip *ts, int sh)
       *ts->hc++ = cval; // cache it
       continue;
     }
-
+continue;
     if (code!=oldcode) {
       oldcode = code;
       // Get tile address/2: