The-Homebrew-Cloud/Genesis-Plus-GX
2
0
Fork 0
mirror of https://github.com/ekeeke/Genesis-Plus-GX.git synced 2025-02-27 00:23:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Core/General] minor emulation fixes

Browse Source
This commit is contained in:
EkeEke 2013-06-16 23:35:02 +02:00
parent 3eaa6e56ea
commit ff5771da47
3 changed files with 55 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/loadrom.c
View File

@ -825,8 +825,8 @@ int load_rom(char *filename)
old_system[1] = input.system[1]; old_system[1] = input.system[1];
} }
/* force MOUSE+MENACER configuration */ /* force MENACER configuration */
input.system[0] = SYSTEM_MOUSE; input.system[0] = SYSTEM_MD_GAMEPAD;
input.system[1] = SYSTEM_MENACER; input.system[1] = SYSTEM_MENACER;
input.x_offset = 68; input.x_offset = 68;
input.y_offset = -24; input.y_offset = -24;

2
source/m68k/m68kcpu.c
View File

@ -278,7 +278,7 @@ void m68k_run(unsigned int cycles)
m68ki_set_address_error_trap() /* auto-disable (see m68kcpu.h) */ m68ki_set_address_error_trap() /* auto-disable (see m68kcpu.h) */
#ifdef LOGVDP #ifdef LOGVDP
error("[%d][%d] m68k run to %d cycles (%x)\n", v_counter, m68k.cycles, cycles, m68k.pc); error("[%d][%d] m68k run to %d cycles (%x), irq mask = %x (%x)\n", v_counter, m68k.cycles, cycles, m68k.pc,FLAG_INT_MASK, CPU_INT_LEVEL);
#endif #endif
while (m68k.cycles < cycles) while (m68k.cycles < cycles)

86
source/vdp_ctrl.c
View File

