--- uae/src/custom.c 2018/04/24 16:50:11 1.1.1.9 +++ uae/src/custom.c 2018/04/24 16:53:06 1.1.1.11 @@ -64,8 +64,6 @@ static int next_lineno; static enum nln_how nextline_how; static int lof_changed = 0; -static const int dskdelay = 2; /* FIXME: ??? */ - static uae_u32 sprtaba[256],sprtabb[256]; /* @@ -97,22 +95,30 @@ static int ntscmode = 0; /* This is but an educated guess. It seems to be correct, but this stuff * isn't documented well. */ enum sprstate { SPR_stop, SPR_restart, SPR_waiting_start, SPR_waiting_stop }; -static enum sprstate sprst[8]; -static int spron[8]; -static uaecptr sprpt[8]; -static int sprxpos[8], sprvstart[8], sprvstop[8]; + +struct sprite { + uaecptr pt; + int on; + int xpos; + int vstart; + int vstop; + int armed; + enum sprstate state; +}; + +static struct sprite spr[8]; + +static int sprite_vblank_endline = VBLANK_ENDLINE_NTSC + 2; static unsigned int sprdata[MAX_SPRITES], sprdatb[MAX_SPRITES], sprctl[MAX_SPRITES], sprpos[MAX_SPRITES]; -static int sprarmed[MAX_SPRITES], sprite_last_drawn_at[MAX_SPRITES]; +static int sprite_last_drawn_at[MAX_SPRITES]; static int last_sprite_point, nr_armed; static uae_u32 bpl1dat, bpl2dat, bpl3dat, bpl4dat, bpl5dat, bpl6dat, bpl7dat, bpl8dat; static uae_s16 bpl1mod, bpl2mod; static uaecptr bplpt[8]; -#ifndef SMART_UPDATE -static char *real_bplpt[8]; -#endif +uae_u8 *real_bplpt[8]; /*static int blitcount[256]; blitter debug */ @@ -123,10 +129,6 @@ static unsigned int diwstrt, diwstop, di static int diwhigh_written; static unsigned int ddfstrt, ddfstop; -static uae_u32 dskpt; -static uae_u16 dsklen, dsksync; -static int dsklength, syncfound; - /* The display and data fetch windows */ enum diw_states @@ -145,7 +147,7 @@ int clx_sprmask; enum copper_states { COP_stop, - COP_rdelay1, COP_read1, COP_read2, + COP_read1, COP_read2, COP_bltwait, COP_wait }; @@ -156,14 +158,14 @@ struct copper { enum copper_states state; /* Instruction pointer. */ uaecptr ip; - int hpos, vpos, count; + int hpos, vpos; unsigned int ignore_next; - unsigned int vcmp, hcmp; + int vcmp, hcmp; }; static struct copper cop_state; - -static int dskdmaen; +static int copper_enabled_thisline; +static int cop_min_waittime; /* * Statistics @@ -292,15 +294,23 @@ STATIC_INLINE uae_u8 *pfield_xlateptr (u STATIC_INLINE void docols (struct color_entry *colentry) { -#if AGA_CHIPSET == 0 int i; - for (i = 0; i < 32; i++) { - int v = colentry->color_regs[i]; - if (v < 0 || v > 4095) - continue; - colentry->acolors[i] = xcolors[v]; + + if (currprefs.chipset_mask & CSMASK_AGA) { + for (i = 0; i < 256; i++) { + int v = color_reg_get (colentry, i); + if(v < 0 || v > 16777215) + continue; + colentry->acolors[i] = CONVERT_RGB (v); + } + } else { + for (i = 0; i < 32; i++) { + int v = color_reg_get (colentry, i); + if (v < 0 || v > 4095) + continue; + colentry->acolors[i] = xcolors[v]; + } } -#endif } void notice_new_xcolors (void) @@ -322,7 +332,7 @@ static void remember_ctable (void) if (remembered_color_entry == -1) { /* The colors changed since we last recorded a color map. Record a * new one. */ - memcpy (curr_color_tables + next_color_entry, ¤t_colors, sizeof current_colors); + color_reg_cpy (curr_color_tables + next_color_entry, ¤t_colors); remembered_color_entry = next_color_entry++; } thisline_decision.ctable = remembered_color_entry; @@ -337,9 +347,7 @@ static void remember_ctable (void) changed = 1; color_src_match = color_dest_match = -1; } else { - color_compare_result = memcmp (&prev_color_tables[oldctable].color_regs, - ¤t_colors.color_regs, - sizeof current_colors.color_regs) != 0; + color_compare_result = color_reg_cmp (&prev_color_tables[oldctable], ¤t_colors) != 0; if (color_compare_result) changed = 1; color_src_match = oldctable; @@ -404,18 +412,16 @@ STATIC_INLINE void decide_as_playfield ( /* These are for comparison. */ thisline_decision.bplcon0 = bplcon0; thisline_decision.bplcon2 = bplcon2; -#if AGA_CHIPSET == 1 thisline_decision.bplcon4 = bplcon4; -#endif + thisline_decision.fmode = fmode; #ifdef SMART_UPDATE if (line_decisions[next_lineno].plfstrt != thisline_decision.plfstrt || line_decisions[next_lineno].plflinelen != thisline_decision.plflinelen || line_decisions[next_lineno].bplcon0 != thisline_decision.bplcon0 || line_decisions[next_lineno].bplcon2 != thisline_decision.bplcon2 -#if AGA_CHIPSET == 1 || line_decisions[next_lineno].bplcon4 != thisline_decision.bplcon4 -#endif + || line_decisions[next_lineno].fmode != thisline_decision.fmode ) #endif /* SMART_UPDATE */ thisline_changed = 1; @@ -538,7 +544,7 @@ STATIC_INLINE void post_decide_line (int MARK_LINE_CHANGED; /* Play safe. */ return; } - + if (thisline_decision.which != -1) return; @@ -662,7 +668,7 @@ static void record_color_change (int hpo /* If the border is changed the first time before the DIW, record the * original starting border value. */ if (regno == 0 && thisline_decision.color0 == 0xFFFFFFFFul && thisline_decision.diwfirstword < 0) { - thisline_decision.color0 = current_colors.color_regs[0]; + thisline_decision.color0 = color_reg_get (¤t_colors, 0); if (line_decisions[next_lineno].color0 != value) thisline_changed = 1; } @@ -744,9 +750,9 @@ static void decide_plane (int hpos) uae_u8 *dataptr = line_data[next_lineno]; for (i = 0; i < decided_nr_planes; i++, dataptr += MAX_WORDS_PER_LINE*2) { uaecptr pt = bplpt[i]; - uae_u8 *real_ptr = pfield_xlateptr(pt, bytecount); + uae_u8 *real_ptr = pfield_xlateptr (pt, bytecount); if (real_ptr == NULL) - real_ptr = pfield_xlateptr(0, 0); + real_ptr = pfield_xlateptr (0, 0); #ifdef SMART_UPDATE #if 1 if (thisline_changed) @@ -897,10 +903,10 @@ static void decide_sprites (int hpos) count = 0; for (i = 0; i < 8; i++) { - int sprxp = sprxpos[i]; + int sprxp = spr[i].xpos; int j, bestp; - if (!sprarmed[i] || sprxp < 0 || sprxp > point || last_sprite_point >= sprxp) + if (! spr[i].armed || sprxp < 0 || sprxp > point || last_sprite_point >= sprxp) continue; if ((thisline_decision.diwfirstword >= 0 && sprxp + sprite_width < thisline_decision.diwfirstword) || (thisline_decision.diwlastword >= 0 && sprxp > thisline_decision.diwlastword)) @@ -980,7 +986,7 @@ static void finish_decisions (void) remember_ctable_for_border (); } if (thisline_decision.which == -1 && thisline_decision.color0 == 0xFFFFFFFFul) - thisline_decision.color0 = current_colors.color_regs[0]; + thisline_decision.color0 = color_reg_get (¤t_colors, 0); dip->nr_color_changes = next_color_change - dip->first_color_change; dip->nr_sprites = next_sprite_draw - dip->first_sprite_draw; @@ -1001,6 +1007,8 @@ static void finish_decisions (void) prev_sprite_positions + dip_old->first_sprite_draw, dip->nr_sprites * sizeof *curr_sprite_positions) != 0))) changed = 1; + if (thisline_decision.plfleft != line_decisions[next_lineno].plfleft) + changed = 1; if (changed) { thisline_changed = 1; @@ -1020,6 +1028,8 @@ static void reset_decisions (void) decided_bpl2mod = bpl2mod; decided_nr_planes = -1; + thisline_decision.plfleft = -1; + /* decided_res shouldn't be touched before it's initialized by decide_line(). */ thisline_decision.diwfirstword = -1; thisline_decision.diwlastword = -2; @@ -1084,12 +1094,49 @@ static void init_hz (void) write_log ("Using %s timing\n", isntsc ? "NTSC" : "PAL"); } -/* Calculate display window and data fetch values from the corresponding - * hardware registers. */ -static void calcdiw (void) +void expand_fetchmodes (int fmode, int bplcon0) { - int mask, add, mask2, add2, plfold; + int res; + if (bplcon0 & 0x8000) + res = 1; + else if (bplcon0 & 0x0040) + res = 2; + else + res = 0; + switch (fmode & 3) { + case 3: + fetchmode = 2; + switch (res) { + case 2: prefetch = 1<<3; fetchsize = 1<<3; fetchstart_shift = 3; break; + case 1: prefetch = 1<<3; fetchsize = 1<<4; fetchstart_shift = 4; break; + case 0: prefetch = 1<<3; fetchsize = 1<<5; fetchstart_shift = 5; break; + } + break; + case 2: + case 1: + fetchmode = 1; + switch (res) { + case 2: prefetch = 1<<2; fetchsize = 1<<3; fetchstart_shift = 2; break; + case 1: prefetch = 1<<3; fetchsize = 1<<3; fetchstart_shift = 3; break; + case 0: prefetch = 1<<3; fetchsize = 1<<4; fetchstart_shift = 4; break; + } + break; + case 0: + fetchmode = 0; + switch (res) { + case 2: prefetch = 1<<1; fetchsize = 1<<3; fetchstart_shift = 1; break; + case 1: prefetch = 1<<2; fetchsize = 1<<3; fetchstart_shift = 2; break; + case 0: prefetch = 1<<3; fetchsize = 1<<3; fetchstart_shift = 3; break; + } + break; + } + fetchstart = 1 << fetchstart_shift; +} + +static void calcdiw (void) +{ + int fetch; int hstrt = diwstrt & 0xFF; int hstop = diwstop & 0xFF; int vstrt = diwstrt >> 8; @@ -1106,8 +1153,8 @@ static void calcdiw (void) vstop |= 0x100; } - diwfirstword = coord_hw_to_native_x (hstrt - 1); - diwlastword = coord_hw_to_native_x (hstop - 1); + diwfirstword = coord_hw_to_window_x (hstrt - 1); + diwlastword = coord_hw_to_window_x (hstop - 1); if (diwlastword > max_diwlastword) diwlastword = max_diwlastword; @@ -1133,85 +1180,19 @@ static void calcdiw (void) plflastline = 313; } #endif - plfstrt = ddfstrt; plfstop = ddfstop; - /* @@@ Toni... these ones might be wrong for AGA? */ if (plfstrt < 0x18) plfstrt = 0x18; if (plfstop < 0x18) plfstop = 0x18; if (plfstop > 0xD8) plfstop = 0xD8; + if (plfstrt > plfstop) plfstrt = plfstop; - /* ! If the masking operation is changed, the pfield_doline code could break - * on some systems (alignment) */ - /* This actually seems to be correct now, at least the non-AGA stuff... */ - - if ((fmode & 3) == 0) { - /* FMODE=0 */ - mask = ~7; - add = 15; - mask2 = ~3; - add2 = 0; - } else if ((fmode & 3) == 3) { - /* FMODE=3 */ - if(bplcon0 & 0x8000) { - mask = ~15; - add = 31; - mask2 = ~7; - add2 = 4; - } else { - mask = ~31; - add = 63; - mask2 = ~15; - add2 = 8; - } - } else { - /* FMODE=1/2 */ - if(bplcon0 & 0x8000) { - mask = ~15; - add = 31; - mask2 = ~15; - add2 = 4; - } else { - mask = ~15; - add = 31; - mask2 = ~15; - add2 = 8; - - } - } - /* ugh.. This works in every demo and game I have tested, but can't be correct, - * it looks too complex and stupid, does anybody know how this really works? (TW) - */ - plfold = plfstrt; - plfstrt &= mask2; - plfstrt += add2; - /* @@@ This one is different from the pre-AGA version. It shouldn't make - * a difference in OCS modes, though. */ - plfstop += plfstrt - plfold; - plfstop &= mask2; - plfstop += add2; - plflinelen = (plfstop-plfstrt+add) & mask; - - if (plfstrt > plfstop) - plfstrt = plfstop; - -#if 0 - if (plflinelen > 100 && (bplcon0 & 0x8000)) - write_log("vpos: %d fmode: %d, hires %d strt1 %d stop1 %d strt2 %d stop2 %d,plflinelen %d\n", - vpos,fmode&3,(bplcon0&0x8000)?1:0,ddfstrt,ddfstop,plfstrt,plfstop,plflinelen); -#endif + expand_fetchmodes (fmode, bplcon0); + fetch = fetchsize >> fetchstart_shift; + plflinelen = ((((plfstop - plfstrt + fetchstart - 1) >> fetchstart_shift) + + fetch + (fetch - 1)) & ~(fetch - 1) ) << fetchstart_shift; } -/* - * lores,fmode=3 24 184 = 192 - * hires,fmode=3 40 200 = 176 - * hires,fmode=3 40 216 = 192 - * hires,fmode=1 56 200 = 160 - * hires,fmode=1 56 208 = 160 - * lores,fmode=1 48 200 = 176 - * lores,fmode=1 72 168 = 112 -*/ - /* Mousehack stuff */ #define defstepx (1<<16) @@ -1314,7 +1295,7 @@ static void do_mouse_hack (void) return; } switch (mousestate) { - case normal_mouse: + case normal_mouse: diffx = lastmx - lastsampledmx; diffy = lastmy - lastsampledmy; if (!newmousecounters) { @@ -1328,14 +1309,14 @@ static void do_mouse_hack (void) lastsampledmx += diffx; lastsampledmy += diffy; break; - case dont_care_mouse: + case dont_care_mouse: diffx = adjust (((lastmx - lastspr0x) * mstepx) >> 16); diffy = adjust (((lastmy - lastspr0y) * mstepy) >> 16); lastspr0x = lastmx; lastspr0y = lastmy; mouse_x += diffx; mouse_y += diffy; break; - case follow_mouse: + case follow_mouse: if (sprvbfl && sprvbfl-- > 1) { int mousexpos, mouseypos; @@ -1369,7 +1350,7 @@ static void do_mouse_hack (void) } break; - default: + default: abort (); } } @@ -1452,14 +1433,20 @@ STATIC_INLINE void COP2LCL (uae_u16 v) { static void start_copper (void) { + int was_active = eventtab[ev_copper].active; + eventtab[ev_copper].active = 0; + if (was_active) + events_schedule (); + cop_state.ignore_next = 0; cop_state.state = COP_read1; cop_state.vpos = vpos; cop_state.hpos = current_hpos () & ~1; - cop_state.count = cop_state.hpos + 2; - if (dmaen (DMA_COPPER)) + if (dmaen (DMA_COPPER)) { + copper_enabled_thisline = 1; regs.spcflags |= SPCFLAG_COPPER; + } } static void COPJMP1 (uae_u16 a) @@ -1491,24 +1478,26 @@ static void DMACON (uae_u16 v) /* FIXME? Maybe we need to think a bit more about the master DMA enable * bit in these cases. */ + if ((dmacon & DMA_COPPER) != (oldcon & DMA_COPPER)) { + if (eventtab[ev_copper].active) + need_resched = 1; + eventtab[ev_copper].active = 0; + } if ((dmacon & DMA_COPPER) > (oldcon & DMA_COPPER)) { cop_state.ip = cop1lc; cop_state.ignore_next = 0; cop_state.state = COP_read1; cop_state.vpos = vpos; cop_state.hpos = current_hpos () & ~1; - cop_state.count = (current_hpos () & ~1) + 2; + copper_enabled_thisline = 1; regs.spcflags |= SPCFLAG_COPPER; } if (! (dmacon & DMA_COPPER)) { + copper_enabled_thisline = 0; regs.spcflags &= ~SPCFLAG_COPPER; cop_state.state = COP_stop; } - if ((dmacon & DMA_DISK) > (oldcon & DMA_DISK)) { - DISK_reset_cycles (); - } - if ((dmacon & DMA_BLITPRI) > (oldcon & DMA_BLITPRI) && bltstate != BLT_done) { static int count = 0; if (!count) { @@ -1517,7 +1506,7 @@ static void DMACON (uae_u16 v) } regs.spcflags |= SPCFLAG_BLTNASTY; } - if (! (dmacon & DMA_BLITPRI)) + if ((dmacon & (DMA_BLITPRI | DMA_BLITTER | DMA_MASTER)) != (DMA_BLITPRI | DMA_BLITTER | DMA_MASTER)) regs.spcflags &= ~SPCFLAG_BLTNASTY; update_audio (); @@ -1678,8 +1667,13 @@ static void BPL2MOD (int hpos, uae_u16 v decide_modulos (hpos); } +STATIC_INLINE void BPL1DAT (uae_u16 v) +{ + bpl1dat = v; + if (thisline_decision.plfleft == -1) + thisline_decision.plfleft = current_hpos (); +} /* We could do as well without those... */ -STATIC_INLINE void BPL1DAT (uae_u16 v) { bpl1dat = v; } STATIC_INLINE void BPL2DAT (uae_u16 v) { bpl2dat = v; } STATIC_INLINE void BPL3DAT (uae_u16 v) { bpl3dat = v; } STATIC_INLINE void BPL4DAT (uae_u16 v) { bpl4dat = v; } @@ -1722,7 +1716,7 @@ static void DIWHIGH (int hpos, uae_u16 v static void DDFSTRT (int hpos, uae_u16 v) { - v &= (currprefs.chipset_mask & CSMASK_AGA) ? 0x1FC : 0xFC; + v &= 0xFC; if (ddfstrt == v) return; decide_line (hpos); @@ -1731,7 +1725,7 @@ static void DDFSTRT (int hpos, uae_u16 v } static void DDFSTOP (int hpos, uae_u16 v) { - v &= (currprefs.chipset_mask & CSMASK_AGA) ? 0x1FC : 0xFC; + v &= 0xFC; if (ddfstop == v) return; decide_line (hpos); @@ -1838,32 +1832,32 @@ STATIC_INLINE void SPRxCTL_1 (uae_u16 v, { int sprxp; sprctl[num] = v; - nr_armed -= sprarmed[num]; - sprarmed[num] = 0; + nr_armed -= spr[num].armed; + spr[num].armed = 0; if (sprpos[num] == 0 && v == 0) { - sprst[num] = SPR_stop; - spron[num] = 0; + spr[num].state = SPR_stop; + spr[num].on = 0; } else - sprst[num] = SPR_waiting_start; + spr[num].state = SPR_waiting_start; - sprxp = coord_hw_to_native_x ((sprpos[num] & 0xFF) * 2 + (v & 1)); - sprxpos[num] = sprxp; - sprvstart[num] = (sprpos[num] >> 8) | ((sprctl[num] << 6) & 0x100); - sprvstop[num] = (sprctl[num] >> 8) | ((sprctl[num] << 7) & 0x100); + sprxp = coord_hw_to_window_x ((sprpos[num] & 0xFF) * 2 + (v & 1)); + spr[num].xpos = sprxp; + spr[num].vstart = (sprpos[num] >> 8) | ((sprctl[num] << 6) & 0x100); + spr[num].vstop = (sprctl[num] >> 8) | ((sprctl[num] << 7) & 0x100); } STATIC_INLINE void SPRxPOS_1 (uae_u16 v, int num) { int sprxp; sprpos[num] = v; - sprxp = coord_hw_to_native_x ((v & 0xFF) * 2 + (sprctl[num] & 1)); - sprxpos[num] = sprxp; - sprvstart[num] = (sprpos[num] >> 8) | ((sprctl[num] << 6) & 0x100); + sprxp = coord_hw_to_window_x ((v & 0xFF) * 2 + (sprctl[num] & 1)); + spr[num].xpos = sprxp; + spr[num].vstart = (sprpos[num] >> 8) | ((sprctl[num] << 6) & 0x100); } STATIC_INLINE void SPRxDATA_1 (uae_u16 v, int num) { sprdata[num] = v; - nr_armed += 1 - sprarmed[num]; - sprarmed[num] = 1; + nr_armed += 1 - spr[num].armed; + spr[num].armed = 1; } STATIC_INLINE void SPRxDATB_1 (uae_u16 v, int num) { @@ -1876,22 +1870,22 @@ static void SPRxPOS (int hpos, uae_u16 v static void SPRxPTH (int hpos, uae_u16 v, int num) { decide_sprites (hpos); - sprpt[num] &= 0xffff; - sprpt[num] |= (uae_u32)v << 16; + spr[num].pt &= 0xffff; + spr[num].pt |= (uae_u32)v << 16; - if (sprst[num] == SPR_stop || vpos < VBLANK_ENDLINE_NTSC) - sprst[num] = SPR_restart; - spron[num] = 1; + if (spr[num].state == SPR_stop || vpos < sprite_vblank_endline) + spr[num].state = SPR_restart; + spr[num].on = 1; } static void SPRxPTL (int hpos, uae_u16 v, int num) { decide_sprites (hpos); - sprpt[num] &= ~0xffff; - sprpt[num] |= v; + spr[num].pt &= ~0xffff; + spr[num].pt |= v; - if (sprst[num] == SPR_stop || vpos < VBLANK_ENDLINE_NTSC) - sprst[num] = SPR_restart; - spron[num] = 1; + if (spr[num].state == SPR_stop || vpos < sprite_vblank_endline) + spr[num].state = SPR_restart; + spr[num].on = 1; } static void CLXCON (uae_u16 v) { @@ -1904,25 +1898,28 @@ static uae_u16 CLXDAT (void) clxdat = 0; return v; } + static void COLOR (int hpos, uae_u16 v, int num) { v &= 0xFFF; -#if AGA_CHIPSET == 1 - { - /* XXX Broken */ + if (currprefs.chipset_mask & CSMASK_AGA) { + int r,g,b; int cr,cg,cb; int colreg; uae_u32 cval; + /* writing is disabled when RDRAM=1 */ + if (bplcon2 & 0x0100) return; + colreg = ((bplcon3 >> 13) & 7) * 32 + num; r = (v & 0xF00) >> 8; g = (v & 0xF0) >> 4; b = (v & 0xF) >> 0; - cr = current_colors.color_regs[colreg] >> 16; - cg = (current_colors.color_regs[colreg] >> 8) & 0xFF; - cb = current_colors.color_regs[colreg] & 0xFF; + cr = current_colors.color_regs_aga[colreg] >> 16; + cg = (current_colors.color_regs_aga[colreg] >> 8) & 0xFF; + cb = current_colors.color_regs_aga[colreg] & 0xFF; if (bplcon3 & 0x200) { cr &= 0xF0; cr |= r; @@ -1934,124 +1931,23 @@ static void COLOR (int hpos, uae_u16 v, cb = b + (b << 4); } cval = (cr << 16) | (cg << 8) | cb; - if (cval == current_colors.color_regs[colreg]) + if (cval == current_colors.color_regs_aga[colreg]) return; /* Call this with the old table still intact. */ - record_color_change (hpos, colreg, v); + record_color_change (hpos, colreg, cval); remembered_color_entry = -1; - current_colors.color_regs[colreg] = cval; -/* current_colors.acolors[colreg] = xcolors[v];*/ - } -#else - { - if (current_colors.color_regs[num] == v) + current_colors.color_regs_aga[colreg] = cval; + current_colors.acolors[colreg] = CONVERT_RGB (cval); + } else { + if (current_colors.color_regs_ecs[num] == v) return; /* Call this with the old table still intact. */ record_color_change (hpos, num, v); remembered_color_entry = -1; - current_colors.color_regs[num] = v; + current_colors.color_regs_ecs[num] = v; current_colors.acolors[num] = xcolors[v]; } -#endif -} - -static void DSKSYNC (uae_u16 v) { dsksync = v; } -static void DSKDAT (uae_u16 v) { write_log ("DSKDAT written. Not good.\n"); } -static void DSKPTH (uae_u16 v) { dskpt = (dskpt & 0xffff) | ((uae_u32)v << 16); } -static void DSKPTL (uae_u16 v) { dskpt = (dskpt & ~0xffff) | (v); } - -static void DSKLEN (uae_u16 v) -{ - if (v & 0x8000) { - dskdmaen = dskdmaen == 1 ? 2 : 1; - } else { - dskdmaen = 0; - if (eventtab[ev_diskblk].active) - write_log ("warning: Disk DMA aborted!\n"); - eventtab[ev_diskblk].active = 0; - events_schedule(); - } - dsklen = dsklength = v; dsklength &= 0x3fff; - if (dskdmaen == 2 && dsksync != 0x4489 && (adkcon & 0x400)) { - write_log ("Non-standard sync: %04x len: %x\n", dsksync, dsklength); - } - if (dskdmaen <= 1) - return; - - if (dsklen & 0x4000) { - eventtab[ev_diskblk].active = 1; - eventtab[ev_diskblk].oldcycles = cycles; - eventtab[ev_diskblk].evtime = 40 + cycles; /* ??? */ - events_schedule(); - dskdmaen = 3; - } else { - DISK_StartRead (); - syncfound = !(adkcon & 0x400); - } -} - -static int update_disk_reads (void) -{ - int retval = 0; - /* If we get called from DSKBYTR or DSKDATR, we may not actually be - reading from disk, so skip the DMA update. */ - if (dskdmaen != 2) { - DISK_update_reads (0, 0, 0, 0); - return 0; - } - if (dsklength == 0) - write_log ("Bug in disk code: dsklength == 0\n"); - else - retval = DISK_update_reads (&dskpt, &dsklength, &syncfound, dsksync); - - if (dsklength == 0) { - dskdmaen = -1; - /* DISKBLK */ - INTREQ (0x8002); - } - return retval; -} - -static void disksync_handler (void) -{ - uae_u16 mfm, byte; - - eventtab[ev_disksync].active = 0; - - /* If no DMA, something weird happened. It's not clear what to do - about it. */ - if (! dmaen (0x10) || dskdmaen != 2) - return; - - /* Likewise... */ - if (! update_disk_reads ()) - return; - DISK_GetData (&mfm, &byte); - - if (dsksync == mfm) - INTREQ (0x9000); -} - -static uae_u16 DSKBYTR (void) -{ - uae_u16 v = (dsklen >> 1) & 0x6000; - uae_u16 mfm, byte; - if (update_disk_reads ()) - v |= 0x8000; - DISK_GetData (&mfm, &byte); - v |= byte; - if (dsksync == mfm) - v |= 0x1000; - return v; -} - -static uae_u16 DSKDATR (void) -{ - uae_u16 mfm, byte; - update_disk_reads (); - DISK_GetData (&mfm, &byte); - return mfm; } static uae_u16 potgo_value; @@ -2063,8 +1959,9 @@ static void POTGO (uae_u16 v) static uae_u16 POTGOR (void) { - uae_u16 v = (potgo_value | (potgo_value << 1)) & 0xAA00; - v |= v >> 1; + uae_u16 v = (potgo_value | (potgo_value >> 1)) & 0x5500; + + v |= (~potgo_value & 0xAA00) >> 1; if (JSEM_ISMOUSE (0, &currprefs)) { if (buttonstate[2]) @@ -2121,10 +2018,6 @@ static void JOYTEST (uae_u16 v) } } -/* - * Here starts the copper code. Can you believe it used to be worse? - */ - /* Determine which cycles are available for the copper in a display * with a agiven number of planes. */ static int cycles_for_plane[9][8] = { @@ -2169,78 +2062,86 @@ STATIC_INLINE int copper_cant_read (enum return t; } +STATIC_INLINE int dangerous_reg (int reg) +{ + /* Safe: + * Bitplane pointers, control registers, modulos and data. + * Sprite pointers, control registers, and data. + * Color registers. */ + if (reg >= 0xE0 && reg < 0x1C0) + return 0; + return 1; +} + static void update_copper (int until_hpos) { - unsigned int vp, hp; + int vp = vpos & (((cop_state.i2 >> 8) & 0x7F) | 0x80); int c_hpos = cop_state.hpos; - vp = vpos & (((cop_state.i2 >> 8) & 0x7F) | 0x80); - hp = cop_state.count & (cop_state.i2 & 0xFE); + if (eventtab[ev_copper].active) + abort (); + + if (cop_state.state == COP_wait && vp < cop_state.vcmp) + abort (); + + until_hpos &= ~1; + + if (until_hpos > (maxhpos & ~1)) + until_hpos = maxhpos & ~1; for (;;) { - if (c_hpos >= (maxhpos & ~1) - || c_hpos > until_hpos - || cop_state.state == COP_stop - || (regs.spcflags & SPCFLAG_COPPER) == 0) + int old_hpos = c_hpos; + int hp; + + if (c_hpos > until_hpos) break; /* So we know about the vertical DIW. */ decide_line (c_hpos); - switch (cop_state.state) { - case COP_stop: - abort (); - - case COP_rdelay1: - cop_state.state = COP_read1; - break; + c_hpos += 2; + if (copper_cant_read (diwstate, old_hpos, corrected_nr_planes_from_bplcon0)) + continue; + switch (cop_state.state) { case COP_read1: - if (copper_cant_read (diwstate, c_hpos, corrected_nr_planes_from_bplcon0)) - break; - cop_state.i1 = chipmem_bank.wget (cop_state.ip); cop_state.ip += 2; cop_state.state = COP_read2; break; case COP_read2: - if (copper_cant_read (diwstate, c_hpos, corrected_nr_planes_from_bplcon0)) - break; - cop_state.i2 = chipmem_bank.wget (cop_state.ip); cop_state.ip += 2; + cop_state.state = COP_read1; if (cop_state.ignore_next) { cop_state.ignore_next = 0; - cop_state.state = COP_read1; break; } /* Perform moves immediately. */ if ((cop_state.i1 & 1) == 0) { - cop_state.state = COP_read1; - if (cop_state.i1 < (copcon & 2 ? ((currprefs.chipset_mask & CSMASK_AGA) ? 0 : 0x40u) : 0x80u)) { - cop_state.state = COP_stop; - break; + unsigned int address = cop_state.i1 & 0x1FE; + if (address < (copcon & 2 ? ((currprefs.chipset_mask & CSMASK_AGA) ? 0 : 0x40u) : 0x80u)) { + cop_state.state = COP_stop; + copper_enabled_thisline = 0; + regs.spcflags &= ~SPCFLAG_COPPER; + goto out; } - switch (cop_state.i1) { - case 0x088: + if (address == 0x88) cop_state.ip = cop1lc; - cop_state.state = COP_read1; - break; - case 0x08A: + else if (address == 0x8A) cop_state.ip = cop2lc; - cop_state.state = COP_read1; - break; - default: - custom_wput_1 (c_hpos, cop_state.i1, cop_state.i2); - break; - } + else + custom_wput_1 (old_hpos, address, cop_state.i2); + /* That could have turned off the copper... */ + if (! copper_enabled_thisline) + goto out; break; } vp = vpos & (((cop_state.i2 >> 8) & 0x7F) | 0x80); - hp = cop_state.count & (cop_state.i2 & 0xFE); - cop_state.vcmp = ((cop_state.i1 & (cop_state.i2 | 0x8000)) >> 8); + hp = c_hpos & (cop_state.i2 & 0xFE); + cop_state.vcmp = (cop_state.i1 & (cop_state.i2 | 0x8000)) >> 8; cop_state.hcmp = (cop_state.i1 & cop_state.i2 & 0xFE); if ((cop_state.i2 & 1) == 1) { @@ -2248,77 +2149,167 @@ static void update_copper (int until_hpo if ((vp > cop_state.vcmp || (vp == cop_state.vcmp && hp >= cop_state.hcmp)) && ((cop_state.i2 & 0x8000) != 0 || ! (DMACONR() & 0x4000))) cop_state.ignore_next = 1; - cop_state.state = COP_read1; break; } cop_state.state = COP_wait; if (cop_state.i1 == 0xFFFF && cop_state.i2 == 0xFFFE) { cop_state.state = COP_stop; - break; + copper_enabled_thisline = 0; + regs.spcflags &= ~SPCFLAG_COPPER; + goto out; } - break; - - case COP_wait: if (vp < cop_state.vcmp) { + copper_enabled_thisline = 0; regs.spcflags &= ~SPCFLAG_COPPER; - continue; + goto out; } - if (copper_cant_read (diwstate, c_hpos, corrected_nr_planes_from_bplcon0)) + if (vp > cop_state.vcmp) break; - hp = cop_state.count & (cop_state.i2 & 0xFE); + /* Only enable shortcuts if there's no masking going on. */ + if (0 && (cop_state.i2 & 0xFE) == 0xFE) { + int time_remaining = until_hpos - c_hpos; + + /* Compute minimum number of cycles to wait. */ + cop_min_waittime = cop_state.hcmp - hp - 4; + if (cop_min_waittime <= 2 || time_remaining <= 0) + break; + if (cop_min_waittime < time_remaining) { + c_hpos += cop_min_waittime; + break; + } + c_hpos += time_remaining; + cop_min_waittime -= time_remaining; + if (cop_min_waittime >= 8) { + regs.spcflags &= ~SPCFLAG_COPPER; + eventtab[ev_copper].active = 1; + eventtab[ev_copper].oldcycles = cycles; + eventtab[ev_copper].evtime = cycles + cop_min_waittime; + events_schedule (); + goto out; + } + } + break; + + case COP_wait: + if (vp < cop_state.vcmp) + abort (); + + hp = c_hpos & (cop_state.i2 & 0xFE); if (vp == cop_state.vcmp && hp < cop_state.hcmp) break; - /* Now we know that the comparisons were successful. */ - if ((cop_state.i2 & 0x8000) == 0x8000 || ! (DMACONR() & 0x4000)) - cop_state.state = COP_read1; - else { + + /* Now we know that the comparisons were successful. We might still + have to wait for the blitter though. */ + if ((cop_state.i2 & 0x8000) == 0 && (DMACONR() & 0x4000)) { /* We need to wait for the blitter. */ cop_state.state = COP_bltwait; + copper_enabled_thisline = 0; regs.spcflags &= ~SPCFLAG_COPPER; - continue; + goto out; } + + cop_state.state = COP_read1; break; default: - /* Delay cycles. */ - break; + abort (); } - - if (corrected_nr_planes_from_bplcon0 < 8 || ! copper_in_playfield (diwstate, c_hpos)) - cop_state.count += 2; - c_hpos += 2; } + + out: cop_state.hpos = c_hpos; +#if 0 + /* The future, Conan? */ + if (cop_state.state == COP_read1 || cop_state.state == COP_read2) { + int ip = cop_state.ip; + int word = cop_state.i1; + + if (eventtab[ev_copper].active /* || ! (regs.spcflags & SPCFLAG_COPPER) */) + abort (); + + if (cop_state.state == COP_read2) { + ip += 2; + c_hpos += 2; + goto inner; + } + while (c_hpos < (maxhpos & ~1)) { + word = chipmem_bank.wget (ip); + ip += 4; + c_hpos += 4; + inner: + if ((word & 1) || dangerous_reg (word)) + break; + } + cop_min_waittime = c_hpos - cop_state.hpos; + if (cop_min_waittime >= 8) { + regs.spcflags &= ~SPCFLAG_COPPER; + eventtab[ev_copper].active = 1; + eventtab[ev_copper].oldcycles = cycles; + eventtab[ev_copper].evtime = cycles + cop_min_waittime; + events_schedule (); + } + } +#endif } static void compute_spcflag_copper (void) { - unsigned long v = 0; - int vp; - switch (cop_state.state) { - case COP_rdelay1: - case COP_read1: - case COP_read2: - if (dmaen (DMA_COPPER)) - v = SPCFLAG_COPPER; - break; - case COP_wait: - vp = vpos & (((cop_state.i2 >> 8) & 0x7F) | 0x80); - if (vp >= cop_state.vcmp) - v = SPCFLAG_COPPER; - break; - case COP_bltwait: - break; - } + copper_enabled_thisline = 0; regs.spcflags &= ~SPCFLAG_COPPER; - regs.spcflags |= v; + if (! dmaen (DMA_COPPER) || cop_state.state == COP_stop || cop_state.state == COP_bltwait) + return; + + if (cop_state.state == COP_wait) { + int vp = vpos & (((cop_state.i2 >> 8) & 0x7F) | 0x80); + + if (vp < cop_state.vcmp) + return; + copper_enabled_thisline = 1; + + if (0 && vp == cop_state.vcmp) { + int hp = (cop_state.hpos + 2) & (cop_state.i2 & 0xFE); + cop_min_waittime = cop_state.hcmp - hp - 4; + + /* If possible, compute a minimum waiting time, and set the event + timer if it's sufficiently large to be worthwhile. */ + if ((cop_state.i2 & 0xFE) == 0xFE && cop_min_waittime >= 8) { + eventtab[ev_copper].active = 1; + eventtab[ev_copper].oldcycles = cycles; + eventtab[ev_copper].evtime = cycles + cop_min_waittime; + events_schedule (); + return; + } + } + } + + copper_enabled_thisline = 1; + regs.spcflags |= SPCFLAG_COPPER; +} + +static void copper_handler (void) +{ + /* This will take effect immediately, within the same cycle. */ + regs.spcflags |= SPCFLAG_COPPER; + + if (! copper_enabled_thisline) + abort (); + + if (cop_state.state == COP_wait) { + cop_state.hpos += cop_min_waittime; + if (cop_state.hpos > current_hpos ()) + abort (); + } + + eventtab[ev_copper].active = 0; } void blitter_done_notify (void) { if (cop_state.state != COP_bltwait) return; + + copper_enabled_thisline = 1; regs.spcflags |= SPCFLAG_COPPER; cop_state.state = COP_wait; } @@ -2329,39 +2320,6 @@ void do_copper (void) update_copper (hpos); } -static void diskblk_handler (void) -{ - eventtab[ev_diskblk].active = 0; - - if (dskdmaen != 3) { - static int warned = 0; - if (!warned) - warned++, write_log ("BUG!\n"); - return; - } - if (dmaen (0x10)){ - if (dsklen & 0x4000) { - if (!chipmem_bank.check (dskpt, 2*dsklength)) { - write_log ("warning: Bad disk write DMA pointer\n"); - } else { - uae_u8 *mfmp = get_real_address (dskpt); - int i; - DISK_InitWrite(); - - for (i = 0; i < dsklength; i++) { - uae_u16 d = (*mfmp << 8) + *(mfmp+1); - mfmwrite[i] = d; - mfmp += 2; - } - DISK_WriteData(dsklength); - } - } else - write_log ("warning: diskblk_handler trying to read!\n"); - INTREQ(0x9002); - dskdmaen = -1; - } -} - static void do_sprites (int currvp, int currhp) { int i; @@ -2386,7 +2344,9 @@ static void do_sprites (int currvp, int * solution below is correct. */ /* Another update: seems like we have to use the NTSC value here (see Sanity Turmoil * demo). */ - if (currvp < VBLANK_ENDLINE_NTSC) + /* Maximum for Sanity Turmoil: 27. + Minimum for Sanity Arte: 22. */ + if (currvp < sprite_vblank_endline) return; #endif @@ -2401,25 +2361,25 @@ static void do_sprites (int currvp, int for (i = 0; i < maxspr; i++) { int fetch = 0; - if (spron[i] == 0) + if (spr[i].on == 0) continue; - if (sprst[i] == SPR_restart) { + if (spr[i].state == SPR_restart) { fetch = 2; - spron[i] = 1; - } else if ((sprst[i] == SPR_waiting_start && sprvstart[i] == vpos) || sprst[i] == SPR_waiting_stop) { + spr[i].on = 1; + } else if ((spr[i].state == SPR_waiting_start && spr[i].vstart == vpos) || spr[i].state == SPR_waiting_stop) { fetch = 1; - sprst[i] = SPR_waiting_stop; + spr[i].state = SPR_waiting_stop; } - if ((sprst[i] == SPR_waiting_stop || sprst[i] == SPR_waiting_start) && sprvstop[i] == vpos) { + if ((spr[i].state == SPR_waiting_stop || spr[i].state == SPR_waiting_start) && spr[i].vstop == vpos) { fetch = 2; - sprst[i] = SPR_waiting_start; + spr[i].state = SPR_waiting_start; } if (fetch && dmaen (DMA_SPRITE)) { - uae_u16 data1 = chipmem_bank.wget (sprpt[i]); - uae_u16 data2 = chipmem_bank.wget (sprpt[i] + 2); - sprpt[i] += 4; + uae_u16 data1 = chipmem_bank.wget (spr[i].pt); + uae_u16 data2 = chipmem_bank.wget (spr[i].pt + 2); + spr[i].pt += 4; if (fetch == 1) { /* Hack for X mouse auto-calibration */ @@ -2444,8 +2404,8 @@ static void init_sprites (void) for (i = 0; i < 8; i++) { /* ???? */ - sprst[i] = SPR_stop; - spron[i] = 0; + spr[i].state = SPR_stop; + spr[i].on = 0; } memset (sprpos, 0, sizeof sprpos); @@ -2574,10 +2534,7 @@ static void vsync_handler (void) cop_state.state = COP_read1; cop_state.vpos = 0; cop_state.hpos = 0; - cop_state.count = 2; cop_state.ignore_next = 0; - if (dmaen (DMA_COPPER)) - regs.spcflags |= SPCFLAG_COPPER; init_hardware_frame (); @@ -2624,7 +2581,16 @@ static void vsync_handler (void) static void hsync_handler (void) { - update_copper (maxhpos); + int copper_was_active = eventtab[ev_copper].active; + if (copper_was_active) { + /* Could happen if horizontal wait position is too large. */ + eventtab[ev_copper].active = 0; + if (cop_state.state != COP_wait) + copper_was_active = 0; + } + if (copper_enabled_thisline && ! copper_was_active) + update_copper (maxhpos); + finish_decisions (); do_modulos (current_hpos ()); @@ -2633,11 +2599,7 @@ static void hsync_handler (void) eventtab[ev_hsync].evtime += cycles - eventtab[ev_hsync].oldcycles; eventtab[ev_hsync].oldcycles = cycles; CIA_hsync_handler (); - - if (dskdmaen == 2 && dmaen (0x10)) { - update_disk_reads (); - DISK_search_sync (maxhpos, dsksync); - } + DISK_update (); if (currprefs.produce_sound > 0) { int nr; @@ -2700,7 +2662,6 @@ static void hsync_handler (void) } /* See if there's a chance of a copper wait ending this line. */ cop_state.hpos = 0; - cop_state.count = 2; compute_spcflag_copper (); } @@ -2718,14 +2679,12 @@ static void init_eventtab (void) eventtab[ev_hsync].evtime = maxhpos + cycles; eventtab[ev_hsync].active = 1; + eventtab[ev_copper].handler = copper_handler; + eventtab[ev_copper].active = 0; eventtab[ev_blitter].handler = blitter_handler; eventtab[ev_blitter].active = 0; - eventtab[ev_diskblk].handler = diskblk_handler; - eventtab[ev_diskblk].active = 0; - eventtab[ev_diskindex].handler = diskindex_handler; - eventtab[ev_diskindex].active = 0; - eventtab[ev_disksync].handler = disksync_handler; - eventtab[ev_disksync].active = 0; + eventtab[ev_disk].handler = DISK_handler; + eventtab[ev_disk].active = 0; events_schedule (); } @@ -2733,13 +2692,21 @@ static void init_eventtab (void) void customreset (void) { int i; + int zero = 0; #ifdef HAVE_GETTIMEOFDAY struct timeval tv; #endif - for (i = 0; i < sizeof current_colors.color_regs / sizeof *current_colors.color_regs; i++) { - current_colors.color_regs[i] = 0; - current_colors.acolors[i] = xcolors[0]; + if (currprefs.chipset_mask & CSMASK_AGA) { + for (i = 0; i < 32; i++) { + current_colors.color_regs_ecs[i] = 0; + current_colors.acolors[i] = xcolors[0]; + } + } else { + for (i = 0; i < 256; i++) { + current_colors.color_regs_aga[i] = 0; + current_colors.acolors[i] = CONVERT_RGB (zero); + } } expamem_reset (); @@ -2766,7 +2733,8 @@ void customreset (void) clx_sprmask = 0xFF; clxdat = 0; - memset (sprarmed, 0, sizeof sprarmed); + /* Clear the armed flags of all sprites. */ + memset (spr, 0, sizeof spr); nr_armed = 0; dmacon = intena = 0; @@ -2775,7 +2743,7 @@ void customreset (void) diwstate = DIW_waiting_start; hdiwstate = DIW_waiting_start; copcon = 0; - dskdmaen = 0; + DSKLEN (0, 0); cycles = 0; bplcon4 = 0x11; /* Get AGA chipset into ECS compatibility mode */ @@ -2912,7 +2880,7 @@ uae_u32 REGPARAM2 custom_wget (uaecptr a case 0x004: return VPOSR(); case 0x006: return VHPOSR(); - case 0x008: return DSKDATR(); + case 0x008: return DSKDATR(current_hpos()); case 0x00A: return JOY0DAT(); case 0x00C: return JOY1DAT(); @@ -2922,7 +2890,7 @@ uae_u32 REGPARAM2 custom_wget (uaecptr a case 0x012: return POT0DAT(); case 0x016: return POTGOR(); case 0x018: return SERDATR(); - case 0x01A: return DSKBYTR(); + case 0x01A: return DSKBYTR(current_hpos()); case 0x01C: return INTENAR(); case 0x01E: return INTREQR(); case 0x07C: return DENISEID(); @@ -2948,7 +2916,7 @@ void REGPARAM2 custom_wput_1 (int hpos, switch (addr) { case 0x020: DSKPTH (value); break; case 0x022: DSKPTL (value); break; - case 0x024: DSKLEN (value); break; + case 0x024: DSKLEN (value, current_hpos()); break; case 0x026: DSKDAT (value); break; case 0x02A: VPOSW (value); break; @@ -3111,7 +3079,10 @@ void REGPARAM2 custom_wput_1 (int hpos, void REGPARAM2 custom_wput (uaecptr addr, uae_u32 value) { int hpos = current_hpos (); - update_copper (hpos); + /* Need to let the copper advance to the current position, but only if it + isn't in a waiting state. */ + if (copper_enabled_thisline && ! eventtab[ev_copper].active) + update_copper (hpos); custom_wput_1 (hpos, addr, value); }