The-Homebrew-Cloud/Genesis-Plus-GX
2
0
Fork 0
mirror of https://github.com/ekeeke/Genesis-Plus-GX.git synced 2024-11-13 06:15:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Core/Misc] code cleanup

Browse Source
This commit is contained in:
EkeEke 2015-10-17 19:12:32 +02:00
parent ede474acbe
commit 406ee5e6bc
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/m68k/m68kcpu.c
View File

@ -293,7 +293,7 @@ void m68k_run(unsigned int cycles)
REG_IR = m68ki_read_imm_16(); REG_IR = m68ki_read_imm_16();
/* Execute instruction */ /* Execute instruction */
m68ki_instruction_jump_table[REG_IR](); m68ki_instruction_jump_table[REG_IR]();
USE_CYCLES(CYC_INSTRUCTION[REG_IR]); USE_CYCLES(CYC_INSTRUCTION[REG_IR]);
/* Trace m68k_exception, if necessary */ /* Trace m68k_exception, if necessary */

24
core/system.c
View File

@ -353,9 +353,6 @@ void system_frame_gen(int do_skip)
/* line counters */ /* line counters */
int start, end, line; int start, end, line;
/* Z80 interrupt flag */
int zirq = 1;
/* reset frame cycle counter */ /* reset frame cycle counter */
mcycles_vdp = 0; mcycles_vdp = 0;
@ -551,9 +548,9 @@ void system_frame_gen(int do_skip)
/* update 6-Buttons & Lightguns */ /* update 6-Buttons & Lightguns */
input_refresh(); input_refresh();
if (zirq) if (Z80.irq_state)
{ {
/* Z80 interrupt is asserted exactly for one line */ /* Z80 interrupt is asserted for exactly one line */
m68k_run(mcycles_vdp + 788); m68k_run(mcycles_vdp + 788);
if (zstate == 1) if (zstate == 1)
{ {
@ -566,7 +563,6 @@ void system_frame_gen(int do_skip)
/* clear Z80 interrupt */ /* clear Z80 interrupt */
Z80.irq_state = CLEAR_LINE; Z80.irq_state = CLEAR_LINE;
zirq = 0;
} }
/* run 68k & Z80 until end of line */ /* run 68k & Z80 until end of line */
@ -724,9 +720,6 @@ void system_frame_scd(int do_skip)
/* line counters */ /* line counters */
int start, end, line; int start, end, line;
/* Z80 interrupt flag */
int zirq = 1;
/* reset frame cycle counter */ /* reset frame cycle counter */
mcycles_vdp = 0; mcycles_vdp = 0;
scd.cycles = 0; scd.cycles = 0;
@ -881,7 +874,7 @@ void system_frame_scd(int do_skip)
/* assert Z80 interrupt */ /* assert Z80 interrupt */
Z80.irq_state = ASSERT_LINE; Z80.irq_state = ASSERT_LINE;
/* run both 68k & CD hardware */ /* run both 68k & CD hardware until end of line */
scd_update(MCYCLES_PER_LINE); scd_update(MCYCLES_PER_LINE);
/* run Z80 until end of line */ /* run Z80 until end of line */
@ -919,9 +912,9 @@ void system_frame_scd(int do_skip)
/* update 6-Buttons & Lightguns */ /* update 6-Buttons & Lightguns */
input_refresh(); input_refresh();
if (zirq) if (Z80.irq_state)
{ {
/* Z80 interrupt is asserted exactly for one line */ /* Z80 interrupt is asserted for exactly one line */
m68k_run(mcycles_vdp + 788); m68k_run(mcycles_vdp + 788);
if (zstate == 1) if (zstate == 1)
{ {
@ -934,10 +927,9 @@ void system_frame_scd(int do_skip)
/* clear Z80 interrupt */ /* clear Z80 interrupt */
Z80.irq_state = CLEAR_LINE; Z80.irq_state = CLEAR_LINE;
zirq = 0;
} }
/* run both 68k & CD hardware */ /* run both 68k & CD hardware until end of line */
scd_update(mcycles_vdp + MCYCLES_PER_LINE); scd_update(mcycles_vdp + MCYCLES_PER_LINE);
/* run Z80 until end of line */ /* run Z80 until end of line */
@ -985,7 +977,7 @@ void system_frame_scd(int do_skip)
/* update 6-Buttons & Lightguns */ /* update 6-Buttons & Lightguns */
input_refresh(); input_refresh();
/* run both 68k & CD hardware */ /* run both 68k & CD hardware until end of line */
scd_update(mcycles_vdp + MCYCLES_PER_LINE); scd_update(mcycles_vdp + MCYCLES_PER_LINE);
/* run Z80 until end of line */ /* run Z80 until end of line */
@ -1045,7 +1037,7 @@ void system_frame_scd(int do_skip)
h_counter--; h_counter--;
} }
/* run both 68k & CD hardware */ /* run both 68k & CD hardware until end of line */
scd_update(mcycles_vdp + MCYCLES_PER_LINE); scd_update(mcycles_vdp + MCYCLES_PER_LINE);
/* run Z80 until end of line */ /* run Z80 until end of line */

1
core/vdp_render.h
View File

@ -62,6 +62,7 @@
#define GET_G(pixel) (((pixel) & 0x03e0) >> 5) #define GET_G(pixel) (((pixel) & 0x03e0) >> 5)
#define GET_B(pixel) (((pixel) & 0x001f) >> 0) #define GET_B(pixel) (((pixel) & 0x001f) >> 0)
#endif #endif
/* 5:6:5 RGB */ /* 5:6:5 RGB */
#elif defined(USE_16BPP_RENDERING) #elif defined(USE_16BPP_RENDERING)
#define PIXEL(r,g,b) (((r) << 11) | ((g) << 5) | (b)) #define PIXEL(r,g,b) (((r) << 11) | ((g) << 5) | (b))