@ -977,7 +977,12 @@ void vdp_sms_ctrl_w(unsigned int data)
if (height != bitmap.viewport.h) if (height != bitmap.viewport.h)
{ {
if (v_counter < bitmap.viewport.h) if (status & 8)
{
/* viewport changes should be applied on next frame */
bitmap.viewport.changed |= 2;
}
else
{ {
/* update active display */ /* update active display */
bitmap.viewport.h = height; bitmap.viewport.h = height;
@ -1000,11 +1005,6 @@ void vdp_sms_ctrl_w(unsigned int data)
} }
} }
} }
else
{
/* Changes should be applied on next frame */
bitmap.viewport.changed |= 2;
}
} }
} }
@ -1360,13 +1360,13 @@ unsigned int vdp_z80_ctrl_r(unsigned int cycles)
unsigned int vdp_hvc_r(unsigned int cycles) unsigned int vdp_hvc_r(unsigned int cycles)
{ {
int vc; int vc;
unsigned int temp = hvc_latch; unsigned int data = hvc_latch;
/* Check if HVC is frozen */ /* Check if HVC is frozen */
if (!temp) if (!data)
{ {
/* Cycle-accurate HCounter (Striker, Mickey Mania, Skitchin, Road Rash I,II,III, Sonic 3D Blast...) */ /* Cycle-accurate HCounter (Striker, Mickey Mania, Skitchin, Road Rash I,II,III, Sonic 3D Blast...) */
temp = hctab[cycles % MCYCLES_PER_LINE]; data = hctab[cycles % MCYCLES_PER_LINE];
} }
else else
{ {
@ -1376,12 +1376,12 @@ unsigned int vdp_hvc_r(unsigned int cycles)
#ifdef LOGVDP #ifdef LOGVDP
error("[%d(%d)][%d(%d)] HVC read -> 0x%x (%x)\n", v_counter, (cycles/MCYCLES_PER_LINE-1)%lines_per_frame, cycles, cycles%MCYCLES_PER_LINE, hvc_latch & 0xffff, m68k_get_reg(M68K_REG_PC)); error("[%d(%d)][%d(%d)] HVC read -> 0x%x (%x)\n", v_counter, (cycles/MCYCLES_PER_LINE-1)%lines_per_frame, cycles, cycles%MCYCLES_PER_LINE, hvc_latch & 0xffff, m68k_get_reg(M68K_REG_PC));
#endif #endif
return (temp & 0xffff); return (data & 0xffff);
} }
else else
{ {
/* Mode 4: VCounter runs normally, HCounter is frozen */ /* Mode 4: VCounter runs normally, HCounter is frozen */
temp &= 0xff; data &= 0xff;
} }
} }
@ -1404,12 +1404,12 @@ unsigned int vdp_hvc_r(unsigned int cycles)
vc = (vc & ~1) | ((vc >> 8) & 1); vc = (vc & ~1) | ((vc >> 8) & 1);
} }
temp |= ((vc & 0xff) << 8); data |= ((vc & 0xff) << 8);
#ifdef LOGVDP #ifdef LOGVDP
error("[%d(%d)][%d(%d)] HVC read -> 0x%x (%x)\n", v_counter, (cycles/MCYCLES_PER_LINE-1)%lines_per_frame, cycles, cycles%MCYCLES_PER_LINE, temp, m68k_get_reg(M68K_REG_PC)); error("[%d(%d)][%d(%d)] HVC read -> 0x%x (%x)\n", v_counter, (cycles/MCYCLES_PER_LINE-1)%lines_per_frame, cycles, cycles%MCYCLES_PER_LINE, data, m68k_get_reg(M68K_REG_PC));
#endif #endif
return (temp); return (data);
} }
@ -1655,17 +1655,17 @@ static void vdp_reg_w(unsigned int r, unsigned int d, unsigned int cycles)
/* Mode 5 only */ /* Mode 5 only */
if (d & 0x04) if (d & 0x04)
{ {
if (v_counter < bitmap.viewport.h) if (status & 8)
{
/* Changes should be applied on next frame */
bitmap.viewport.changed |= 2;
}
else
{ {
/* Update active display height */ /* Update active display height */
bitmap.viewport.h = 224 + ((d & 8) << 1); bitmap.viewport.h = 224 + ((d & 8) << 1);
bitmap.viewport.y = (config.overscan & 1) * (8 - (d & 8) + 24*vdp_pal); bitmap.viewport.y = (config.overscan & 1) * (8 - (d & 8) + 24*vdp_pal);
} }
else
{
/* Changes should be applied on next frame */
bitmap.viewport.changed |= 2;
}
/* Update vertical counter max value */ /* Update vertical counter max value */
vc_max = vc_table[(d >> 2) & 3][vdp_pal]; vc_max = vc_table[(d >> 2) & 3][vdp_pal];
@ -1710,16 +1710,16 @@ static void vdp_reg_w(unsigned int r, unsigned int d, unsigned int cycles)
vdp_z80_data_r = vdp_z80_data_r_m5; vdp_z80_data_r = vdp_z80_data_r_m5;
/* Change display height */ /* Change display height */
if (v_counter < bitmap.viewport.h) if (status & 8)
{ {
/* Update active display */ /* viewport changes should be applied on next frame */
bitmap.viewport.h = 224 + ((d & 8) << 1); bitmap.viewport.changed |= 2;
bitmap.viewport.y = (config.overscan & 1) * (8 - (d & 8) + 24*vdp_pal);
} }
else else
{ {
/* Changes should be applied on next frame */ /* Update current frame active display height */
bitmap.viewport.changed |= 2; bitmap.viewport.h = 224 + ((d & 8) << 1);
bitmap.viewport.y = (config.overscan & 1) * (8 - (d & 8) + 24*vdp_pal);
} }
/* Clear HVC latched value */ /* Clear HVC latched value */
@ -1756,16 +1756,16 @@ static void vdp_reg_w(unsigned int r, unsigned int d, unsigned int cycles)
vdp_68k_data_r = vdp_68k_data_r_m4; vdp_68k_data_r = vdp_68k_data_r_m4;
vdp_z80_data_r = vdp_z80_data_r_m4; vdp_z80_data_r = vdp_z80_data_r_m4;
if (v_counter < bitmap.viewport.h) if (status & 8)
{ {
/* Update active display height */ /* viewport changes should be applied on next frame */
bitmap.viewport.h = 192; bitmap.viewport.changed |= 2;
bitmap.viewport.y = (config.overscan & 1) * 24 * (vdp_pal + 1);
} }
else else
{ {
/* Changes should be applied on next frame */ /* Update current frame active display */
bitmap.viewport.changed |= 2; bitmap.viewport.h = 192;
bitmap.viewport.y = (config.overscan & 1) * 24 * (vdp_pal + 1);
} }
/* Latch current HVC */ /* Latch current HVC */
@ -2012,11 +2012,18 @@ static void vdp_reg_w(unsigned int r, unsigned int d, unsigned int cycles)
/* Redraw entire line */ /* Redraw entire line */
render_line(v_counter); render_line(v_counter);
} }
else if (v_counter == (lines_per_frame - 1))
{
/* Update starting frame active display width */
bitmap.viewport.w = 256 + ((d & 1) << 6);
}
else else
{ {
/* Changes should be applied on next frame (Golden Axe III intro) */ /* Changes should be applied on next frame (Golden Axe III intro) */
/* NB: This is not 100% accurate but is required by GCN/Wii port (GX texture direct mapping) */ /* NB: not 100% accurate but required since backend framebuffer width cannot be modified mid-frame. */
/* and isn't noticeable anyway since display is generally disabled when active width is modified */ /* This would require a fixed framebuffer width (based on TV screen aspect ratio) and pixel scaling */
/* to be done during rendering (depending on active display pixel aspect ratio in H32 or H40 mode). */
/* Display is generally disabled when this is modified so it shouldn't be really noticeable anyway. */
bitmap.viewport.changed |= 2; bitmap.viewport.changed |= 2;
} }
} }
@ -3013,6 +3020,12 @@ static void vdp_dma_copy(unsigned int length)
/* Update DMA source address */ /* Update DMA source address */
dma_src = source; dma_src = source;
} }
else
{
/* DMA source & VRAM addresses are still incremented */
addr += reg[15] * length;
dma_src += length;
}
} }
/* VRAM Fill (TODO: check if CRAM or VSRAM fill is possible) */ /* VRAM Fill (TODO: check if CRAM or VSRAM fill is possible) */
@ -3044,4 +3057,9 @@ static void vdp_dma_fill(unsigned int length)
} }
while (--length); while (--length);
} }
else
{
/* VRAM address is still incremented */
addr += reg[15] * length;
}
} }