RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

linux compile fixed

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@235 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2007-09-02 09:35:22 +00:00
parent e5503e2f4f
commit fb9bec948e
5 changed files with 9 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Pico/Memory.c
View file

@ -448,7 +448,7 @@ PICO_INTERNAL_ASM void CPU_CALL PicoWrite8(u32 a,u8 d)
log_io(a, 8, 1); log_io(a, 8, 1);
a&=0xffffff; a&=0xffffff;
OtherWrite8(a,d,8); OtherWrite8(a,d);
} }
#endif #endif

2
Pico/cd/Memory.c
View file

@ -643,7 +643,7 @@ static void PicoWriteM68k8(u32 a,u8 d)
return; return;
} }
OtherWrite8(a,d,8); OtherWrite8(a,d);
} }
#endif #endif

7
Pico/cd/Pico.c
View file

@ -122,7 +122,7 @@ void SekRunPS(int cyc_m68k, int cyc_s68k);
static __inline 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 cycn, cycn_s68k, cyc_do;
int d_cm = 0, d_cs = 0, ex; int ex;
SekCycleAim+=cyc_m68k; SekCycleAim+=cyc_m68k;
SekCycleAimS68k+=cyc_s68k; SekCycleAimS68k+=cyc_s68k;
@ -134,7 +134,6 @@ static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
{ {
ex = 0; ex = 0;
cycn_s68k = (cycn + cycn/2 + cycn/8) >> 16; 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 ((cyc_do = SekCycleAim-SekCycleCnt-(cycn>>16)) > 0) {
#if defined(EMU_C68K) #if defined(EMU_C68K)
PicoCpu.cycles = cyc_do; PicoCpu.cycles = cyc_do;
@ -145,7 +144,6 @@ static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
SekCycleCnt += (ex = m68k_execute(cyc_do)); SekCycleCnt += (ex = m68k_execute(cyc_do));
#endif #endif
} }
//fprintf(stderr, "%3i ", ex); d_cm += ex; ex = 0;
if ((cyc_do = SekCycleAimS68k-SekCycleCntS68k-cycn_s68k) > 0) { if ((cyc_do = SekCycleAimS68k-SekCycleCntS68k-cycn_s68k) > 0) {
#if defined(EMU_C68K) #if defined(EMU_C68K)
PicoCpuS68k.cycles = cyc_do; PicoCpuS68k.cycles = cyc_do;
@ -156,10 +154,7 @@ static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
SekCycleCntS68k += (ex = m68k_execute(cyc_do)); SekCycleCntS68k += (ex = m68k_execute(cyc_do));
#endif #endif
} }
//fprintf(stderr, "%3i\n", ex); d_cs += ex;
} }
//fprintf(stderr, "== end %3i/%3i ==\n", d_cm, d_cs);
} }
#endif #endif

10
platform/linux/Makefile
View file

@ -56,9 +56,7 @@ OBJS += ../../cpu/mz80/mz80.o
# faked asm # faked asm
#DEFINC += -D_ASM_DRAW_C #DEFINC += -D_ASM_DRAW_C
#DEFINC += -D_ASM_MEMORY_C #OBJS += fakedasm.o
#DEFINC += -D_ASM_YM2612_C
OBJS += fakedasm.o
all: PicoDrive all: PicoDrive
@ -100,7 +98,7 @@ PicoDrive : $(OBJS) ../gp2x/helix/helix_mp3_x86.a
@$(GCC) $(COPT_COMMON) $(DEFINC) -c $< -o $@ # -mtune=arm940t -DEXTERNAL_YM2612 @$(GCC) $(COPT_COMMON) $(DEFINC) -c $< -o $@ # -mtune=arm940t -DEXTERNAL_YM2612
# faked asm # faked asm
../../Pico/Draw.o : ../../Pico/Draw.c #../../Pico/Draw.o : ../../Pico/Draw.c
@echo $< # @echo $<
@$(GCC) $(COPT) $(DEFINC) -D_ASM_DRAW_C -c $< -o $@ # @$(GCC) $(COPT) $(DEFINC) -D_ASM_DRAW_C -c $< -o $@

4
platform/linux/fakedasm.c
View file

@ -23,7 +23,7 @@ extern int Scanline; // Scanline
struct TileStrip struct TileStrip
{ {
int nametab; // Position in VRAM of name table (for this tile line) 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 hscroll; // Horizontal scroll value in pixels for the line
int xmask; // X-Mask (0x1f - 0x7f) for horizontal wraparound in the tilemap int xmask; // X-Mask (0x1f - 0x7f) for horizontal wraparound in the tilemap
int *hc; // cache for high tile codes and their positions 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 *ts->hc++ = cval; // cache it
continue; continue;
} }
continue;
if (code!=oldcode) { if (code!=oldcode) {
oldcode = code; oldcode = code;
// Get tile address/2: // Get tile address/2: