From 6adba795f455f1bec6c89764fc78ecb1249fa66e Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 10 Nov 2015 04:20:15 +0100 Subject: Cleanups --- src/getset.h | 42 ------------------------------------------ src/os9x_asm_cpu.c | 49 ------------------------------------------------- 2 files changed, 91 deletions(-) diff --git a/src/getset.h b/src/getset.h index 469a21a..98c156c 100644 --- a/src/getset.h +++ b/src/getset.h @@ -47,22 +47,10 @@ #include "cpuexec.h" #include "sa1.h" -//#define __memcheck__ -//#define __show_io__ extern int oppause; -//extern uint16 mem_check; static INLINE uint8 S9xGetByte(uint32 Address) { -#ifdef __show_io__ - char str[64]; - sprintf(str, "rd @ %04X", Address); - S9xMessage(0, 0, str); - gp32_pause(); -#endif -#ifdef __memcheck__ - mem_check += (Address >> 16) + Address; -#endif #if defined(VAR_CYCLES) || defined(CPU_SHUTDOWN) int block; uint8* GetAddress = Memory.Map [block = (Address >> MEMMAP_SHIFT) & MEMMAP_MASK]; @@ -141,15 +129,6 @@ static INLINE uint8 S9xGetByte(uint32 Address) static INLINE uint16 S9xGetWord(uint32 Address) { -#ifdef __show_io__ - char str[64]; - sprintf(str, "rd @ %04X", Address); - S9xMessage(0, 0, str); - gp32_pause(); -#endif -#ifdef __memcheck__ - mem_check += (Address >> 16) + Address; -#endif if ((Address & 0x1fff) == 0x1fff) return (S9xGetByte(Address) | (S9xGetByte(Address + 1) << 8)); #if defined(VAR_CYCLES) || defined(CPU_SHUTDOWN) @@ -246,16 +225,6 @@ static INLINE uint16 S9xGetWord(uint32 Address) static INLINE void S9xSetByte(uint8 Byte, uint32 Address) { -#ifdef __show_io__ - char str[64]; - sprintf(str, "wr @ %04X %02X", Address, Byte); - S9xMessage(0, 0, str); - gp32_pause(); -#endif -#ifdef __memcheck__ - mem_check += Byte; -#endif - #if defined(CPU_SHUTDOWN) CPU.WaitAddress = NULL; #endif @@ -376,15 +345,6 @@ static INLINE void S9xSetByte(uint8 Byte, uint32 Address) static INLINE void S9xSetWord(uint16 Word, uint32 Address) { -#ifdef __show_io__ - char str[64]; - sprintf(str, "wr @ %04X %04X", Address, Word); - S9xMessage(0, 0, str); - gp32_pause(); -#endif -#ifdef __memcheck__ - mem_check += Word; -#endif #if defined(CPU_SHUTDOWN) CPU.WaitAddress = NULL; #endif @@ -704,5 +664,3 @@ static INLINE void S9xSetPCBase(uint32 Address) } } #endif - - diff --git a/src/os9x_asm_cpu.c b/src/os9x_asm_cpu.c index 6376ea5..7b34956 100644 --- a/src/os9x_asm_cpu.c +++ b/src/os9x_asm_cpu.c @@ -203,53 +203,4 @@ void asm_S9xOpcode_IRQ(void) } #endif -/* -void asm_APU_EXECUTE(int Mode) -{ -#ifdef __debug_c_apuex__ - printf("apuexec\n"); -#endif - if(CPU.APU_APUExecuting != Mode) return; - - if (Settings.asmspc700) - { - if(CPU.APU_Cycles < CPU.Cycles) { - int cycles = CPU.Cycles - CPU.APU_Cycles; - CPU.APU_Cycles += cycles - spc700_execute(cycles); - } - } - else - { - while (CPU.APU_Cycles <= CPU.Cycles) - { - CPU.APU_Cycles += S9xAPUCycles [*IAPU.PC]; - (*S9xApuOpcodes[*IAPU.PC]) (); - } - } -} - - -void asm_APU_EXECUTE2(void) -{ - if(CPU.APU_APUExecuting != 1) return; - - //ICPU.CPUExecuting = FALSE; - if (Settings.asmspc700) - { - if(CPU.APU_Cycles < CPU.NextEvent) { - int cycles = CPU.NextEvent - CPU.APU_Cycles; - CPU.APU_Cycles += cycles - spc700_execute(cycles); - } - } - else - { - do - { - CPU.APU_Cycles += S9xAPUCycles [*IAPU.PC]; - (*S9xApuOpcodes[*IAPU.PC]) (); - } while (CPU.APU_Cycles < CPU.NextEvent); - } - //ICPU.CPUExecuting = TRUE; -}*/ - END_EXTERN_C -- cgit v1.2.3