--- uae/src/custom.c 2018/04/24 16:39:15 1.1.1.2 +++ uae/src/custom.c 2018/04/24 16:47:31 1.1.1.7 @@ -1,9 +1,9 @@ /* * UAE - The Un*x Amiga Emulator - * + * * Custom chip emulation - * - * Copyright 1995, 1996, 1997 Bernd Schmidt + * + * Copyright 1995-1998 Bernd Schmidt * Copyright 1995 Alessandro Bissacco */ @@ -15,6 +15,10 @@ #include "config.h" #include "options.h" +#include "threaddep/penguin.h" +#include "uae.h" +#include "gensound.h" +#include "sounddep/sound.h" #include "events.h" #include "memory.h" #include "custom.h" @@ -24,435 +28,307 @@ #include "disk.h" #include "blitter.h" #include "xwin.h" -#include "os.h" +#include "joystick.h" +#include "audio.h" #include "keybuf.h" #include "serial.h" #include "osemu.h" -#include "machdep/penguin.h" +#include "autoconf.h" +#include "gui.h" +#include "picasso96.h" +#include "drawing.h" -#ifdef X86_ASSEMBLY -#define LORES_HACK -#endif - -/* - * Several people have tried this define, with not much success. Turning on - * AGA garbles the screen. A place you could start looking is the calcdiw() - * function - the AGA timing parameters are different, and apparently I - * haven't figured out the correct formula yet. Pity, the current one looks - * logical. - * - * @@@ Probably won't compile in this version. - */ - -/* #define EMULATE_AGA */ - -#ifndef EMULATE_AGA -#define AGA_CHIPSET 0 -#else -#define AGA_CHIPSET 1 -#endif - -#define SMART_UPDATE 1 - -#ifdef SUPPORT_PENGUINS -#undef SMART_UPDATE -#define SMART_UDPATE 1 -#endif +static unsigned int n_consecutive_skipped = 0; +static unsigned int total_skipped = 0; -#if AGA_CHIPSET == 1 -#define MAX_PLANES 8 -#else -#define MAX_PLANES 6 -#endif +#define SPRITE_COLLISIONS -/* Fetched data spends 9 lores pixels somewhere in the chips before it appears - * on-screen. We don't emulate this. Instead, we cheat with the copper to - * compensate (much easier that way). */ -#define COPPER_MAGIC_FUDGE -9 -/* We ignore that many lores pixels at the start of the display. These are - * invisible anyway due to hardware DDF limits. */ -#define DISPLAY_LEFT_SHIFT 0x38 -static int lores_factor, lores_shift, sprite_width; - -#define PIXEL_XPOS(HPOS) (((HPOS)*2 - DISPLAY_LEFT_SHIFT) << lores_shift) - -/* @@@ Is maxhpos + 4 - 1 correct? (4 less isn't enough) */ -#define max_diwlastword (PIXEL_XPOS(maxhpos + 4 -1)) - -/* These are default values for mouse calibration. - * The first two are default values for mstepx and mstepy. - * The second line set the horizontal and vertical offset for amiga and X - * pointer matching - */ - -#define defstepx (1<<16) -#define defstepy (1<<16) -#define defxoffs 0 -#define defyoffs 0 - -/* Values below define mouse auto calibration process. - * They are not critical, change them if you want. - * The most important is calweight, which sets mouse adjustement rate */ +/* Mouse and joystick emulation */ -static const int docal = 60, xcaloff = 40, ycaloff = 20; -static const int calweight = 3; -static int lastsampledmx, lastsampledmy; +int buttonstate[3]; +static int mouse_x, mouse_y; +int joy0button, joy1button; +unsigned int joy0dir, joy1dir; - /* - * Events - */ +/* Events */ -unsigned long int cycles, nextevent; +unsigned long int cycles, nextevent, is_lastline; +static int rpt_did_reset; struct ev eventtab[ev_max]; -int vpos; -UWORD lof; -static int lof_changed = 0, interlace_seen = 0; +frame_time_t vsynctime, vsyncmintime; -static int copper_waiting_for_blitter, copper_active; -static const int dskdelay = 2; /* FIXME: ??? */ +static int vpos; +static uae_u16 lof; +static int next_lineno; +static enum nln_how nextline_how; +static int lof_changed = 0; -static int dblpf_ind1[256], dblpf_ind2[256], dblpf_2nd1[256], dblpf_2nd2[256]; -static int dblpf_aga1[256], dblpf_aga2[256], linear_map_256[256], lots_of_twos[256]; +static const int dskdelay = 2; /* FIXME: ??? */ -static int dblpfofs[] = { 0, 2, 4, 8, 16, 32, 64, 128 }; +static uae_u32 sprtaba[256],sprtabb[256]; /* * Hardware registers of all sorts. */ -static int fmode; +static void custom_wput_1 (int, uaecptr, uae_u32) REGPARAM; -static UWORD cregs[256]; +static uae_u16 cregs[256]; -UWORD intena,intreq; -UWORD dmacon; -UWORD adkcon; /* used by audio code */ +uae_u16 intena,intreq; +uae_u16 dmacon; +uae_u16 adkcon; /* used by audio code */ -static ULONG cop1lc,cop2lc,copcon; +static uae_u32 cop1lc,cop2lc,copcon; + +int maxhpos = MAXHPOS_PAL; +int maxvpos = MAXVPOS_PAL; +int minfirstline = MINFIRSTLINE_PAL; +int vblank_endline = VBLANK_ENDLINE_PAL; +int vblank_hz = VBLANK_HZ_PAL; +unsigned long syncbase; +static int fmode; +static unsigned int beamcon0, new_beamcon0; +static int ntscmode = 0; + +#define MAX_SPRITES 32 /* This is but an educated guess. It seems to be correct, but this stuff * isn't documented well. */ -enum sprstate { SPR_vtop, SPR_restart, SPR_waiting_start, SPR_waiting_stop, SPR_stop }; -static enum sprstate spron[8]; -static CPTR sprpt[8]; +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]; -static ULONG bpl1dat,bpl2dat,bpl3dat,bpl4dat,bpl5dat,bpl6dat,bpl7dat,bpl8dat; -static WORD bpl1mod,bpl2mod; +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 last_sprite_point, nr_armed; -static CPTR bplpt[8]; +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 /*static int blitcount[256]; blitter debug */ -struct color_entry { -#if AGA_CHIPSET == 0 - /* X86.S expects this at the start of the structure. */ - xcolnr acolors[32]; - UWORD color_regs[32]; -#else - ULONG color_regs[256]; -#endif -}; - static struct color_entry current_colors; -struct color_entry colors_for_drawing; -static unsigned int bplcon0,bplcon1,bplcon2,bplcon3,bplcon4; -static unsigned int diwstrt,diwstop,ddfstrt,ddfstop; -static unsigned int sprdata[8], sprdatb[8], sprctl[8], sprpos[8]; -static int sprarmed[8], sprite_last_drawn_at[8]; -static ULONG dskpt; -static UWORD dsklen,dsksync; - -static int joy0x, joy1x, joy0y, joy1y; -int joy0button; -UWORD joy0dir; -static int lastspr0x,lastspr0y,lastdiffx,lastdiffy,spr0pos,spr0ctl; -static int mstepx,mstepy,xoffs=defxoffs,yoffs=defyoffs; -static int sprvbfl; +static unsigned int bplcon0, bplcon1, bplcon2, bplcon3, bplcon4; +static int nr_planes_from_bplcon0, corrected_nr_planes_from_bplcon0; +static unsigned int diwstrt, diwstop, diwhigh; +static int diwhigh_written; +static unsigned int ddfstrt, ddfstop; -static enum { normal_mouse, dont_care_mouse, follow_mouse } mousestate; +static uae_u32 dskpt; +static uae_u16 dsklen, dsksync; +static int dsklength; -static ULONG coplc; -static unsigned int copi1,copi2; +/* The display and data fetch windows */ -static enum copper_states { - COP_stop, COP_read, COP_do_read, COP_read_ignore, COP_do_read_ignore, COP_wait, COP_morewait, COP_move, COP_skip -} copstate; -/* The time the copper needs for one cycle depends on bitplane DMA. Whenever - * possible, we calculate a fixed value and store it here. */ -static int copper_cycle_time; +enum diw_states +{ + DIW_waiting_start, DIW_waiting_stop +}; -static int dsklength; +static int plffirstline, plflastline, plfstrt, plfstop, plflinelen; +int diwfirstword, diwlastword; +static enum diw_states diwstate, hdiwstate; + +/* Sprite collisions */ +uae_u16 clxdat, clxcon; +int clx_sprmask; + +enum copper_states { + COP_stop, + COP_rdelay1, COP_read1, COP_read2, + COP_bltwait, + COP_wait1, COP_wait1b, COP_wait2, +}; -static int plffirstline,plflastline,plfstrt,plfstop,plflinelen; -static int diwfirstword,diwlastword; -static enum { DIW_waiting_start, DIW_waiting_stop } diwstate; +struct copper { + /* The current instruction words. */ + unsigned int i1, i2; + enum copper_states state; + /* Instruction pointer. */ + uaecptr ip; + int hpos, vpos, count; + unsigned int ignore_next; + unsigned int do_move; + enum diw_states vdiw; +}; -int dskdmaen; /* used in cia.c */ +static struct copper cop_state; -/* 880 isn't a magic number, it's a safe number with some padding at the end. - * This used to be 1000, but that's excessive. (840 is too low). I'm too lazy - * to figure out the exact space needed. */ -union { - /* Let's try to align this thing. */ - double uupzuq; - long int cruxmedo; - unsigned char apixels[880]; -} pixdata; - -char spixels[880]; /* for sprites */ -char spixstate[880]; /* more sprites */ - -ULONG ham_linebuf[880]; -ULONG aga_linebuf[880], *aga_lbufptr; - -char *xlinebuffer; -int next_lineno; -static int nln_how; +static void prepare_copper_1 (void); -static int *amiga2aspect_line_map, *native2amiga_line_map; -static int max_drawn_amiga_line; +int dskdmaen; /* used in cia.c */ /* * Statistics */ /* Used also by bebox.cpp */ -unsigned long int msecs = 0, frametime = 0, timeframes = 0; +unsigned long int msecs = 0, frametime = 0, lastframetime = 0, timeframes = 0; static unsigned long int seconds_base; int bogusframe; + +static int current_change_set; + +#ifdef OS_WITHOUT_MEMORY_MANAGEMENT +/* sam: Those arrays uses around 7Mb of BSS... That seems */ +/* too much for AmigaDOS (uae crashes as soon as one loads */ +/* it. So I use a different strategy here (realloc the */ +/* arrays when needed. That strategy might be usefull for */ +/* computer with low memory. */ +struct sprite_draw *sprite_positions[2]; +struct color_change *color_changes[2]; +struct delay_change *delay_changes; +static int max_sprite_draw = 400; +static int delta_sprite_draw = 0; +static int max_color_change = 400; +static int delta_color_change = 0; +static int max_delay_change = 100; +static int delta_delay_change = 0; +#else +struct sprite_draw sprite_positions[2][MAX_REG_CHANGE]; +struct color_change color_changes[2][MAX_REG_CHANGE]; +/* We don't remember those across frames, that would be too much effort. + * We simply redraw the line whenever we see one of these. */ +struct delay_change delay_changes[MAX_REG_CHANGE]; +#endif + +struct decision line_decisions[2 * (MAXVPOS + 1) + 1]; +struct draw_info line_drawinfo[2][2 * (MAXVPOS + 1) + 1]; +struct color_entry color_tables[2][(MAXVPOS + 1) * 2]; + +struct sprite_draw *curr_sprite_positions, *prev_sprite_positions; +struct color_change *curr_color_changes, *prev_color_changes; +struct draw_info *curr_drawinfo, *prev_drawinfo; +struct color_entry *curr_color_tables, *prev_color_tables; + +static int next_color_change, next_sprite_draw, next_delay_change; +static int next_color_entry, remembered_color_entry; +static int color_src_match, color_dest_match, color_compare_result; + +/* These few are only needed during/at the end of the scanline, and don't + * have to be remembered. */ +static int decided_bpl1mod, decided_bpl2mod, decided_nr_planes, decided_res; + +static char thisline_changed; + + +#ifdef SMART_UPDATE +#define MARK_LINE_CHANGED do { thisline_changed = 1; } while (0) +#else +#define MARK_LINE_CHANGED do { ; } while (0) +#endif + +static struct decision thisline_decision; +static int modulos_added, plane_decided, color_decided, very_broken_program; + /* * helper functions */ -int inhibit_frame; -static int framecnt = 0; +int rpt_available = 0; + +void reset_frame_rate_hack (void) +{ + if (currprefs.m68k_speed != -1) + return; + + if (! rpt_available) { + currprefs.m68k_speed = 0; + return; + } + + rpt_did_reset = 1; + is_lastline = 0; + vsyncmintime = read_processor_time() + vsynctime; + write_log ("Resetting frame rate hack\n"); +} + +static __inline__ void prepare_copper (void) +{ + if (cop_state.vpos > vpos + || cop_state.state == COP_stop) + { + eventtab[ev_copper].active = 0; + return; + } + prepare_copper_1 (); +} -static __inline__ void count_frame(void) +void check_prefs_changed_custom (void) { - if (inhibit_frame) - framecnt = 1; - else { - framecnt++; - if (framecnt >= framerate) - framecnt = 0; + currprefs.gfx_framerate = changed_prefs.gfx_framerate; + /* Not really the right place... */ + if (currprefs.jport0 != changed_prefs.jport0 + || currprefs.jport1 != changed_prefs.jport1) { + currprefs.jport0 = changed_prefs.jport0; + currprefs.jport1 = changed_prefs.jport1; + joystick_setting_changed (); } + currprefs.immediate_blits = changed_prefs.immediate_blits; + currprefs.blits_32bit_enabled = changed_prefs.blits_32bit_enabled; + } -static __inline__ void setclr(UWORD *p, UWORD val) +static __inline__ void setclr (uae_u16 *p, uae_u16 val) { - if (val & 0x8000) { + if (val & 0x8000) *p |= val & 0x7FFF; - } else { + else *p &= ~val; - } } -__inline__ int current_hpos(void) +__inline__ int current_hpos (void) { return cycles - eventtab[ev_hsync].oldcycles; } -static __inline__ UBYTE *pfield_xlateptr(CPTR plpt, int bytecount) +static __inline__ uae_u8 *pfield_xlateptr (uaecptr plpt, int bytecount) { - if (!chipmem_bank.check(plpt,bytecount)) { + if (!chipmem_bank.check (plpt, bytecount)) { static int count = 0; - if (count < 5) { - count++; - fprintf(stderr, "Warning: Bad playfield pointer"); - if (count == 5) fprintf(stderr, " (no further warnings)"); - fprintf(stderr, "\n"); - } + if (!count) + count++, write_log ("Warning: Bad playfield pointer\n"); return NULL; } - return chipmem_bank.xlateaddr(plpt); + return chipmem_bank.xlateaddr (plpt); } -static void calculate_copper_cycle_time (void) +static __inline__ void docols (struct color_entry *colentry) { - int bplplanes; - - if (diwstate == DIW_waiting_start || !dmaen (DMA_BITPLANE)) { - copper_cycle_time = 2; - return; +#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]; } - bplplanes = (bplcon0 & 0x7000) >> 12; - if (bplcon0 & 0x8000) - bplplanes *= 2; - copper_cycle_time = bplplanes <= 4 ? 2 : -1; -} - -/* line_draw_funcs: pfield_do_linetoscr, pfield_do_fill_line, decode_ham6 */ -typedef void (*line_draw_func)(int, int); - -#define LINE_UNDECIDED 1 -#define LINE_DECIDED 2 -#define LINE_DECIDED_DOUBLE 3 -#define LINE_AS_PREVIOUS 4 -#define LINE_BORDER_NEXT 5 -#define LINE_BORDER_PREV 6 -#define LINE_DONE 7 -#define LINE_DONE_AS_PREVIOUS 8 -#define LINE_REMEMBERED_AS_PREVIOUS 9 - -static char *line_drawn; -static char linestate[(maxvpos + 1)*2 + 1]; - -static int frame_redraw_necessary; -static int min_diwstart, max_diwstop, prev_x_adjust, linetoscr_x_adjust, linetoscr_right_x; -static int thisframe_y_adjust, prev_y_adjust, thisframe_first_drawn_line, thisframe_last_drawn_line; -static int thisframe_y_adjust_real, max_ypos_thisframe, min_ypos_for_screen; - -/* 50 words give you 800 horizontal pixels. An A500 can't do that, so it ought - * to be enough. */ -#define MAX_WORDS_PER_LINE 50 -static UBYTE line_data[(maxvpos+1) * 2][MAX_PLANES * MAX_WORDS_PER_LINE * 2]; - -/* - * The idea behind this code is that at some point during each horizontal - * line, we decide how to draw this line. There are many more-or-less - * independent decisions, each of which can be taken at a different horizontal - * position. - * Sprites, color changes and bitplane delay changes are handled specially: - * There isn't a single decision, but a list of structures containing - * information on how to draw the line. - */ - -struct color_change { - int linepos; - int regno; - unsigned long value; -}; - -struct sprite_draw { - int linepos; - int num; - int ctl; - UWORD data, datb; -}; - -struct delay_change { - int linepos; - unsigned int value; -}; - -/* Way too much... */ -#define MAX_REG_CHANGE ((maxvpos+1) * 2 * maxhpos) -static int current_change_set; - -/* Add others here (RISC OS, maybe Windows). Under Unix, these big arrays - * neither take up physical memory nor make the executable bigger so it's - * a very convenient way to get safety without overhead. */ -#ifdef AMIGA -#define OS_WITHOUT_MEMORY_MANAGEMENT -#endif - -#ifdef OS_WITHOUT_MEMORY_MANAGEMENT -/* sam: Those arrays uses around 7Mb of BBS... That seems */ -/* too much for AmigaDOS (uae crashes as soon as one loads */ -/* it. So I use a different strategy here (realloc the */ -/* arrays when needed. That strategy might be usefull for */ -/* computer with low memory. */ -static struct sprite_draw *sprite_positions[2]; -static int max_sprite_draw = 800; -static int _max_sprite_draw = 0; -static struct color_change *color_changes[2]; -static int max_color_change = 800; -static int _max_color_change = 0; -#else -static struct sprite_draw sprite_positions[2][MAX_REG_CHANGE]; -static struct color_change color_changes[2][MAX_REG_CHANGE]; #endif -/* We don't remember those across frames, that would be too much effort. - * We simply redraw the line whenever we see one of these. */ -static struct delay_change delay_changes[MAX_REG_CHANGE]; -static struct sprite_draw *curr_sprite_positions, *prev_sprite_positions; -static struct color_change *curr_color_changes, *prev_color_changes; - -static int next_color_change, next_sprite_draw, next_delay_change; - -static struct color_entry color_tables[2][(maxvpos+1) * 2]; -static struct color_entry *curr_color_tables, *prev_color_tables; -static int next_color_entry, remembered_color_entry, drawing_color_matches; -static enum { color_match_acolors, color_match_full } color_match_type; -static int color_src_match, color_dest_match; - -static int last_redraw_point; - -static int first_drawn_line, last_drawn_line; -static int first_block_line, last_block_line; +} -static void init_regchanges (void) +void notice_new_xcolors (void) { - size_t i; - - next_color_change = 0; - next_sprite_draw = 0; - current_change_set = 0; - for (i = 0; i < sizeof linestate / sizeof *linestate; i++) - linestate[i] = LINE_UNDECIDED; -} - -/* struct decision contains things we save across drawing frames for - * comparison (smart update stuff). */ -struct decision { - unsigned long color0; - int which; - int plfstrt, plflinelen; - int diwfirstword, diwlastword; - int ctable; - - UWORD bplcon0, bplcon1, bplcon2; -#if 0 /* We don't need this. */ - UWORD bplcon3; -#endif -#if AGA_CHIPSET == 1 - UWORD bplcon4; -#endif -}; - -/* Anything related to changes in hw registers during the DDF for one - * line. */ -struct draw_info { - int first_sprite_draw, last_sprite_draw; - int first_color_change, last_color_change; - int first_delay_change, last_delay_change; - int nr_color_changes, nr_sprites; -}; - -/* These few are only needed during/at the end of the scanline, and don't - * have to be remembered. */ -static int decided_bpl1mod, decided_bpl2mod, decided_nr_planes, decided_hires; - -/* These are generated by the drawing code from the line_decisions array for - * each line that needs to be drawn. */ -static int bplehb, bplham, bpldualpf, bpldualpfpri, bplplanecnt, bplhires; -static int bpldelay1, bpldelay2; -static int plfpri[3]; - -static struct decision line_decisions[2 * (maxvpos+1) + 1]; -static struct draw_info line_drawinfo[2][2 * (maxvpos+1) + 1]; -static struct draw_info *curr_drawinfo, *prev_drawinfo; -static struct decision *dp_for_drawing; -static struct draw_info *dip_for_drawing; - -static int line_changed[2 * (maxvpos+1)]; - -#ifdef SMART_UPDATE -#define MARK_LINE_CHANGED(l) do { line_changed[l] = 1; } while (0) -#else -#define MARK_LINE_CHANGED(l) do { } while (0) -#endif + int i; -static struct decision thisline_decision; -static int modulos_added, plane_decided, color_decided, very_broken_program; + docols(¤t_colors); +/* docols(&colors_for_drawing);*/ + for (i = 0; i < (MAXVPOS + 1)*2; i++) { + docols(color_tables[0]+i); + docols(color_tables[1]+i); + } +} -static void do_sprites(int currvp, int currhp); +static void do_sprites (int currvp, int currhp); static void remember_ctable (void) { @@ -470,84 +346,60 @@ static void remember_ctable (void) int oldctable = line_decisions[next_lineno].ctable; int changed = 0; - if (oldctable == -1) - changed = 1; - else if (fast_memcmp (&prev_color_tables[oldctable].color_regs, ¤t_colors.color_regs, - sizeof current_colors.color_regs) != 0) + if (oldctable == -1) { changed = 1; - - if (changed) { color_src_match = color_dest_match = -1; - line_changed[next_lineno] = 1; } else { - color_dest_match = remembered_color_entry; + color_compare_result = memcmp (&prev_color_tables[oldctable].color_regs, + ¤t_colors.color_regs, + sizeof current_colors.color_regs) != 0; + if (color_compare_result) + changed = 1; color_src_match = oldctable; + color_dest_match = remembered_color_entry; } + thisline_changed |= changed; + } else { + /* We know the result of the comparison */ + if (color_compare_result) + thisline_changed = 1; } } -static void decide_diw (void) +static void remember_ctable_for_border (void) +{ + remember_ctable (); +} + +/* Called to determine the state of the horizontal display window state + * machine at the current position. It might have changed since we last + * checked. */ +static void decide_diw (int hpos) { - if (thisline_decision.diwfirstword == -1 && PIXEL_XPOS (current_hpos ()) >= diwfirstword) { + if (hdiwstate == DIW_waiting_start && thisline_decision.diwfirstword == -1 + && PIXEL_XPOS (hpos) >= diwfirstword) + { thisline_decision.diwfirstword = diwfirstword; + hdiwstate = DIW_waiting_stop; /* Decide playfield delays only at DIW start, because they don't matter before and * some programs change them after DDF start but before DIW start. */ thisline_decision.bplcon1 = bplcon1; if (thisline_decision.diwfirstword != line_decisions[next_lineno].diwfirstword) - MARK_LINE_CHANGED (next_lineno); + MARK_LINE_CHANGED; thisline_decision.diwlastword = -1; } - if (thisline_decision.diwlastword == -1 && (current_hpos () >= maxhpos || PIXEL_XPOS (current_hpos ()) >= diwlastword)) { + if (hdiwstate == DIW_waiting_stop && thisline_decision.diwlastword == -1 + && PIXEL_XPOS (hpos) >= diwlastword) + { thisline_decision.diwlastword = diwlastword; + hdiwstate = DIW_waiting_start; if (thisline_decision.diwlastword != line_decisions[next_lineno].diwlastword) - MARK_LINE_CHANGED (next_lineno); - } -} - -static void record_color_change (int regno, unsigned long value) -{ - /* Early positions don't appear on-screen. */ - if (framecnt != 0 || vpos < minfirstline || current_hpos () < 0x18) - return; - decide_diw (); - - /* See if we can record the color table, but have not done so yet. - * @@@ There might be a minimal performance loss in case someone changes - * a color exactly at the start of the DIW. I don't think it can actually - * fail to work even in this case, but I'm not 100% sure. - * @@@ There might be a slightly larger performance loss if we're drawing - * this line as border... especially if there are changes in colors != 0 - * we might end up setting line_changed for no reason. FIXME */ - if (thisline_decision.diwfirstword >= 0) { - if (thisline_decision.ctable == -1) - remember_ctable (); - } - - /* Changes outside the DIW can be ignored if the modified color is not the - * background color, or if the accuracy is 0. */ - if ((regno != 0 || emul_accuracy == 0) - && (thisline_decision.diwfirstword < 0 || thisline_decision.diwlastword >= 0)) - return; - - /* 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]; - if (line_decisions[next_lineno].color0 != value) - line_changed[next_lineno] = 1; - } - /* Anything else gets recorded in the color_changes table. */ -#ifdef OS_WITHOUT_MEMORY_MANAGEMENT - if(next_color_change >= _max_color_change) { - _max_color_change = next_color_change; - return; + MARK_LINE_CHANGED; } -#endif - curr_color_changes[next_color_change].linepos = current_hpos (); - curr_color_changes[next_color_change].regno = regno; - curr_color_changes[next_color_change++].value = value; } +/* Called when we know that the line is not in the border and we want to draw + * it. The data fetch starting position and length are passed as parameters. */ static __inline__ void decide_as_playfield (int startpos, int len) { thisline_decision.which = 1; @@ -577,19 +429,95 @@ static __inline__ void decide_as_playfie #endif ) #endif /* SMART_UPDATE */ - line_changed[next_lineno] = 1; + thisline_changed = 1; +} + +/* Called when we already decided whether the line is playfield or border, + * but are no longer sure that this was such a good idea. This can make a + * difference only for very badly written software. + * + * We try to handle two cases: + * a) bitplane DMA gets turned off during a line which was decided as plane + * b) bitplane DMA turns on for all or some planes, either after the line was + * decided as border, or after we made an incorrect nr_planes decision. + * + * Examples of programs which need this: Majic 12 "Ray of Hope 2" demo + * (final large scrolltext) and Masterblazer (menu screen). + * + * There's no hope of catching all cases; we'd need a cycle based emulation + * for that. I'm getting increasingly convinced that that would be a good + * idea. + */ +static int broken_plane_sub[8]; + +static void init_broken_program (void) +{ + int i; + if (very_broken_program) + return; + very_broken_program = 1; + for (i = 0; i < 8; i++) + broken_plane_sub[i] = i >= decided_nr_planes || thisline_decision.which != 1 ? -1 : 0; } -static __inline__ void post_decide_line (void) +static void adjust_broken_program (int hpos) { - static int warned = 0; - int tmp; + int tmp1, tmp2; + int i; + if (decided_res == RES_HIRES) { + tmp1 = hpos & 3; + tmp2 = hpos & ~3; + } else if (decided_res == RES_SUPERHIRES) { + tmp1 = hpos & 1; + tmp2 = hpos & ~1; + } else { + tmp1 = hpos & 7; + tmp2 = hpos & ~7; + } + for (i = 0; i < decided_nr_planes; i++) { + if (broken_plane_sub[i] != -1) + continue; + /* FIXME: superhires, AGA playfields */ + /* Actually, I don't want to support this crap for AGA if we can avoid it. */ + if (decided_res == RES_HIRES) { + broken_plane_sub[i] = (tmp2 - thisline_decision.plfstrt) / 4 * 2; + switch (i) { + case 3: broken_plane_sub[i] += 2; break; /* @@@ break was missing */ + case 2: broken_plane_sub[i] += (tmp1 >= 3 ? 2 : 0); break; + case 1: broken_plane_sub[i] += (tmp1 >= 2 ? 2 : 0); break; + case 0: break; + } + } else { + broken_plane_sub[i] = (tmp2 - thisline_decision.plfstrt) / 8 * 2; + switch (i) { + case 5: broken_plane_sub[i] += (tmp1 >= 3 ? 2 : 0); break; + case 4: broken_plane_sub[i] += (tmp1 >= 7 ? 2 : 0); break; + case 3: broken_plane_sub[i] += (tmp1 >= 2 ? 2 : 0); break; + case 2: broken_plane_sub[i] += (tmp1 >= 6 ? 2 : 0); break; + case 1: broken_plane_sub[i] += (tmp1 >= 4 ? 2 : 0); break; + case 0: break; + } + } + } +} + +static __inline__ void set_decided_res (void) +{ + decided_res = RES_LORES; + if (bplcon0 & 0x8000) + decided_res = RES_HIRES; + if (bplcon0 & 0x40) + decided_res = RES_SUPERHIRES; +} - if (thisline_decision.which == 1 && current_hpos () < thisline_decision.plfstrt + thisline_decision.plflinelen - && ((bplcon0 & 0x7000) == 0 || !dmaen (DMA_BITPLANE))) +static __inline__ void post_decide_line (int hpos) +{ + if (thisline_decision.which == 1 + && hpos < thisline_decision.plfstrt + thisline_decision.plflinelen + && (GET_PLANES (bplcon0) == 0 || !dmaen (DMA_BITPLANE))) { /* This is getting gross... */ - thisline_decision.plflinelen = current_hpos() - thisline_decision.plfstrt; + thisline_decision.plflinelen = hpos - thisline_decision.plfstrt; thisline_decision.plflinelen &= 7; if (thisline_decision.plflinelen == 0) thisline_decision.which = -1; @@ -597,74 +525,91 @@ static __inline__ void post_decide_line modulos_added = 1; return; } + + if (diwstate == DIW_waiting_start + || GET_PLANES (bplcon0) == 0 + || !dmaen (DMA_BITPLANE) + || hpos >= thisline_decision.plfstrt + thisline_decision.plflinelen) + return; + + if (thisline_decision.which == 1 + && hpos > thisline_decision.plfstrt + && decided_nr_planes < nr_planes_from_bplcon0) + { + set_decided_res (); + init_broken_program (); + decided_nr_planes = nr_planes_from_bplcon0; + thisline_decision.bplcon0 &= 0xFEF; + thisline_decision.bplcon0 |= bplcon0 & 0xF010; + adjust_broken_program (hpos); + MARK_LINE_CHANGED; /* Play safe. */ + return; + } - if (thisline_decision.which != -1 || diwstate == DIW_waiting_start || (bplcon0 & 0x7000) == 0 - || !dmaen (DMA_BITPLANE) || current_hpos () >= thisline_decision.plfstrt + thisline_decision.plflinelen) + if (thisline_decision.which != -1) return; + #if 0 /* Can't warn because Kickstart 1.3 does it at reset time ;-) */ - if (!warned) { - fprintf(stderr, "That program you are running is _really_ broken.\n"); - warned = 1; + { + static int warned = 0; + if (!warned) { + write_log ("That program you are running is _really_ broken.\n"); + warned = 1; + } } #endif + init_broken_program (); - decided_hires = (bplcon0 & 0x8000) == 0x8000; - decided_nr_planes = ((bplcon0 & 0x7000) >> 12); + decided_nr_planes = nr_planes_from_bplcon0; + thisline_decision.bplcon0 &= 0xFEF; + thisline_decision.bplcon0 |= bplcon0 & 0xF010; - /* Magic 12, Ray of Hope 2 demo does ugly things. Looks great from the - * outside, rotten inside. */ - if (decided_hires) { - tmp = current_hpos () & ~3; - very_broken_program = current_hpos () & 3; - } else { - tmp = current_hpos () & ~7; - very_broken_program = current_hpos () & 7; - } - MARK_LINE_CHANGED (next_lineno); /* Play safe. */ - decide_as_playfield (tmp, plflinelen + plfstrt - tmp); + MARK_LINE_CHANGED; /* Play safe. */ + decide_as_playfield (plfstrt, plflinelen); + adjust_broken_program (hpos); } -static void decide_line_1 (void) +static void decide_line_1 (int hpos) { - do_sprites(vpos, current_hpos ()); + do_sprites (vpos, hpos); /* Surprisingly enough, this seems to be correct here - putting this into * decide_diw() results in garbage. */ if (diwstate == DIW_waiting_start && vpos == plffirstline) { diwstate = DIW_waiting_stop; - calculate_copper_cycle_time (); } if (diwstate == DIW_waiting_stop && vpos == plflastline) { diwstate = DIW_waiting_start; - calculate_copper_cycle_time (); } if (framecnt != 0) { /* thisline_decision.which = -2; This doesn't do anything but hurt, I think. */ return; } - - if (!dmaen(DMA_BITPLANE) || diwstate == DIW_waiting_start || (bplcon0 & 0x7000) == 0) { + + if (!dmaen(DMA_BITPLANE) || diwstate == DIW_waiting_start || nr_planes_from_bplcon0 == 0) { /* We don't want to draw this one. */ thisline_decision.which = -1; + thisline_decision.plfstrt = plfstrt; + thisline_decision.plflinelen = plflinelen; return; } - decided_hires = (bplcon0 & 0x8000) == 0x8000; - decided_nr_planes = ((bplcon0 & 0x7000) >> 12); + set_decided_res (); + decided_nr_planes = nr_planes_from_bplcon0; #if 0 - /* The blitter gets slower if there's high bitplane activity. + /* The blitter gets slower if there's high bitplane activity. * @@@ but the values must be different. FIXME */ if (bltstate != BLT_done - && ((decided_hires && decided_nr_planes > 2) - || (!decided_hires && decided_nr_planes > 4))) + && ((decided_res == RES_HIRES && decided_nr_planes > 2) + || (decided_res == RES_LORES && decided_nr_planes > 4))) { int pl = decided_nr_planes; unsigned int n = (eventtab[ev_blitter].evtime-cycles); if (n > plflinelen) n = plflinelen; n >>= 1; - if (decided_hires) + if (decided_res == RES_HIRES) pl <<= 1; if (pl == 8) eventtab[ev_blitter].evtime += plflinelen; @@ -678,20 +623,77 @@ static void decide_line_1 (void) decide_as_playfield (plfstrt, plflinelen); } -static __inline__ void decide_line (void) +/* Main entry point for deciding how to draw a line. May either do + * nothing, decide the line as border, or decide the line as playfield. */ +static __inline__ void decide_line (int hpos) { - if (thisline_decision.which == 0 && current_hpos() >= plfstrt) - decide_line_1 (); + if (thisline_decision.which == 0 && hpos >= plfstrt) + decide_line_1 (hpos); +} + +/* Called when a color is about to be changed (write to a color register), + * but the new color has not been entered into the table yet. */ +static void record_color_change (int hpos, int regno, unsigned long value) +{ + /* Early positions don't appear on-screen. */ + if (framecnt != 0 || vpos < minfirstline || hpos < 0x18 + /*|| currprefs.emul_accuracy == 0*/) + return; + + decide_diw (hpos); + decide_line (hpos); + + /* See if we can record the color table, but have not done so yet. + * @@@ There might be a minimal performance loss in case someone changes + * a color exactly at the start of the DIW. I don't think it can actually + * fail to work even in this case, but I'm not 100% sure. + * @@@ There might be a slightly larger performance loss if we're drawing + * this line as border... especially if there are changes in colors != 0 + * we might end up setting line_changed for no reason. FIXME */ + if (thisline_decision.diwfirstword >= 0 + && thisline_decision.which != 0) + { + if (thisline_decision.ctable == -1) + remember_ctable (); + } + + /* Changes outside the DIW can be ignored if the modified color is not the + * background color, or if the accuracy is < 2. */ + if ((regno != 0 || currprefs.emul_accuracy < 2) + && (diwstate == DIW_waiting_start || thisline_decision.diwfirstword < 0 + || thisline_decision.diwlastword >= 0 + || thisline_decision.which == 0 + || (thisline_decision.which == 1 && hpos >= thisline_decision.plfstrt + thisline_decision.plflinelen))) + return; + + /* 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]; + if (line_decisions[next_lineno].color0 != value) + thisline_changed = 1; + } + /* Anything else gets recorded in the color_changes table. */ +#ifdef OS_WITHOUT_MEMORY_MANAGEMENT + if (next_color_change >= max_color_change) { + ++delta_color_change; + return; + } +#endif + curr_color_changes[next_color_change].linepos = hpos; + curr_color_changes[next_color_change].regno = regno; + curr_color_changes[next_color_change++].value = value; } -static void decide_delay (void) +/* Stupid hack to get some Sanity demos working. */ +static void decide_delay (int hpos) { static int warned; /* Don't do anything if we're outside the DIW. */ if (thisline_decision.diwfirstword == -1 || thisline_decision.diwlastword > 0) return; - decide_line (); + decide_line (hpos); /* Half-hearted attempt to get things right even when post_decide_line() changes * the decision afterwards. */ if (thisline_decision.which != 1) { @@ -699,24 +701,30 @@ static void decide_delay (void) return; } /* @@@ Could check here for DDF stopping earlier than DIW */ - - delay_changes[next_delay_change].linepos = current_hpos (); + +#ifdef OS_WITHOUT_MEMORY_MANAGEMENT + if (next_delay_change >= max_delay_change) { + ++delta_delay_change; + return; + } +#endif + delay_changes[next_delay_change].linepos = hpos; delay_changes[next_delay_change++].value = bplcon1; if (!warned) { warned = 1; - fprintf (stderr, "Program is torturing BPLCON1.\n"); + write_log ("Program is torturing BPLCON1.\n"); } } /* - * The decision which bitplane pointers to use is not taken at plfstrt, since + * The decision which bitplane pointers to use is not made at plfstrt, since * data fetch does not start for all planes at this point. Therefore, we wait * for the end of the ddf area or the first write to any of the bitplane * pointer registers, whichever comes last, before we decide which plane pointers * to use. * Call decide_line() before this function. */ -static void decide_plane (void) +static void decide_plane (int hpos) { int i, bytecount; @@ -724,65 +732,52 @@ static void decide_plane (void) return; if (decided_nr_planes == -1 /* Still undecided */ - || current_hpos () < thisline_decision.plfstrt + thisline_decision.plflinelen) + || hpos < thisline_decision.plfstrt + thisline_decision.plflinelen) return; plane_decided = 1; - bytecount = plflinelen / (decided_hires ? 4 : 8) * 2; + bytecount = plflinelen / RES_SHIFT (decided_res) * 2; if (bytecount > MAX_WORDS_PER_LINE * 2) { /* Can't happen. */ static int warned = 0; if (!warned) - fprintf (stderr, "Mysterious bug in decide_plane(). Please report.\n"); + write_log ("Mysterious bug in decide_plane(). Please report.\n"); + warned = 1; bytecount = 0; } if (!very_broken_program) { - UBYTE *dataptr = line_data[next_lineno]; + uae_u8 *dataptr = line_data[next_lineno]; for (i = 0; i < decided_nr_planes; i++, dataptr += MAX_WORDS_PER_LINE*2) { - CPTR pt = bplpt[i]; - UBYTE *real_ptr = pfield_xlateptr(pt, bytecount); + uaecptr pt = bplpt[i]; + uae_u8 *real_ptr = pfield_xlateptr(pt, bytecount); if (real_ptr == NULL) real_ptr = pfield_xlateptr(0, 0); #ifdef SMART_UPDATE - if (!line_changed[next_lineno]) - line_changed[next_lineno] |= memcmpy (dataptr, real_ptr, bytecount); - else +#if 1 + if (thisline_changed) memcpy (dataptr, real_ptr, bytecount); + else +#endif + thisline_changed |= memcmpy (dataptr, real_ptr, bytecount); #else real_bplpt[i] = real_ptr; #endif } } else { - UBYTE *dataptr = line_data[next_lineno]; + uae_u8 *dataptr = line_data[next_lineno]; for (i = 0; i < decided_nr_planes; i++, dataptr += MAX_WORDS_PER_LINE*2) { - CPTR pt = bplpt[i]; - UBYTE *real_ptr; - - if (decided_hires) { - switch (i) { - case 3: pt -= 2; - case 2: pt -= (very_broken_program >= 3 ? 2 : 0); break; - case 1: pt -= (very_broken_program >= 2 ? 2 : 0); break; - case 0: break; - } - } else { - switch (i) { - case 5: pt -= (very_broken_program >= 3 ? 2 : 0); break; - case 4: pt -= (very_broken_program >= 7 ? 2 : 0); break; - case 3: pt -= (very_broken_program >= 2 ? 2 : 0); break; - case 2: pt -= (very_broken_program >= 6 ? 2 : 0); break; - case 1: pt -= (very_broken_program >= 4 ? 2 : 0); break; - case 0: break; - } - } - real_ptr = pfield_xlateptr(pt, bytecount); + uaecptr pt = bplpt[i]; + uae_u8 *real_ptr; + + pt -= broken_plane_sub[i]; + real_ptr = pfield_xlateptr (pt, bytecount); if (real_ptr == NULL) real_ptr = pfield_xlateptr(0, 0); #ifdef SMART_UPDATE - if (!line_changed[next_lineno]) - line_changed[next_lineno] |= memcmpy (dataptr, real_ptr, bytecount); + if (!thisline_changed) + thisline_changed |= memcmpy (dataptr, real_ptr, bytecount); else memcpy (dataptr, real_ptr, bytecount); #else @@ -797,28 +792,31 @@ static void decide_plane (void) * This routine decides whether the new value is already relevant for the * current line. */ -static void decide_modulos (void) +static void decide_modulos (int hpos) { /* All this effort just for the Sanity WOC demo... */ - decide_line (); - if (decided_nr_planes != -1 && current_hpos() >= thisline_decision.plfstrt + thisline_decision.plflinelen) + decide_line (hpos); + if (decided_nr_planes != -1 && hpos >= thisline_decision.plfstrt + thisline_decision.plflinelen) return; decided_bpl1mod = bpl1mod; decided_bpl2mod = bpl2mod; } /* - * Call decide_plane() before calling this. + * Add the modulos to the bitplane pointers if data fetch is already + * finished for the current line. + * Call decide_plane() before calling this, so that we won't use the + * new values of the plane pointers for the current line. */ -static void do_modulos (void) +static void do_modulos (int hpos) { /* decided_nr_planes is != -1 if this line should be drawn by the - * display hardware, regardless of whether it fits on the emulated screen. + * display hardware, regardless of whether it fits on the emulated screen. */ if (decided_nr_planes != -1 && plane_decided && !modulos_added - && current_hpos() >= thisline_decision.plfstrt + thisline_decision.plflinelen) + && hpos >= thisline_decision.plfstrt + thisline_decision.plflinelen) { - int bytecount = thisline_decision.plflinelen / (decided_hires ? 4 : 8) * 2; + int bytecount = thisline_decision.plflinelen / RES_SHIFT (decided_res) * 2; int add1 = bytecount + decided_bpl1mod; int add2 = bytecount + decided_bpl2mod; @@ -833,135 +831,146 @@ static void do_modulos (void) case 2: bplpt[1] += add2; case 1: bplpt[0] += add1; } - } else if (bplhires) { - switch (decided_nr_planes) { - case 8: bplpt[7] += add2; - case 7: bplpt[6] += add1; - case 6: bplpt[5] += add2; - case 5: bplpt[4] += add1; - case 4: bplpt[3] += add2 - 2; - case 3: bplpt[2] += add1 - (very_broken_program >= 3 ? 2 : 0); - case 2: bplpt[1] += add2 - (very_broken_program >= 2 ? 2 : 0); - case 1: bplpt[0] += add1; - } - } else { - switch (decided_nr_planes) { - case 8: bplpt[7] += add2; - case 7: bplpt[6] += add1; - case 6: bplpt[5] += add2 - (very_broken_program >= 3 ? 2 : 0); - case 5: bplpt[4] += add1 - (very_broken_program >= 7 ? 2 : 0); - case 4: bplpt[3] += add2 - (very_broken_program >= 2 ? 2 : 0); - case 3: bplpt[2] += add1 - (very_broken_program >= 6 ? 2 : 0); - case 2: bplpt[1] += add2 - (very_broken_program >= 4 ? 2 : 0); - case 1: bplpt[0] += add1; - } + } else switch (decided_nr_planes) { + case 8: bplpt[7] += add2 - broken_plane_sub[7]; + case 7: bplpt[6] += add1 - broken_plane_sub[6]; + case 6: bplpt[5] += add2 - broken_plane_sub[5]; + case 5: bplpt[4] += add1 - broken_plane_sub[4]; + case 4: bplpt[3] += add2 - broken_plane_sub[3]; + case 3: bplpt[2] += add1 - broken_plane_sub[2]; + case 2: bplpt[1] += add2 - broken_plane_sub[1]; + case 1: bplpt[0] += add1 - broken_plane_sub[0]; } modulos_added = 1; } } -static void decide_sprite (int spr) +static __inline__ void record_sprite (int spr, int sprxp) { - int sprxp; + int pos = next_sprite_draw; + unsigned int data, datb; - if (framecnt != 0) +#ifdef OS_WITHOUT_MEMORY_MANAGEMENT + if(pos >= max_sprite_draw) { + ++delta_sprite_draw; return; + } +#endif + /* XXX FIXME, this isn't very clever, but it might do */ + for (;;) { + if (pos == curr_drawinfo[next_lineno].first_sprite_draw) + break; + if (curr_sprite_positions[pos-1].linepos < sprxp) + break; + if (curr_sprite_positions[pos-1].linepos == sprxp + && curr_sprite_positions[pos-1].num > spr) + break; + printf("Foo\n"); + pos--; + } + if (pos != next_sprite_draw) { + int pos2 = next_sprite_draw; + while (pos2 != pos) { + curr_sprite_positions[pos2] = curr_sprite_positions[pos2-1]; + pos2--; + } + } + curr_sprite_positions[pos].linepos = sprxp; + curr_sprite_positions[pos].num = spr; + curr_sprite_positions[pos].ctl = sprctl[spr]; + data = sprdata[spr]; + datb = sprdatb[spr]; + curr_sprite_positions[pos].datab = ((sprtaba[data & 0xFF] << 16) | sprtaba[data >> 8] + | (sprtabb[datb & 0xFF] << 16) | sprtabb[datb >> 8]); + next_sprite_draw++; +} - decide_diw (); - decide_line (); +static void decide_sprites (int hpos) +{ + int nrs[MAX_SPRITES], posns[MAX_SPRITES]; + int count, i; + int point = PIXEL_XPOS (hpos); - if (!sprarmed[spr] || thisline_decision.which != 1 || current_hpos () < 0x14) + if (framecnt != 0 || hpos < 0x14 || nr_armed == 0 || point == last_sprite_point) return; - sprxp = sprxpos[spr]; - /* We _must_ check at the start of the sprite - we might avoid some - * unnecessary redraws by testing at the end, but that doesn't always - * work. */ - if (sprxp > PIXEL_XPOS (current_hpos ()) || sprite_last_drawn_at[spr] >= sprxp) - return; - - sprite_last_drawn_at[spr] = sprxp; + decide_diw (hpos); + decide_line (hpos); - /* Ignore sprites outside the DIW. There is a small problem here when - * we haven't decided diwstart yet - but that should be very rare and - * drawing one sprite too much doesn't hurt all that much. - * We don't draw sprites with zero data, unless they might be attached - * sprites. */ - if (sprxp < 0 - || (thisline_decision.diwfirstword >= 0 && sprxp + sprite_width < thisline_decision.diwfirstword) - || (thisline_decision.diwlastword >= 0 && sprxp > thisline_decision.diwlastword) - || (sprdata[spr] == 0 && sprdatb[spr] == 0 && (sprctl[(spr & ~1)+1] & 0x80) == 0)) + if (thisline_decision.which != 1) return; -#ifdef OS_WITHOUT_MEMORY_MANAGEMENT - if(next_sprite_draw >= _max_sprite_draw) { - _max_sprite_draw = next_sprite_draw; - return; - } -#endif - curr_sprite_positions[next_sprite_draw].linepos = sprxp; - curr_sprite_positions[next_sprite_draw].num = spr; - curr_sprite_positions[next_sprite_draw].ctl = sprctl[spr]; - curr_sprite_positions[next_sprite_draw].data = sprdata[spr]; - curr_sprite_positions[next_sprite_draw++].datb = sprdatb[spr]; -} -static __inline__ void decide_sprite_1 (int spr) -{ - int sprxp = sprxpos[spr]; + count = 0; + for (i = 0; i < 8; i++) { + int sprxp = sprxpos[i]; + int j, bestp; - if (sprxp > max_diwlastword || sprite_last_drawn_at[spr] >= sprxp - || sprxp < 0 - || (thisline_decision.diwfirstword >= 0 && sprxp + sprite_width < thisline_decision.diwfirstword) - || (thisline_decision.diwlastword >= 0 && sprxp > thisline_decision.diwlastword) - || (sprdata[spr] == 0 && sprdatb[spr] == 0 && (sprctl[(spr & ~1)+1] & 0x80) == 0)) - return; + if (!sprarmed[i] || 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)) + continue; - curr_sprite_positions[next_sprite_draw].linepos = sprxp; - curr_sprite_positions[next_sprite_draw].num = spr; - curr_sprite_positions[next_sprite_draw].ctl = sprctl[spr]; - curr_sprite_positions[next_sprite_draw].data = sprdata[spr]; - curr_sprite_positions[next_sprite_draw++].datb = sprdatb[spr]; + for (bestp = 0; bestp < count; bestp++) { + if (posns[bestp] > sprxp) + break; + if (posns[bestp] == sprxp && nrs[bestp] < i) + break; + } + for (j = count; j > bestp; j--) { + posns[j] = posns[j-1]; + nrs[j] = nrs[j-1]; + } + posns[j] = sprxp; + nrs[j] = i; + count++; + } + for (i = 0; i < count; i++) + record_sprite (nrs[i], posns[i]); + last_sprite_point = point; } +/* End of a horizontal scan line. Finish off all decisions that were not + * made yet. */ static void finish_decisions (void) { struct draw_info *dip; struct draw_info *dip_old; struct decision *dp; int changed; - int i; + int hpos = current_hpos (); if (framecnt != 0) return; - decide_diw (); + decide_diw (hpos); if (thisline_decision.which == 0) - decide_line_1 (); + decide_line_1 (hpos); + + /* Large DIWSTOP values can cause the stop position never to be + * reached, so the state machine always stays in the same state and + * there's a more-or-less full-screen DIW. */ + if (hdiwstate == DIW_waiting_stop) { + thisline_decision.diwlastword = max_diwlastword; + if (thisline_decision.diwlastword != line_decisions[next_lineno].diwlastword) + MARK_LINE_CHANGED; + } + if (line_decisions[next_lineno].which != thisline_decision.which) - line_changed[next_lineno] = 1; - decide_plane (); + thisline_changed = 1; + decide_plane (hpos); dip = curr_drawinfo + next_lineno; dip_old = prev_drawinfo + next_lineno; dp = line_decisions + next_lineno; - changed = line_changed[next_lineno]; + changed = thisline_changed; if (thisline_decision.which == 1) { - if (diwlastword > max_diwstop) - max_diwstop = diwlastword; - if (diwfirstword < min_diwstart) - min_diwstart = diwfirstword; - - if (sprarmed[0]) decide_sprite_1 (0); - if (sprarmed[1]) decide_sprite_1 (1); - if (sprarmed[2]) decide_sprite_1 (2); - if (sprarmed[3]) decide_sprite_1 (3); - if (sprarmed[4]) decide_sprite_1 (4); - if (sprarmed[5]) decide_sprite_1 (5); - if (sprarmed[6]) decide_sprite_1 (6); - if (sprarmed[7]) decide_sprite_1 (7); - + record_diw_line (diwfirstword, diwlastword); + + decide_sprites (hpos); + if (thisline_decision.bplcon1 != line_decisions[next_lineno].bplcon1) changed = 1; } @@ -969,10 +978,13 @@ static void finish_decisions (void) dip->last_color_change = next_color_change; dip->last_delay_change = next_delay_change; dip->last_sprite_draw = next_sprite_draw; - - /* Must do this for border also... this should be more clever. FIXME */ - if (/*thisline_decision.which == 1 && */thisline_decision.ctable == -1) - remember_ctable (); + + if (thisline_decision.ctable == -1) { + if (thisline_decision.which == 1) + remember_ctable (); + else + remember_ctable_for_border (); + } if (thisline_decision.which == -1 && thisline_decision.color0 == 0xFFFFFFFFul) thisline_decision.color0 = current_colors.color_regs[0]; @@ -983,31 +995,30 @@ static void finish_decisions (void) changed = 1; if (!changed && (dip->nr_color_changes != dip_old->nr_color_changes - || (dip->nr_color_changes > 0 - && fast_memcmp (curr_color_changes + dip->first_color_change, - prev_color_changes + dip_old->first_color_change, - dip->nr_color_changes * sizeof *curr_color_changes) != 0))) + || (dip->nr_color_changes > 0 + && memcmp (curr_color_changes + dip->first_color_change, + prev_color_changes + dip_old->first_color_change, + dip->nr_color_changes * sizeof *curr_color_changes) != 0))) changed = 1; if (!changed && thisline_decision.which == 1 && (dip->nr_sprites != dip_old->nr_sprites || (dip->nr_sprites > 0 - && fast_memcmp (curr_sprite_positions + dip->first_sprite_draw, - prev_sprite_positions + dip_old->first_sprite_draw, - dip->nr_sprites * sizeof *curr_sprite_positions) != 0))) + && memcmp (curr_sprite_positions + dip->first_sprite_draw, + prev_sprite_positions + dip_old->first_sprite_draw, + dip->nr_sprites * sizeof *curr_sprite_positions) != 0))) changed = 1; if (changed) { - line_changed[next_lineno] = 1; + thisline_changed = 1; *dp = thisline_decision; } else /* The only one that may differ: */ dp->ctable = thisline_decision.ctable; } +/* Set the state of all decisions to "undecided" for a new scanline. */ static void reset_decisions (void) { - int i; - if (framecnt != 0) return; thisline_decision.which = 0; @@ -1015,24 +1026,31 @@ static void reset_decisions (void) decided_bpl2mod = bpl2mod; decided_nr_planes = -1; - /* decided_hires shouldn't be touched before it's initialized by decide_line(). */ + /* decided_res shouldn't be touched before it's initialized by decide_line(). */ thisline_decision.diwfirstword = -1; thisline_decision.diwlastword = -2; + if (hdiwstate == DIW_waiting_stop) { + thisline_decision.diwfirstword = PIXEL_XPOS (DISPLAY_LEFT_SHIFT/2); + if (thisline_decision.diwfirstword != line_decisions[next_lineno].diwfirstword) + MARK_LINE_CHANGED; + } thisline_decision.ctable = -1; thisline_decision.color0 = 0xFFFFFFFFul; - line_changed[next_lineno] = 0; + thisline_changed = 0; curr_drawinfo[next_lineno].first_color_change = next_color_change; curr_drawinfo[next_lineno].first_delay_change = next_delay_change; curr_drawinfo[next_lineno].first_sprite_draw = next_sprite_draw; - memset(sprite_last_drawn_at, 0, sizeof sprite_last_drawn_at); + /* memset(sprite_last_drawn_at, 0, sizeof sprite_last_drawn_at); */ + last_sprite_point = 0; modulos_added = 0; plane_decided = 0; color_decided = 0; very_broken_program = 0; } +/* Initialize the decision array, once before the emulator really starts. */ static void init_decisions (void) { size_t i; @@ -1041,10 +1059,58 @@ static void init_decisions (void) } } +/* set PAL or NTSC timing variables */ + +static void init_hz (void) +{ + int isntsc; + + beamcon0 = new_beamcon0; + init_decisions (); + + isntsc = beamcon0 & 0x20 ? 0 : 1; + if (!isntsc) { + maxvpos = MAXVPOS_PAL; + maxhpos = MAXHPOS_PAL; + minfirstline = MINFIRSTLINE_PAL; + vblank_endline = VBLANK_ENDLINE_PAL; + vblank_hz = VBLANK_HZ_PAL; + } else { + maxvpos = MAXVPOS_NTSC; + maxhpos = MAXHPOS_NTSC; + minfirstline = MINFIRSTLINE_NTSC; + vblank_endline = VBLANK_ENDLINE_NTSC; + vblank_hz = VBLANK_HZ_NTSC; + } + vsynctime = syncbase / vblank_hz; + + 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) { - diwfirstword = ((diwstrt & 0xFF) - DISPLAY_LEFT_SHIFT - 1) << lores_shift; - diwlastword = ((diwstop & 0xFF) + 0x100 - DISPLAY_LEFT_SHIFT - 1) << lores_shift; + int mask, add, mask2, add2, plfold; + + int hstrt = diwstrt & 0xFF; + int hstop = diwstop & 0xFF; + int vstrt = diwstrt >> 8; + int vstop = diwstop >> 8; + + if (diwhigh_written) { + hstrt |= ((diwhigh >> 5) & 1) << 8; + hstop |= ((diwhigh >> 13) & 1) << 8; + vstrt |= (diwhigh & 7) << 8; + vstop |= ((diwhigh >> 8) & 7) << 8; + } else { + hstop += 0x100; + if ((vstop & 0x80) == 0) + vstop |= 0x100; + } + + diwfirstword = coord_hw_to_native_x (hstrt - 1); + diwlastword = coord_hw_to_native_x (hstop - 1); if (diwlastword > max_diwlastword) diwlastword = max_diwlastword; @@ -1052,9 +1118,10 @@ static void calcdiw (void) diwfirstword = 0; if (diwlastword < 0) diwlastword = 0; - - plffirstline = diwstrt >> 8; - plflastline = diwstop >> 8; + + plffirstline = vstrt; + plflastline = vstop; + #if 0 /* This happens far too often. */ if (plffirstline < minfirstline) { @@ -1062,657 +1129,404 @@ static void calcdiw (void) plffirstline = minfirstline; } #endif - if ((plflastline & 0x80) == 0) plflastline |= 0x100; + #if 0 /* Turrican does this */ if (plflastline > 313) { - fprintf(stderr, "Warning: Playfield out of range!\n"); + fprintf (stderr, "Warning: Playfield out of range!\n"); 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... */ - plfstrt &= ~3; - plfstop &= ~3; - /* @@@ Start looking for AGA bugs here... (or maybe even in the above masking ops) */ - if ((fmode & 3) == 0) - plflinelen = (plfstop-plfstrt+15) & ~7; - else if ((fmode & 3) == 3) - plflinelen = (plfstop-plfstrt+63) & ~31; - else - plflinelen = (plfstop-plfstrt+31) & ~15; -} -/* - * Screen update macros/functions - */ - -static void decode_ham6 (int pix, int stoppos) -{ - static UWORD lastcolor; - ULONG *buf = ham_linebuf; - - if (!bplham || bplplanecnt != 6) - return; - - if (stoppos > dp_for_drawing->diwlastword) - stoppos = dp_for_drawing->diwlastword; - if (pix < dp_for_drawing->diwfirstword) { - lastcolor = colors_for_drawing.color_regs[0]; - pix = dp_for_drawing->diwfirstword; - } -#ifdef LORES_HACK - if (gfx_requested_lores == 2) - pix <<= 1, stoppos <<= 1; -#endif - while (pix < stoppos) { - int pv = pixdata.apixels[pix]; - switch(pv & 0x30) { - case 0x00: lastcolor = colors_for_drawing.color_regs[pv]; break; - case 0x10: lastcolor &= 0xFF0; lastcolor |= (pv & 0xF); break; - case 0x20: lastcolor &= 0x0FF; lastcolor |= (pv & 0xF) << 8; break; - case 0x30: lastcolor &= 0xF0F; lastcolor |= (pv & 0xF) << 4; break; + 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; - buf[pix++] = lastcolor; - } -} -#if 0 -static void decode_ham_aga (int pix, int stoppos) -{ - static ULONG lastcolor; - ULONG *buf = ham_linebuf; - - if (!bplham || (bplplanecnt != 6 && bplplanecnt != 8)) - return; - - if (pix <= dp_for_drawing->diwfirstword) { - pix = dp_for_drawing->diwfirstword; - lastcolor = colors_for_drawing.color_regs[0]; - } - - if (dp_for_drawing->bplplanecnt == 6) { - /* HAM 6 */ - while (pix < dp_for_drawing->diwlastword && pix < stoppos) { - int pv = pixdata.apixels[pix]; - switch(pv & 0x30) { - case 0x00: lastcolor = colors_for_drawing.color_regs[pv]; break; - case 0x10: lastcolor &= 0xFFFF00; lastcolor |= (pv & 0xF)*0x11; break; - case 0x20: lastcolor &= 0x00FFFF; lastcolor |= (pv & 0xF)*0x11 << 16; break; - case 0x30: lastcolor &= 0xFF00FF; lastcolor |= (pv & 0xF)*0x11 << 8; break; - } - buf[pix++] = lastcolor; - } - } else if (dp_for_drawing->bplplanecnt == 8) { - /* HAM 8 */ - while (pix < dp_for_drawing->diwlastword && pix < stoppos) { - int pv = pixdata.apixels[pix]; - switch(pv & 0x3) { - case 0x0: lastcolor = colors_for_drawing.color_regs[pv >> 2]; break; - case 0x1: lastcolor &= 0xFFFF03; lastcolor |= (pv & 0xFC); break; - case 0x2: lastcolor &= 0x03FFFF; lastcolor |= (pv & 0xFC) << 16; break; - case 0x3: lastcolor &= 0xFF03FF; lastcolor |= (pv & 0xFC) << 8; break; - } - buf[pix++] = lastcolor; } } -} + /* 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 +} -#if AGA_CHIPSET != 0 -/* WARNING: Not too much of this will work correctly yet. */ +/* + * 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 +*/ -static void pfield_linetoscr_aga(int pix, int stoppos) -{ - ULONG *buf = aga_lbufptr; - int i; - int xor = (UBYTE)(bplcon4 >> 8); - int oldpix = pix; \ +/* Mousehack stuff */ - buf -= pix; \ +#define defstepx (1<<16) +#define defstepy (1<<16) +#define defxoffs 0 +#define defyoffs 0 - for (i = 0; i < stoppos; i++) - pixdata.apixels[i] ^= xor; - - while (pix < diwfirstword && pix < stoppos) { - buf[pix++] = colors_for_drawing.color_regs[0]; - } - if (bplham) { - while (pix < diwlastword && pix < stoppos) { - ULONG d = ham_linebuf[pix]; - buf[pix] = d; - pix++; - } - } else if (bpldualpf) { - /* Dual playfield */ - int *lookup = bpldualpfpri ? dblpf_aga2 : dblpf_aga1; - int *lookup_no = bpldualpfpri ? dblpf_2nd2 : dblpf_2nd1; - while (pix < diwlastword && pix < stoppos) { - int pixcol = pixdata.apixels[pix]; - int pfno = lookup_no[pixcol]; - - if (spixstate[pix]) { - buf[pix] = colors_for_drawing.color_regs[pixcol]; - } else { - int val = lookup[pixdata.apixels[pix]]; - if (pfno == 2) - val += dblpfofs[(bplcon2 >> 10) & 7]; - buf[pix] = colors_for_drawing.color_regs[val]; - } - pix++; - } - } else if (bplehb) { - while (pix < diwlastword && pix < stoppos) { - int pixcol = pixdata.apixels[pix]; - ULONG d = colors_for_drawing.color_regs[pixcol]; - /* What about sprites? */ - if (pixcol & 0x20) - d = (d & 0x777777) >> 1; - buf[pix] = d; - pix++; - } - } else { - while (pix < diwlastword && pix < stoppos) { - int pixcol = pixdata.apixels[pix]; - buf[pix] = colors_for_drawing.color_regs[pixcol]; - pix++; - } - } - while (pix < stoppos) { - buf[pix++] = colors_for_drawing.color_regs[0]; - } - aga_lbufptr += pix - oldpix; -} +static const int docal = 60, xcaloff = 40, ycaloff = 20; +static const int calweight = 3; +static int lastsampledmx, lastsampledmy; +static int lastspr0x,lastspr0y,lastdiffx,lastdiffy,spr0pos,spr0ctl; +static int mstepx,mstepy,xoffs=defxoffs,yoffs=defyoffs; +static int sprvbfl; -static void aga_translate32(int start, int stop) -{ - memcpy (((ULONG *)xlinebuffer) + start, aga_linebuf + start, 4*(stop-start)); -} +int lastmx, lastmy; +int newmousecounters; +int ievent_alive = 0; -static void aga_translate16(int start, int stop) -{ - int i; - for (i = start; i < stop; i++) { - ULONG d = aga_linebuf[i]; - UWORD v = ((d & 0xF0) >> 4) | ((d & 0xF000) >> 8) | ((d & 0xF00000) >> 12); - ((UWORD *)xlinebuffer)[i] = xcolors[v]; - } -} +static enum { unknown_mouse, normal_mouse, dont_care_mouse, follow_mouse } mousestate; -static void aga_translate8(int start, int stop) +static void mousehack_setdontcare (void) { - int i; - for (i = start; i < stop; i++) { - ULONG d = aga_linebuf[i]; - UWORD v = ((d & 0xF0) >> 4) | ((d & 0xF000) >> 8) | ((d & 0xF00000) >> 12); - ((UBYTE *)xlinebuffer)[i] = xcolors[v]; - } -} -#endif - -static int linetoscr_double_offset; + if (mousestate == dont_care_mouse) + return; -#define LINE_TO_SCR(NAME, TYPE, DO_DOUBLE) \ -static void NAME(int pix, int lframe_end, int diw_end, int stoppos) \ -{ \ - TYPE *buf = ((TYPE *)xlinebuffer); \ - int oldpix = pix; \ - /* These are different for register-allocation purposes. */ \ - TYPE d1, d2; \ - int offset; \ -\ - if (DO_DOUBLE) offset = linetoscr_double_offset / sizeof(TYPE); \ -\ - d1 = colors_for_drawing.acolors[0]; \ - while (pix < lframe_end) { \ - buf[pix] = d1; if (DO_DOUBLE) buf[pix+offset] = d1; \ - pix++; \ - } \ - if (bplham && bplplanecnt == 6) { \ - /* HAM 6 */ \ - while (pix < diw_end) { \ - TYPE d = xcolors[ham_linebuf[pix]]; \ - buf[pix] = d; if (DO_DOUBLE) buf[pix+offset] = d; \ - pix++; \ - } \ - } else if (bpldualpf) { \ - /* Dual playfield */ \ - int *lookup = bpldualpfpri ? dblpf_ind2 : dblpf_ind1; \ - while (pix < diw_end) { \ - int pixcol = pixdata.apixels[pix]; \ - TYPE d; \ - if (spixstate[pix]) { \ - d = colors_for_drawing.acolors[pixcol]; \ - } else { \ - d = colors_for_drawing.acolors[lookup[pixcol]]; \ - } \ - buf[pix] = d; if (DO_DOUBLE) buf[pix+offset] = d; \ - pix++; \ - } \ - } else if (bplehb) { \ - while (pix < diw_end) { \ - int p = pixdata.apixels[pix]; \ - TYPE d = colors_for_drawing.acolors[p]; \ - if (p > 32) d = xcolors[(colors_for_drawing.color_regs[p-32] >> 1) & 0x777]; \ - buf[pix] = d; if (DO_DOUBLE) buf[pix+offset] = d; \ - pix++; \ - } \ - } else { \ - while (pix < diw_end) { \ - TYPE d = colors_for_drawing.acolors[pixdata.apixels[pix]]; \ - buf[pix] = d; if (DO_DOUBLE) buf[pix+offset] = d; \ - pix++; \ - } \ - } \ - d2 = colors_for_drawing.acolors[0]; \ - while (pix < stoppos) { \ - buf[pix] = d2; if (DO_DOUBLE) buf[pix+offset] = d2; \ - pix++; \ - } \ -} - -#define FILL_LINE(NAME, TYPE) \ -static void NAME(char *buf, int start, int stop) \ -{ \ - TYPE *b = (TYPE *)buf; \ - int i;\ - xcolnr col = colors_for_drawing.acolors[0]; \ - for (i = start; i < stop; i++) \ - b[i] = col; \ -} - -LINE_TO_SCR(pfield_linetoscr_8, UBYTE, 0) -LINE_TO_SCR(pfield_linetoscr_16, UWORD, 0) -LINE_TO_SCR(pfield_linetoscr_32, ULONG, 0) -LINE_TO_SCR(pfield_linetoscr_8_double_slow, UBYTE, 1) -LINE_TO_SCR(pfield_linetoscr_16_double_slow, UWORD, 1) -LINE_TO_SCR(pfield_linetoscr_32_double_slow, ULONG, 1) - -FILL_LINE(fill_line_8, UBYTE) -FILL_LINE(fill_line_16, UWORD) -FILL_LINE(fill_line_32, ULONG) - -#define pfield_linetoscr_full8 pfield_linetoscr_8 -#define pfield_linetoscr_full16 pfield_linetoscr_16 -#define pfield_linetoscr_full32 pfield_linetoscr_32 - -#define pfield_linetoscr_full8_double pfield_linetoscr_8_double_slow -#define pfield_linetoscr_full16_double pfield_linetoscr_16_double_slow -#define pfield_linetoscr_full32_double pfield_linetoscr_32_double_slow - -#if 1 && defined(X86_ASSEMBLY) -#undef pfield_linetoscr_full8 -/* The types are lies, of course. */ -extern void pfield_linetoscr_normal_asm8(void) __asm__("pfield_linetoscr_normal_asm8"); -extern void pfield_linetoscr_ehb_asm8(void) __asm__("pfield_linetoscr_ehb_asm8"); -extern void pfield_linetoscr_ham6_asm8(void) __asm__("pfield_linetoscr_ham6_asm8"); -extern void pfield_linetoscr_dualpf_asm8(void) __asm__("pfield_linetoscr_dualpf_asm8"); -extern void pfield_linetoscr_hdouble_asm8(void) __asm__("pfield_linetoscr_hdouble_asm8"); -extern void pfield_linetoscr_asm8(void (*)(void), int, int, int, int, ...) __asm__("pfield_linetoscr_asm8"); - -static void pfield_linetoscr_full8(int pix, int lframe_end, int diw_end, int stoppos) -{ - int lframe_end_1, diw_end_1; - - lframe_end_1 = pix + ((lframe_end - pix) & ~3); - diw_end_1 = stoppos - ((stoppos - diw_end) & ~3); - - if (bplham && bplplanecnt == 6) { - pfield_linetoscr_asm8(pfield_linetoscr_ham6_asm8, pix, lframe_end_1, diw_end_1, stoppos); - } else if (bpldualpf) { - pfield_linetoscr_asm8(pfield_linetoscr_dualpf_asm8, pix, lframe_end_1, diw_end_1, stoppos, - bpldualpfpri ? dblpf_ind2 : dblpf_ind1); - } else if (bplehb) { - pfield_linetoscr_asm8(pfield_linetoscr_ehb_asm8, pix, lframe_end_1, diw_end_1, stoppos); -#ifdef LORES_HACK - } else if (gfx_requested_lores == 2) { - pfield_linetoscr_asm8(pfield_linetoscr_hdouble_asm8, pix, lframe_end_1, diw_end_1, stoppos); -#endif - } else { - pfield_linetoscr_asm8(pfield_linetoscr_normal_asm8, pix, lframe_end_1, diw_end_1, stoppos); - } - - /* The assembly functions work on aligned data, so we may have to do some - * additional work at the edges. */ - if (lframe_end != lframe_end_1) { - int i, c = colors_for_drawing.acolors[0]; - for (i = lframe_end_1; i < lframe_end; i++) - xlinebuffer[i] = c; - } - if (diw_end != diw_end_1) { - int i, c = colors_for_drawing.acolors[0]; - for (i = diw_end; i < diw_end_1; i++) - xlinebuffer[i] = c; - } + write_log ("Don't care mouse mode set\n"); + mousestate = dont_care_mouse; + lastspr0x = lastmx; lastspr0y = lastmy; + mstepx = defstepx; mstepy = defstepy; } -#undef pfield_linetoscr_full16 -extern void pfield_linetoscr_normal_asm16(void) __asm__("pfield_linetoscr_normal_asm16"); -extern void pfield_linetoscr_ehb_asm16(void) __asm__("pfield_linetoscr_ehb_asm16"); -extern void pfield_linetoscr_ham6_asm16(void) __asm__("pfield_linetoscr_ham6_asm16"); -extern void pfield_linetoscr_dualpf_asm16(void) __asm__("pfield_linetoscr_dualpf_asm16"); -extern void pfield_linetoscr_hdouble_asm16(void) __asm__("pfield_linetoscr_hdouble_asm16"); -extern void pfield_linetoscr_asm16(void (*)(void), int, int, int, int, ...) __asm__("pfield_linetoscr_asm16"); - -static void pfield_linetoscr_full16(int pix, int lframe_end, int diw_end, int stoppos) -{ - int lframe_end_1, diw_end_1; - - lframe_end_1 = pix + ((lframe_end - pix) & ~3); - diw_end_1 = stoppos - ((stoppos - diw_end) & ~3); - - if (bplham && bplplanecnt == 6) { - pfield_linetoscr_asm16(pfield_linetoscr_ham6_asm16, pix, lframe_end_1, diw_end_1, stoppos); - } else if (bpldualpf) { - pfield_linetoscr_asm16(pfield_linetoscr_dualpf_asm16, pix, lframe_end_1, diw_end_1, stoppos, - bpldualpfpri ? dblpf_ind2 : dblpf_ind1); - } else if (bplehb) { - pfield_linetoscr_asm16(pfield_linetoscr_ehb_asm16, pix, lframe_end_1, diw_end_1, stoppos); -#ifdef LORES_HACK - } else if (gfx_requested_lores == 2) { - pfield_linetoscr_asm16(pfield_linetoscr_hdouble_asm16, pix, lframe_end_1, diw_end_1, stoppos); -#endif - } else { - pfield_linetoscr_asm16(pfield_linetoscr_normal_asm16, pix, lframe_end_1, diw_end_1, stoppos); - } +static void mousehack_setfollow (void) +{ + if (mousestate == follow_mouse) + return; - /* The assembly functions work on aligned data, so we may have to do some - * additional work at the edges. */ - if (lframe_end != lframe_end_1) { - int i, c = colors_for_drawing.acolors[0]; - for (i = lframe_end_1; i < lframe_end; i++) - ((UWORD *)xlinebuffer)[i] = c; - } - if (diw_end != diw_end_1) { - int i, c = colors_for_drawing.acolors[0]; - for (i = diw_end; i < diw_end_1; i++) - ((UWORD *)xlinebuffer)[i] = c; - } + write_log ("Follow sprite mode set\n"); + mousestate = follow_mouse; + lastdiffx = lastdiffy = 0; + sprvbfl = 0; + spr0ctl = spr0pos = 0; + mstepx = defstepx; mstepy = defstepy; } -#ifndef NO_DOUBLING_LINETOSCR -#define NO_DOUBLING_LINETOSCR -#endif +static uae_u32 mousehack_helper (void) +{ + int mousexpos, mouseypos; +#ifdef PICASSO96 + if (picasso_on) { + mousexpos = lastmx - picasso96_state.XOffset; + mouseypos = lastmy - picasso96_state.YOffset; + } else #endif + { + if (lastmy >= gfxvidinfo.height) + lastmy = gfxvidinfo.height - 1; + mouseypos = coord_native_to_amiga_y (lastmy) << 1; + mousexpos = coord_native_to_amiga_x (lastmx); + } -#ifdef NO_DOUBLING_LINETOSCR -#undef pfield_linetoscr_full8_double -#undef pfield_linetoscr_full16_double -static void pfield_linetoscr_full8_double(int start, int lframe_end, int diw_end, int stop) -{ - char *oldxlb = (char *)xlinebuffer; - pfield_linetoscr_full8(start, lframe_end, diw_end, stop); - xlinebuffer = oldxlb + linetoscr_double_offset; - pfield_linetoscr_full8(start, lframe_end, diw_end, stop); -} -static void pfield_linetoscr_full16_double(int start, int lframe_end, int diw_end, int stop) -{ - char *oldxlb = (char *)xlinebuffer; - pfield_linetoscr_full16(start, lframe_end, diw_end, stop); - xlinebuffer = oldxlb + linetoscr_double_offset; - pfield_linetoscr_full16(start, lframe_end, diw_end, stop); + switch (m68k_dreg (regs, 0)) { + case 0: + return ievent_alive ? -1 : needmousehack (); + case 1: + ievent_alive = 10; + return mousexpos; + case 2: + return mouseypos; + } + return 0; } -#endif -static __inline__ void fill_line(void) +void togglemouse (void) { - switch (gfxvidinfo.pixbytes) { - case 1: fill_line_8(xlinebuffer, linetoscr_x_adjust, linetoscr_x_adjust + gfxvidinfo.maxlinetoscr); break; - case 2: fill_line_16(xlinebuffer, linetoscr_x_adjust, linetoscr_x_adjust + gfxvidinfo.maxlinetoscr); break; - case 4: fill_line_32(xlinebuffer, linetoscr_x_adjust, linetoscr_x_adjust + gfxvidinfo.maxlinetoscr); break; + switch (mousestate) { + case dont_care_mouse: mousehack_setfollow (); break; + case follow_mouse: mousehack_setdontcare (); break; + default: break; /* Nnnnnghh! */ } } -static int linetoscr_diw_end, linetoscr_diw_start; - -static void pfield_init_linetoscr (void) +static __inline__ int adjust (int val) { - int ddf_left, ddf_right; - int mindelay = bpldelay1, maxdelay = bpldelay2; - if (bpldelay1 > bpldelay2) - maxdelay = bpldelay1, mindelay = bpldelay2; - - linetoscr_diw_start = dp_for_drawing->diwfirstword; - linetoscr_diw_end = dp_for_drawing->diwlastword; - - /* We should really look at DDF also when calculating max_diwstop/min_diwstrt, - * so that centering works better, but I'm afraid that might cost too many - * cycles. Plus it's dangerous, see the code below that handles the case - * with sprites. */ - if (dip_for_drawing->nr_sprites == 0) { - int hiresadjust = bplhires ? 4 : 8; - ddf_left = ((dp_for_drawing->plfstrt + hiresadjust)*2 + mindelay - DISPLAY_LEFT_SHIFT) << lores_shift; - ddf_right = ((dp_for_drawing->plfstrt + dp_for_drawing->plflinelen + hiresadjust)*2 + maxdelay - DISPLAY_LEFT_SHIFT) << lores_shift; - - if (linetoscr_diw_start < ddf_left) - linetoscr_diw_start = ddf_left; - if (linetoscr_diw_end > ddf_right) - linetoscr_diw_end = ddf_right; - - if (mindelay != maxdelay) { - /* Raahh... - * We just clear the maximum amount of space that may need to be - * cleared. We could do this exactly, but it would come out slower - * because of the overhead. */ - int strt = ddf_left; - if (gfx_requested_lores) { - fuzzy_memset_le32 (pixdata.apixels, 0, ddf_left, 15); - fuzzy_memset_le32 (pixdata.apixels, 0, ddf_right - 15, 15); - } else { - fuzzy_memset_le32 (pixdata.apixels, 0, ddf_left, 30); - fuzzy_memset_le32 (pixdata.apixels, 0, ddf_right - 30, 30); - } - } - } else { - int hiresadjust = bplhires ? 4 : 8; - /* We swap mindelay and maxdelay here to get rid of the mindelay != maxdelay check. - * Since we have to do a memset anyway (because there may be sprites), - * we might as well clear all at once. */ - ddf_left = ((dp_for_drawing->plfstrt + hiresadjust)*2 + maxdelay - DISPLAY_LEFT_SHIFT) << lores_shift; - ddf_right = ((dp_for_drawing->plfstrt + dp_for_drawing->plflinelen + hiresadjust)*2 + mindelay - DISPLAY_LEFT_SHIFT) << lores_shift; - if (linetoscr_diw_start < ddf_left) { - int strt = linetoscr_diw_start; - int stop = ddf_left; -#ifdef LORES_HACK - if (gfx_requested_lores == 2) - strt >>= 1, stop >>= 1; -#endif - if (strt < stop) - fuzzy_memset (pixdata.apixels, 0, strt, stop - strt); - } - - if (linetoscr_diw_end > ddf_right) { - int strt = ddf_right; - int stop = linetoscr_diw_end; -#ifdef LORES_HACK - if (gfx_requested_lores == 2) - strt >>= 1, stop >>= 1; -#endif - if (strt < stop) - fuzzy_memset (pixdata.apixels, 0, strt, stop - strt); - } - } - /* Perverse cases happen. */ - if (linetoscr_diw_end < linetoscr_diw_start) - linetoscr_diw_end = linetoscr_diw_start; + if (val > 127) + return 127; + else if (val < -127) + return -127; + return val; } -static void pfield_do_linetoscr(int start, int stop) +static void do_mouse_hack (void) { - int lframe_end = linetoscr_diw_start, diw_end = linetoscr_diw_end; - - if (stop > linetoscr_right_x) - stop = linetoscr_right_x; - if (start < linetoscr_x_adjust) - start = linetoscr_x_adjust; - - if (lframe_end < start) - lframe_end = start; - if (diw_end > stop) - diw_end = stop; + int spr0x = ((spr0pos & 0xff) << 2) | ((spr0ctl & 1) << 1); + int spr0y = ((spr0pos >> 8) | ((spr0ctl & 4) << 6)) << 1; + int diffx, diffy; - if (start >= stop) + if (ievent_alive > 0) { + mouse_x = mouse_y = 0; return; - -#if AGA_CHIPSET == 0 - if (start == linetoscr_x_adjust && stop == linetoscr_right_x) { - switch (gfxvidinfo.pixbytes) { - case 1: pfield_linetoscr_full8 (start, lframe_end, diw_end, stop); break; - case 2: pfield_linetoscr_full16 (start, lframe_end, diw_end, stop); break; - case 4: pfield_linetoscr_full32 (start, lframe_end, diw_end, stop); break; - } - } else { - switch (gfxvidinfo.pixbytes) { - case 1: pfield_linetoscr_8 (start, lframe_end, diw_end, stop); break; - case 2: pfield_linetoscr_16 (start, lframe_end, diw_end, stop); break; - case 4: pfield_linetoscr_32 (start, lframe_end, diw_end, stop); break; - } } -#else - pfield_linetoscr_aga(start, lframe_end, diw_end, stop); -#endif -} + switch (mousestate) { + case normal_mouse: + diffx = lastmx - lastsampledmx; + diffy = lastmy - lastsampledmy; + if (!newmousecounters) { + if (diffx > 127) diffx = 127; + if (diffx < -127) diffx = -127; + mouse_x += diffx; + if (diffy > 127) diffy = 127; + if (diffy < -127) diffy = -127; + mouse_y += diffy; + } + lastsampledmx += diffx; lastsampledmy += diffy; + break; -static void pfield_do_fill_line(int start, int stop) -{ - if (stop > linetoscr_right_x) - stop = linetoscr_right_x; - if (start < linetoscr_x_adjust) - start = linetoscr_x_adjust; + 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; - if (start >= stop) - return; + case follow_mouse: + if (sprvbfl && sprvbfl-- > 1) { + int mousexpos, mouseypos; - switch (gfxvidinfo.pixbytes) { - case 1: fill_line_8 (xlinebuffer, start, stop); break; - case 2: fill_line_16 (xlinebuffer, start, stop); break; - case 4: fill_line_32 (xlinebuffer, start, stop); break; + if ((lastdiffx > docal || lastdiffx < -docal) + && lastspr0x != spr0x + && spr0x > plfstrt*4 + 34 + xcaloff + && spr0x < plfstop*4 - xcaloff) + { + int val = (lastdiffx << 16) / (spr0x - lastspr0x); + if (val >= 0x8000) + mstepx = (mstepx * (calweight - 1) + val) / calweight; + } + if ((lastdiffy > docal || lastdiffy < -docal) + && lastspr0y != spr0y + && spr0y > plffirstline + ycaloff + && spr0y < plflastline - ycaloff) + { + int val = (lastdiffy << 16) / (spr0y - lastspr0y); + if (val >= 0x8000) + mstepy = (mstepy * (calweight - 1) + val) / calweight; + } + if (lastmy >= gfxvidinfo.height) + lastmy = gfxvidinfo.height-1; + mouseypos = coord_native_to_amiga_y (lastmy) << 1; + mousexpos = coord_native_to_amiga_x (lastmx); + diffx = adjust ((((mousexpos + xoffs - spr0x) & ~1) * mstepx) >> 16); + diffy = adjust ((((mouseypos + yoffs - spr0y) & ~1) * mstepy) >> 16); + lastspr0x = spr0x; lastspr0y = spr0y; + lastdiffx = diffx; lastdiffy = diffy; + mouse_x += diffx; mouse_y += diffy; + } + break; + + default: + abort (); } } -static void pfield_do_linetoscr_full(int double_line) +static int timehack_alive = 0; + +static uae_u32 timehack_helper (void) { - int start = linetoscr_x_adjust, stop = start + gfxvidinfo.maxlinetoscr; - int lframe_end = linetoscr_diw_start, diw_end = linetoscr_diw_end; - if (lframe_end < start) - lframe_end = start; - if (diw_end > stop) - diw_end = stop; +#ifdef HAVE_GETTIMEOFDAY + struct timeval tv; + if (m68k_dreg (regs, 0) == 0) + return timehack_alive; -#if AGA_CHIPSET == 0 - if (double_line) { - switch (gfxvidinfo.pixbytes) { - case 1: pfield_linetoscr_full8_double (start, lframe_end, diw_end, stop); break; - case 2: pfield_linetoscr_full16_double (start, lframe_end, diw_end, stop); break; - case 4: pfield_linetoscr_full32_double (start, lframe_end, diw_end, stop); break; - } - } else - switch (gfxvidinfo.pixbytes) { - case 1: pfield_linetoscr_full8 (start, lframe_end, diw_end, stop); break; - case 2: pfield_linetoscr_full16 (start, lframe_end, diw_end, stop); break; - case 4: pfield_linetoscr_full32 (start, lframe_end, diw_end, stop); break; - } + timehack_alive = 10; + + gettimeofday (&tv, NULL); + put_long (m68k_areg (regs, 0), tv.tv_sec - (((365 * 8 + 2) * 24 - 2) * 60 * 60)); + put_long (m68k_areg (regs, 0) + 4, tv.tv_usec); + return 0; #else - pfield_linetoscr_aga(start, lframe_end, diw_end, stop); + return 2; #endif } - /* + /* * register functions */ - -UWORD DMACONR(void) +static __inline__ uae_u16 DENISEID (void) +{ + if (currprefs.chipset_mask & CSMASK_AGA) + return 0xF8; + if (currprefs.chipset_mask & CSMASK_ECS_DENISE) + return 0xFC; + return 0xFFFF; +} +static __inline__ uae_u16 DMACONR (void) { return (dmacon | (bltstate==BLT_done ? 0 : 0x4000) | (blt_info.blitzero ? 0x2000 : 0)); } -static UWORD INTENAR(void) { return intena; } -UWORD INTREQR(void) +static __inline__ uae_u16 INTENAR (void) { - return intreq | (use_serial ? 0x0001 : 0); + return intena; } -static UWORD ADKCONR(void) { return adkcon; } -static UWORD VPOSR(void) +uae_u16 INTREQR (void) { -#if AGA_CHIPSET == 1 - return (vpos >> 8) | lof | 0x2300; -#elif defined (ECS_AGNUS) - return (vpos >> 8) | lof | 0x2000; -#else - return (vpos >> 8) | lof; -#endif + return intreq | (currprefs.use_serial ? 0x0001 : 0); } -static void VPOSW(UWORD v) +static __inline__ uae_u16 ADKCONR (void) +{ + return adkcon; +} +static __inline__ uae_u16 VPOSR (void) +{ + unsigned int csbit = ntscmode ? 0x1000 : 0; + csbit |= (currprefs.chipset_mask & CSMASK_AGA) ? 0x2300 : 0; + csbit |= (currprefs.chipset_mask & CSMASK_ECS_AGNUS) ? 0x2000 : 0; + return (vpos >> 8) | lof | csbit; +} +static void VPOSW (uae_u16 v) { if (lof != (v & 0x8000)) lof_changed = 1; lof = v & 0x8000; + /* + * This register is much more fun on a real Amiga. You can program + * refresh rates with it ;) But I won't emulate this... + */ +} + +static __inline__ uae_u16 VHPOSR (void) +{ + return (vpos << 8) | current_hpos(); +} + +static __inline__ void COP1LCH (uae_u16 v) { cop1lc = (cop1lc & 0xffff) | ((uae_u32)v << 16); } +static __inline__ void COP1LCL (uae_u16 v) { cop1lc = (cop1lc & ~0xffff) | (v & 0xfffe); } +static __inline__ void COP2LCH (uae_u16 v) { cop2lc = (cop2lc & 0xffff) | ((uae_u32)v << 16); } +static __inline__ void COP2LCL (uae_u16 v) { cop2lc = (cop2lc & ~0xffff) | (v & 0xfffe); } + +static void COPJMP1 (uae_u16 a) +{ + cop_state.ip = cop1lc; + cop_state.do_move = 0; + 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; + prepare_copper (); + if (eventtab[ev_copper].evtime == cycles && eventtab[ev_copper].active) + abort (); + events_schedule (); +} + +static void COPJMP2 (uae_u16 a) +{ + cop_state.ip = cop2lc; + cop_state.do_move = 0; + 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; + prepare_copper (); + if (eventtab[ev_copper].evtime == cycles && eventtab[ev_copper].active) + abort (); + events_schedule (); } -static UWORD VHPOSR(void) { return (vpos << 8) | current_hpos(); } -static void COP1LCH(UWORD v) { cop1lc= (cop1lc & 0xffff) | ((ULONG)v << 16); } -static void COP1LCL(UWORD v) { cop1lc= (cop1lc & ~0xffff) | v; } -static void COP2LCH(UWORD v) { cop2lc= (cop2lc & 0xffff) | ((ULONG)v << 16); } -static void COP2LCL(UWORD v) { cop2lc= (cop2lc & ~0xffff) | v; } - -static void COPJMP1(UWORD a) -{ - coplc = cop1lc; copstate = COP_read; - eventtab[ev_copper].active = 1; eventtab[ev_copper].oldcycles = cycles; - eventtab[ev_copper].evtime = 4 + cycles; events_schedule(); - copper_active = 1; - copper_waiting_for_blitter = 0; -} -static void COPJMP2(UWORD a) -{ - coplc = cop2lc; copstate = COP_read; - eventtab[ev_copper].active = 1; eventtab[ev_copper].oldcycles = cycles; - eventtab[ev_copper].evtime = 4 + cycles; events_schedule(); - copper_active = 1; - copper_waiting_for_blitter = 0; +static __inline__ void COPCON (uae_u16 a) +{ + copcon = a; } -static void COPCON(UWORD a) { copcon = a; } -static void DMACON(UWORD v) + +static void DMACON (uae_u16 v) { int i, need_resched = 0; - UWORD oldcon = dmacon; - - decide_line(); + uae_u16 oldcon = dmacon; + + decide_line (current_hpos ()); setclr(&dmacon,v); dmacon &= 0x1FFF; - post_decide_line (); - - /* FIXME? Maybe we need to think a bit more about the master DMA enable + /* ??? post_decide_line (); */ + + /* 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)) { - COPJMP1(0); - } -#if 0 /* @@@ ??? Is this right now? */ - if ((dmacon & DMA_SPRITE) < (oldcon & DMA_SPRITE)) { - int i; - for (i = 0; i < 8; i++) - spron[i] = SPR_restart; + if ((dmacon & DMA_COPPER) > (oldcon & DMA_COPPER)) { + cop_state.ip = cop1lc; + cop_state.do_move = 0; + 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; + prepare_copper (); + if (eventtab[ev_copper].evtime == cycles && eventtab[ev_copper].active) + abort (); + need_resched = 1; } -#endif if ((dmacon & DMA_BLITPRI) > (oldcon & DMA_BLITPRI) && bltstate != BLT_done) { static int count = 0; if (!count) { count = 1; - fprintf(stderr, "warning: program is doing blitpri hacks.\n"); + write_log ("warning: program is doing blitpri hacks.\n"); } regs.spcflags |= SPCFLAG_BLTNASTY; } -#ifndef DONT_WANT_SOUND + + update_audio (); + for (i = 0; i < 4; i++) { struct audio_channel_data *cdp = audio_channel + i; - + cdp->dmaen = (dmacon & 0x200) && (dmacon & (1<dmaen) { if (cdp->state == 0) { @@ -1721,162 +1535,218 @@ static void DMACON(UWORD v) cdp->wper = cdp->per; cdp->wlen = cdp->len; cdp->data_written = 2; - eventtab[ev_aud0 + i].oldcycles = eventtab[ev_hsync].oldcycles; - eventtab[ev_aud0 + i].evtime = eventtab[ev_hsync].evtime; - eventtab[ev_aud0 + i].active = 1; - need_resched = 1; /* not _really_ necessary here, but... */ + cdp->evtime = eventtab[ev_hsync].evtime - cycles; } } else { if (cdp->state == 1 || cdp->state == 5) { cdp->state = 0; + cdp->last_sample = 0; cdp->current_sample = 0; - eventtab[ev_aud0 + i].active = 0; - need_resched = 1; } } } -#endif - calculate_copper_cycle_time (); - if (copper_active && !eventtab[ev_copper].active) { - eventtab[ev_copper].active = 1; - eventtab[ev_copper].oldcycles = cycles; - eventtab[ev_copper].evtime = 1 + cycles; - need_resched = 1; - } + if (need_resched) events_schedule(); } -static int trace_intena = 0; +/*static int trace_intena = 0;*/ -static void INTENA(UWORD v) +static __inline__ void INTENA (uae_u16 v) +{ +/* if (trace_intena) + fprintf (stderr, "INTENA: %04x\n", v);*/ + setclr(&intena,v); regs.spcflags |= SPCFLAG_INT; +} +void INTREQ (uae_u16 v) { - if (trace_intena) - fprintf(stderr, "INTENA: %04x\n", v); - setclr(&intena,v); regs.spcflags |= SPCFLAG_INT; + setclr(&intreq,v); + regs.spcflags |= SPCFLAG_INT; + if (( v & 0x8800) == 0x0800) + serdat &= 0xbfff; } -void INTREQ(UWORD v) + +static void ADKCON (uae_u16 v) { - setclr(&intreq,v); - regs.spcflags |= SPCFLAG_INT; - if ((v&0x8800)==0x0800) serdat&=0xbfff; - } + unsigned long t; -static void ADKCON(UWORD v) { setclr(&adkcon,v); } + update_audio (); -static void BPLPTH(UWORD v, int num) { decide_line (); decide_plane(); do_modulos(); bplpt[num] = (bplpt[num] & 0xffff) | ((ULONG)v << 16); } -static void BPLPTL(UWORD v, int num) { decide_line (); decide_plane(); do_modulos(); bplpt[num] = (bplpt[num] & ~0xffff) | (v & 0xFFFE); } + setclr (&adkcon,v); + t = adkcon | (adkcon >> 4); + audio_channel[0].adk_mask = (((t >> 0) & 1) - 1); + audio_channel[1].adk_mask = (((t >> 1) & 1) - 1); + audio_channel[2].adk_mask = (((t >> 2) & 1) - 1); + audio_channel[3].adk_mask = (((t >> 3) & 1) - 1); +} -static void BPLCON0(UWORD v) +static void BEAMCON0 (uae_u16 v) { -#if AGA_CHIPSET == 0 - v &= 0xFF0E; - /* The Sanity WOC demo needs this at one place (at the end of the "Party Effect") - * Disable bitplane DMA if someone tries to do more than 4 Hires bitplanes. */ - if ((v & 0xF000) > 0xC000) - v &= 0xFFF; - /* Don't want 7 lores planes either. */ - if ((v & 0x8000) == 0 && (v & 0x7000) == 0x7000) - v &= 0xEFFF; -#endif + new_beamcon0 = v & 0x20; +} + +static void BPLPTH (int hpos, uae_u16 v, int num) +{ + decide_line (hpos); + decide_plane (hpos); + do_modulos (hpos); + bplpt[num] = (bplpt[num] & 0xffff) | ((uae_u32)v << 16); +} +static void BPLPTL (int hpos, uae_u16 v, int num) +{ + decide_line (hpos); + decide_plane (hpos); + do_modulos (hpos); + bplpt[num] = (bplpt[num] & ~0xffff) | (v & 0xfffe); +} + +static void BPLCON0 (int hpos, uae_u16 v) +{ + if (! (currprefs.chipset_mask & CSMASK_AGA)) { + v &= 0xFF0E; + /* The Sanity WOC demo needs this at one place (at the end of the "Party Effect") + * Disable bitplane DMA if someone tries to do more than 4 Hires bitplanes. */ + if ((v & 0xF000) > 0xC000) + v &= 0xFFF; + /* Don't want 7 lores planes either. */ + if ((v & 0x8000) == 0 && (v & 0x7000) == 0x7000) + v &= 0xEFFF; + } if (bplcon0 == v) return; - decide_line (); + decide_line (hpos); bplcon0 = v; - post_decide_line (); - calculate_copper_cycle_time (); -#if 0 - calcdiw(); /* This should go away. */ -#endif + nr_planes_from_bplcon0 = GET_PLANES (v); + + if (currprefs.chipset_mask & CSMASK_AGA) + /* It's not clear how the copper timings are affected by the number + * of bitplanes on AGA machines */ + corrected_nr_planes_from_bplcon0 = 4; + else + corrected_nr_planes_from_bplcon0 = nr_planes_from_bplcon0 << (bplcon0 & 0x8000 ? 1 : 0); + + post_decide_line (hpos); } -static void BPLCON1(UWORD v) +static __inline__ void BPLCON1 (int hpos, uae_u16 v) { if (bplcon1 == v) return; - decide_diw (); + decide_diw (hpos); bplcon1 = v; - decide_delay (); + decide_delay (hpos); } -static void BPLCON2(UWORD v) +static __inline__ void BPLCON2 (int hpos, uae_u16 v) { - if (bplcon2 != v) - decide_line (); + if (bplcon2 == v) + return; + decide_line (hpos); bplcon2 = v; } -static void BPLCON3(UWORD v) +static __inline__ void BPLCON3 (int hpos, uae_u16 v) { - if (bplcon3 != v) - decide_line (); - bplcon3 = v; + if (bplcon3 == v) + return; + decide_line (hpos); + bplcon3 = v; } -static void BPLCON4(UWORD v) +static __inline__ void BPLCON4 (int hpos, uae_u16 v) { - if (bplcon4 != v) - decide_line (); - bplcon4 = v; + if (! (currprefs.chipset_mask & CSMASK_AGA)) + return; + if (bplcon4 == v) + return; + decide_line (hpos); + bplcon4 = v; } -static void BPL1MOD(UWORD v) +static void BPL1MOD (int hpos, uae_u16 v) { v &= ~1; - if ((WORD)bpl1mod == (WORD)v) + if ((uae_s16)bpl1mod == (uae_s16)v) return; bpl1mod = v; - decide_modulos (); + decide_modulos (hpos); } -static void BPL2MOD(UWORD v) -{ +static void BPL2MOD (int hpos, uae_u16 v) +{ v &= ~1; - if ((WORD)bpl2mod == (WORD)v) + if ((uae_s16)bpl2mod == (uae_s16)v) return; bpl2mod = v; - decide_modulos(); + decide_modulos (hpos); } /* We could do as well without those... */ -static void BPL1DAT(UWORD v) { bpl1dat = v; } -static void BPL2DAT(UWORD v) { bpl2dat = v; } -static void BPL3DAT(UWORD v) { bpl3dat = v; } -static void BPL4DAT(UWORD v) { bpl4dat = v; } -static void BPL5DAT(UWORD v) { bpl5dat = v; } -static void BPL6DAT(UWORD v) { bpl6dat = v; } +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; } +static __inline__ void BPL5DAT (uae_u16 v) { bpl5dat = v; } +static __inline__ void BPL6DAT (uae_u16 v) { bpl6dat = v; } +static __inline__ void BPL7DAT (uae_u16 v) { bpl7dat = v; } +static __inline__ void BPL8DAT (uae_u16 v) { bpl8dat = v; } + +static void DIWSTRT (int hpos, uae_u16 v) +{ + if (diwstrt == v && ! diwhigh_written) + return; + decide_line (hpos); + diwhigh_written = 0; + diwstrt = v; + calcdiw (); +} -static void DIWSTRT(UWORD v) +static void DIWSTOP (int hpos, uae_u16 v) { - if (diwstrt == v) + if (diwstop == v && ! diwhigh_written) return; - decide_line (); - diwstrt = v; - calcdiw(); + decide_line (hpos); + diwhigh_written = 0; + diwstop = v; + calcdiw (); } -static void DIWSTOP(UWORD v) + +static void DIWHIGH (int hpos, uae_u16 v) { - if (diwstop == v) + if (! (currprefs.chipset_mask & CSMASK_ECS_DENISE)) return; - diwstop = v; - calcdiw(); + if (diwhigh_written && diwhigh == v) + return; + decide_line (hpos); + diwhigh_written = 1; + diwhigh = v; + calcdiw (); } -static void DDFSTRT(UWORD v) -{ - v &= 0xFF; + +static void DDFSTRT (int hpos, uae_u16 v) +{ + v &= (currprefs.chipset_mask & CSMASK_AGA) ? 0x1FC : 0xFC; if (ddfstrt == v) return; - decide_line (); - ddfstrt = v; - calcdiw(); -} -static void DDFSTOP(UWORD v) -{ - v &= 0xFF; + decide_line (hpos); + ddfstrt = v; + calcdiw (); +} +static void DDFSTOP (int hpos, uae_u16 v) +{ + v &= (currprefs.chipset_mask & CSMASK_AGA) ? 0x1FC : 0xFC; if (ddfstop == v) return; - decide_line (); + decide_line (hpos); ddfstop = v; - calcdiw(); + calcdiw (); +} + +static void FMODE (uae_u16 v) +{ + if (! (currprefs.chipset_mask & CSMASK_AGA)) + return; + fmode = v; + calcdiw (); } -static void BLTADAT(UWORD v) +static void BLTADAT (uae_u16 v) { maybe_blit(); @@ -1887,9 +1757,9 @@ static void BLTADAT(UWORD v) * be true for BLTBDAT, but not for BLTADAT - it appears the A data must be * loaded for every word so that AFWM and ALWM can be applied. */ -static void BLTBDAT(UWORD v) +static void BLTBDAT (uae_u16 v) { - maybe_blit(); + maybe_blit(); if (bltcon1 & 2) blt_info.bltbhold = v << (bltcon1 >> 12); @@ -1897,136 +1767,161 @@ static void BLTBDAT(UWORD v) blt_info.bltbhold = v >> (bltcon1 >> 12); blt_info.bltbdat = v; } -static void BLTCDAT(UWORD v) { maybe_blit(); blt_info.bltcdat = v; } +static void BLTCDAT (uae_u16 v) { maybe_blit (); blt_info.bltcdat = v; } -static void BLTAMOD(UWORD v) { maybe_blit(); blt_info.bltamod = (WORD)(v & 0xFFFE); } -static void BLTBMOD(UWORD v) { maybe_blit(); blt_info.bltbmod = (WORD)(v & 0xFFFE); } -static void BLTCMOD(UWORD v) { maybe_blit(); blt_info.bltcmod = (WORD)(v & 0xFFFE); } -static void BLTDMOD(UWORD v) { maybe_blit(); blt_info.bltdmod = (WORD)(v & 0xFFFE); } +static void BLTAMOD (uae_u16 v) { maybe_blit (); blt_info.bltamod = (uae_s16)(v & 0xFFFE); } +static void BLTBMOD (uae_u16 v) { maybe_blit (); blt_info.bltbmod = (uae_s16)(v & 0xFFFE); } +static void BLTCMOD (uae_u16 v) { maybe_blit (); blt_info.bltcmod = (uae_s16)(v & 0xFFFE); } +static void BLTDMOD (uae_u16 v) { maybe_blit (); blt_info.bltdmod = (uae_s16)(v & 0xFFFE); } -static void BLTCON0(UWORD v) { maybe_blit(); bltcon0 = v; blinea_shift = v >> 12; } -/* The next category is "Most useless hardware register". +static void BLTCON0 (uae_u16 v) { maybe_blit (); bltcon0 = v; blinea_shift = v >> 12; } +/* The next category is "Most useless hardware register". * And the winner is... */ -static void BLTCON0L(UWORD v) { maybe_blit(); bltcon0 = (bltcon0 & 0xFF00) | (v & 0xFF); } -static void BLTCON1(UWORD v) { maybe_blit(); bltcon1 = v; } +static void BLTCON0L (uae_u16 v) +{ + if (! (currprefs.chipset_mask & CSMASK_ECS_AGNUS)) + return; + maybe_blit (); bltcon0 = (bltcon0 & 0xFF00) | (v & 0xFF); +} +static void BLTCON1 (uae_u16 v) { maybe_blit (); bltcon1 = v; } + +static void BLTAFWM (uae_u16 v) { maybe_blit (); blt_info.bltafwm = v; } +static void BLTALWM (uae_u16 v) { maybe_blit (); blt_info.bltalwm = v; } -static void BLTAFWM(UWORD v) { maybe_blit(); blt_info.bltafwm = v; } -static void BLTALWM(UWORD v) { maybe_blit(); blt_info.bltalwm = v; } +static void BLTAPTH (uae_u16 v) { maybe_blit (); bltapt = (bltapt & 0xffff) | ((uae_u32)v << 16); } +static void BLTAPTL (uae_u16 v) { maybe_blit (); bltapt = (bltapt & ~0xffff) | (v & 0xFFFE); } +static void BLTBPTH (uae_u16 v) { maybe_blit (); bltbpt = (bltbpt & 0xffff) | ((uae_u32)v << 16); } +static void BLTBPTL (uae_u16 v) { maybe_blit (); bltbpt = (bltbpt & ~0xffff) | (v & 0xFFFE); } +static void BLTCPTH (uae_u16 v) { maybe_blit (); bltcpt = (bltcpt & 0xffff) | ((uae_u32)v << 16); } +static void BLTCPTL (uae_u16 v) { maybe_blit (); bltcpt = (bltcpt & ~0xffff) | (v & 0xFFFE); } +static void BLTDPTH (uae_u16 v) { maybe_blit (); bltdpt = (bltdpt & 0xffff) | ((uae_u32)v << 16); } +static void BLTDPTL (uae_u16 v) { maybe_blit (); bltdpt = (bltdpt & ~0xffff) | (v & 0xFFFE); } -static void BLTAPTH(UWORD v) { maybe_blit(); bltapt= (bltapt & 0xffff) | ((ULONG)v << 16); } -static void BLTAPTL(UWORD v) { maybe_blit(); bltapt= (bltapt & ~0xffff) | (v & 0xFFFE); } -static void BLTBPTH(UWORD v) { maybe_blit(); bltbpt= (bltbpt & 0xffff) | ((ULONG)v << 16); } -static void BLTBPTL(UWORD v) { maybe_blit(); bltbpt= (bltbpt & ~0xffff) | (v & 0xFFFE); } -static void BLTCPTH(UWORD v) { maybe_blit(); bltcpt= (bltcpt & 0xffff) | ((ULONG)v << 16); } -static void BLTCPTL(UWORD v) { maybe_blit(); bltcpt= (bltcpt & ~0xffff) | (v & 0xFFFE); } -static void BLTDPTH(UWORD v) { maybe_blit(); bltdpt= (bltdpt & 0xffff) | ((ULONG)v << 16); } -static void BLTDPTL(UWORD v) { maybe_blit(); bltdpt= (bltdpt & ~0xffff) | (v & 0xFFFE); } -static void BLTSIZE(UWORD v) +static void BLTSIZE (uae_u16 v) { bltsize = v; - - maybe_blit(); + + maybe_blit (); blt_info.vblitsize = bltsize >> 6; blt_info.hblitsize = bltsize & 0x3F; if (!blt_info.vblitsize) blt_info.vblitsize = 1024; if (!blt_info.hblitsize) blt_info.hblitsize = 64; - - bltstate = BLT_init; - do_blitter(); + + bltstate = BLT_init; + do_blitter (); } -static void BLTSIZV(UWORD v) + +static void BLTSIZV (uae_u16 v) { - maybe_blit(); + if (! (currprefs.chipset_mask & CSMASK_ECS_AGNUS)) + return; + maybe_blit (); oldvblts = v & 0x7FFF; } -static void BLTSIZH(UWORD v) + +static void BLTSIZH (uae_u16 v) { - maybe_blit(); + if (! (currprefs.chipset_mask & CSMASK_ECS_AGNUS)) + return; + maybe_blit (); blt_info.hblitsize = v & 0x7FF; blt_info.vblitsize = oldvblts; if (!blt_info.vblitsize) blt_info.vblitsize = 32768; if (!blt_info.hblitsize) blt_info.hblitsize = 0x800; bltstate = BLT_init; - do_blitter(); + do_blitter (); } -static void SPRxCTL_1(UWORD v, int num) + +static __inline__ void SPRxCTL_1 (uae_u16 v, int num) { int sprxp; sprctl[num] = v; + nr_armed -= sprarmed[num]; sprarmed[num] = 0; - if (sprpos[num] == 0 && v == 0) - spron[num] = SPR_stop; + if (sprpos[num] == 0 && v == 0) { + sprst[num] = SPR_stop; + spron[num] = 0; + } else + sprst[num] = SPR_waiting_start; - sprxp = ((sprpos[num] & 0xFF) * 2) + (v & 1) - DISPLAY_LEFT_SHIFT; - if (!gfx_requested_lores) - sprxp *= 2; + 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); } -static void SPRxPOS_1(UWORD v, int num) +static __inline__ void SPRxPOS_1 (uae_u16 v, int num) { int sprxp; sprpos[num] = v; - sprxp = ((v & 0xFF) * 2) + (sprctl[num] & 1) - DISPLAY_LEFT_SHIFT; - if (!gfx_requested_lores) - sprxp *= 2; + sprxp = coord_hw_to_native_x ((v & 0xFF) * 2 + (sprctl[num] & 1)); sprxpos[num] = sprxp; sprvstart[num] = (sprpos[num] >> 8) | ((sprctl[num] << 6) & 0x100); } -static void SPRxDATA_1(UWORD v, int num) +static __inline__ void SPRxDATA_1 (uae_u16 v, int num) { sprdata[num] = v; + nr_armed += 1 - sprarmed[num]; sprarmed[num] = 1; } -static void SPRxDATB_1(UWORD v, int num) +static __inline__ void SPRxDATB_1 (uae_u16 v, int num) { sprdatb[num] = v; } -static void SPRxDATA(UWORD v, int num) { decide_sprite (num); SPRxDATA_1 (v, num); } -static void SPRxDATB(UWORD v, int num) { decide_sprite (num); SPRxDATB_1 (v, num); } -static void SPRxCTL(UWORD v, int num) { decide_sprite (num); SPRxCTL_1 (v, num); } -static void SPRxPOS(UWORD v, int num) { decide_sprite (num); SPRxPOS_1 (v, num); } -static void SPRxPTH(UWORD v, int num) -{ - sprpt[num] &= 0xffff; - sprpt[num] |= (ULONG)v << 16; -#if 1 - /* I don't like these, I'd prefer to set sprite state to SPR_restart on - * a vsync, but the Majic 12 Ray of Hope 2 demo doesn't like that. */ - if (spron[num] == SPR_vtop) -#endif - spron[num] = SPR_restart; +static void SPRxDATA (int hpos, uae_u16 v, int num) { decide_sprites (hpos); SPRxDATA_1 (v, num); } +static void SPRxDATB (int hpos, uae_u16 v, int num) { decide_sprites (hpos); SPRxDATB_1 (v, num); } +static void SPRxCTL (int hpos, uae_u16 v, int num) { decide_sprites (hpos); SPRxCTL_1 (v, num); } +static void SPRxPOS (int hpos, uae_u16 v, int num) { decide_sprites (hpos); SPRxPOS_1 (v, num); } +static void SPRxPTH (int hpos, uae_u16 v, int num) +{ + decide_sprites (hpos); + sprpt[num] &= 0xffff; + sprpt[num] |= (uae_u32)v << 16; + + if (sprst[num] == SPR_stop || vpos < vblank_endline) + sprst[num] = SPR_restart; + spron[num] = 1; } -static void SPRxPTL(UWORD v, int num) +static void SPRxPTL (int hpos, uae_u16 v, int num) { - sprpt[num] &= ~0xffff; + decide_sprites (hpos); + sprpt[num] &= ~0xffff; sprpt[num] |= v; -#if 1 - if (spron[num] == SPR_vtop) -#endif - spron[num] = SPR_restart; -} -static void COLOR(UWORD v, int num) + if (sprst[num] == SPR_stop || vpos < vblank_endline) + sprst[num] = SPR_restart; + spron[num] = 1; +} +static void CLXCON (uae_u16 v) { - int r,g,b; - int cr,cg,cb; - int colreg; - + clxcon = v; + clx_sprmask = (((v >> 15) << 7) | ((v >> 14) << 5) | ((v >> 13) << 3) | ((v >> 12) << 1) | 0x55); +} +static uae_u16 CLXDAT (void) +{ + uae_u16 v = clxdat; + clxdat = 0; + return v; +} +static void COLOR (int hpos, uae_u16 v, int num) +{ + v &= 0xFFF; #if AGA_CHIPSET == 1 { /* XXX Broken */ - ULONG cval; + int r,g,b; + int cr,cg,cb; + int colreg; + uae_u32 cval; + colreg = ((bplcon3 >> 13) & 7) * 32 + num; r = (v & 0xF00) >> 8; g = (v & 0xF0) >> 4; b = (v & 0xF) >> 0; - cr = color_regs[colreg] >> 16; - cg = (color_regs[colreg] >> 8) & 0xFF; - cb = color_regs[colreg] & 0xFF; + cr = current_colors.color_regs[colreg] >> 16; + cg = (current_colors.color_regs[colreg] >> 8) & 0xFF; + cb = current_colors.color_regs[colreg] & 0xFF; if (bplcon3 & 0x200) { cr &= 0xF0; cr |= r; @@ -2038,17 +1933,21 @@ static void COLOR(UWORD v, int num) cb = b + (b << 4); } cval = (cr << 16) | (cg << 8) | cb; - if (cval == color_regs[colreg]) + if (cval == current_colors.color_regs[colreg]) return; - color_regs[colreg] = cval; - pfield_may_need_update(1); + + /* Call this with the old table still intact. */ + record_color_change (hpos, colreg, v); + remembered_color_entry = -1; + current_colors.color_regs[colreg] = cval; +/* current_colors.acolors[colreg] = xcolors[v];*/ } -#else +#else { if (current_colors.color_regs[num] == v) return; /* Call this with the old table still intact. */ - record_color_change (num, v); + record_color_change (hpos, num, v); remembered_color_entry = -1; current_colors.color_regs[num] = v; current_colors.acolors[num] = xcolors[v]; @@ -2056,26 +1955,26 @@ static void COLOR(UWORD v, int num) #endif } -static void DSKSYNC(UWORD v) { dsksync = v; } -static void DSKDAT(UWORD v) { fprintf(stderr, "DSKDAT written. Not good.\n"); } -static void DSKPTH(UWORD v) { dskpt = (dskpt & 0xffff) | ((ULONG)v << 16); } -static void DSKPTL(UWORD v) { dskpt = (dskpt & ~0xffff) | (v); } +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(UWORD v) +static void DSKLEN (uae_u16 v) { if (v & 0x8000) { dskdmaen = dskdmaen == 1 ? 2 : 1; - } else { + } else { dskdmaen = 0; if (eventtab[ev_diskblk].active) - fprintf(stderr, "warning: Disk DMA aborted!\n"); + 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)) { - fprintf(stderr, "Non-standard sync: %04x len: %x\n", dsksync, dsklength); + write_log ("Non-standard sync: %04x len: %x\n", dsksync, dsklength); } if (dskdmaen > 1) { if (dsklen & 0x4000) { @@ -2095,411 +1994,562 @@ static void DSKLEN(UWORD v) } } -static UWORD DSKBYTR(void) +static uae_u16 DSKBYTR (void) { - UWORD v = (dsklen >> 1) & 0x6000; - UWORD mfm, byte; - if (DISK_GetData(&mfm, &byte)) + uae_u16 v = (dsklen >> 1) & 0x6000; + uae_u16 mfm, byte; + if (DISK_GetData (&mfm, &byte)) v |= 0x8000; v |= byte; - if (dsksync == mfm) v |= 0x1000; + if (dsksync == mfm) + v |= 0x1000; return v; } -static UWORD DSKDATR(void) +static uae_u16 DSKDATR (void) { - UWORD mfm, byte; - DISK_GetData(&mfm, &byte); - return mfm; + uae_u16 mfm, byte; + DISK_GetData (&mfm, &byte); + return mfm; } -static UWORD POTGOR(void) + +static uae_u16 potgo_value; + +static void POTGO (uae_u16 v) { - UWORD v = 0xFF00; - if (buttonstate[2]) - v &= 0xFBFF; + potgo_value = v; +} + +static uae_u16 POTGOR (void) +{ + uae_u16 v = (potgo_value | (potgo_value << 1)) & 0xAA00; + v |= v >> 1; + + if (JSEM_ISMOUSE (0, &currprefs)) { + if (buttonstate[2]) + v &= 0xFBFF; + + if (buttonstate[1]) + v &= 0xFEFF; + } else if (JSEM_ISJOY0 (0, &currprefs) || JSEM_ISJOY1 (0, &currprefs)) { + if (joy0button & 2) v &= 0xfbff; + if (joy0button & 4) v &= 0xfeff; + } + + if (JSEM_ISJOY0 (1, &currprefs) || JSEM_ISJOY1 (1, &currprefs)) { + if (joy1button & 2) v &= 0xbfff; + if (joy1button & 4) v &= 0xefff; + } - if (buttonstate[1]) - v &= 0xFEFF; - return v; } -static UWORD POT0DAT(void) + +static uae_u16 POT0DAT (void) { - static UWORD cnt = 0; - if (buttonstate[2]) - cnt = ((cnt + 1) & 0xFF) | (cnt & 0xFF00); - if (buttonstate[1]) - cnt += 0x100; - + static uae_u16 cnt = 0; + if (JSEM_ISMOUSE (0, &currprefs)) { + if (buttonstate[2]) + cnt = ((cnt + 1) & 0xFF) | (cnt & 0xFF00); + if (buttonstate[1]) + cnt += 0x100; + } + return cnt; } -static UWORD JOY0DAT(void) { return ((UBYTE)joy0x) + ((UWORD)joy0y << 8); } -static UWORD JOY1DAT(void) +static uae_u16 JOY0DAT (void) { + if (JSEM_ISMOUSE (0, &currprefs)) { + do_mouse_hack (); + return ((uae_u8)mouse_x) + ((uae_u16)mouse_y << 8); + } return joy0dir; } -static void JOYTEST(UWORD v) +static uae_u16 JOY1DAT (void) { - joy0x = joy1x = v & 0xFC; - joy0y = joy1y = (v >> 8) & 0xFC; + if (JSEM_ISMOUSE (1, &currprefs)) { + do_mouse_hack (); + return ((uae_u8)mouse_x) + ((uae_u16)mouse_y << 8); + } + return joy1dir; } -static void AUDxLCH(int nr, UWORD v) { audio_channel[nr].lc = (audio_channel[nr].lc & 0xffff) | ((ULONG)v << 16); } -static void AUDxLCL(int nr, UWORD v) { audio_channel[nr].lc = (audio_channel[nr].lc & ~0xffff) | (v & 0xFFFE); } -static void AUDxPER(int nr, UWORD v) +static void JOYTEST (uae_u16 v) { - if (v <= 0) { -#if 0 /* v == 0 is rather common, and harmless, and the value isn't signed anyway */ - static int warned = 0; - if (!warned) - fprintf(stderr, "Broken program accessing the sound hardware\n"), warned++; -#endif - v = 65535; + if (JSEM_ISMOUSE (0, &currprefs)) { + mouse_x = v & 0xFC; + mouse_y = (v >> 8) & 0xFC; } - if (v < maxhpos/2 && produce_sound < 3) - v = maxhpos/2; - - audio_channel[nr].per = v; } -static void AUDxVOL(int nr, UWORD v) { audio_channel[nr].vol = v & 64 ? 63 : v & 63; } -static void AUDxLEN(int nr, UWORD v) { audio_channel[nr].len = v; } - /* - * Here starts the copper code. It should be rewritten. + * Here starts the copper code. Can you believe it used to be worse? */ -static int copcomp(void) +static __inline__ void copper_adjust_diw (struct copper *cst) +{ + if (cst->vdiw == DIW_waiting_start && vpos == plffirstline) + cst->vdiw = DIW_waiting_stop; + if (cst->vdiw == DIW_waiting_stop && vpos == plflastline) + cst->vdiw = DIW_waiting_start; +} + +/* Determine which cycles are available for the copper in a display + * with a agiven number of planes. */ +static int cycles_for_plane[9][8] = { + { 0, -1, 0, -1, 0, -1, 0, -1 }, + { 0, -1, 0, -1, 0, -1, 0, -1 }, + { 0, -1, 0, -1, 0, -1, 0, -1 }, + { 0, -1, 0, -1, 0, -1, 0, -1 }, + { 0, -1, 0, -1, 0, -1, 0, -1 }, + { 0, -1, 1, -1, 0, -1, 0, -1 }, + { 0, -1, 1, -1, 0, -1, 1, -1 }, + { 1, -1, 1, -1, 1, -1, 1, -1 }, + { 1, -1, 1, -1, 1, -1, 1, -1 } +}; + +static unsigned int waitmasktab[256]; + +#define COP_OFFSET 4 + +static __inline__ int copper_in_playfield (enum diw_states diw, int hpos) { - UWORD vp = vpos & (((copi2 >> 8) & 0x7F) | 0x80); - UWORD hp = current_hpos() & (copi2 & 0xFE); - UWORD vcmp = copi1 >> 8; - UWORD hcmp = copi1 & 0xFE; - return (vp > vcmp || (vp == vcmp && hp >= hcmp)) && ((copi2 & 0x8000) || !(DMACONR() & 0x4000)); + hpos -= COP_OFFSET; + return diw == DIW_waiting_stop && hpos >= plfstrt && hpos < plfstrt + plflinelen; } -/* - * Calculate the minimum number of cycles after which the - * copper comparison becomes true. This is quite tricky. I hope it works. - */ -static int calc_copcomp_true(int currvpos, int currhpos) -{ - UWORD vp = currvpos & (((copi2 >> 8) & 0x7F) | 0x80); - UWORD hp = currhpos & (copi2 & 0xFE); - UWORD vcmp = ((copi1 & (copi2 | 0x8000)) >> 8); - UWORD hcmp = (copi1 & copi2 & 0xFE); - int copper_time_hpos; - int cycleadd = maxhpos - currhpos; - int coptime = 0; - - /* This is a kludge... the problem is that there are programs that wait for - * FFDDFFFE and then for a line in the second display half, and this doesn't - * work without this. I _think_ the reason why it works on the Amiga is that - * the last cycle in the line isn't available for the copper, but I'm not sure. - * OTOH, I'm pretty convinced that the copper timings are correct otherwise, so - * I added this rather than changing something else. */ - if (hcmp == 0xDC) - hcmp += 2; - - if ((vp > vcmp || (vp == vcmp && hp >= hcmp)) && ((copi2 & 0x8000) || !(DMACONR() & 0x4000))) - return 0; +static __inline__ int copper_cant_read (enum diw_states diw, int hpos, int planes) +{ + int t; - try_again: + if (hpos >= ((maxhpos - 2) & ~1)) + return 1; - while (vp < vcmp) { - currvpos++; - if (currvpos > maxvpos + 1) - return -1; - currhpos = 0; - coptime += cycleadd; - cycleadd = maxhpos; - vp = currvpos & (((copi2 >> 8) & 0x7F) | 0x80); - } - if (coptime > 0 && (bplcon0 & 0xF000) == 0xC000) - return coptime; - copper_time_hpos = currhpos; - hp = copper_time_hpos & (copi2 & 0xFE); - if (!(vp > vcmp)) { - while ((int)hp < ((int)hcmp)) { - currhpos++; - /* Copper DMA is turned off in Hires 4 bitplane mode */ - if (decided_nr_planes != 4 /* -1 if before plfstrt */ - || !decided_hires - || current_hpos () >= (thisline_decision.plfstrt + thisline_decision.plflinelen)) - copper_time_hpos++; - - if (currhpos > maxhpos) { - /* Now, what? There might be a good position on the - * next line. But it can also be the FFFF FFFE - * case. - */ - currhpos = 0; - currvpos++; - vp = currvpos & (((copi2 >> 8) & 0x7F) | 0x80); - goto try_again; - } - coptime++; - hp = copper_time_hpos & (copi2 & 0xFE); - } - } - if (coptime == 0) /* waiting for the blitter */ - return 1; + if (currprefs.chipset_mask & CSMASK_AGA) + /* FIXME */ + return 0; - return coptime; -} + if (! copper_in_playfield (diw, hpos)) + return 0; -/* - * Simple version of the above which only tries to get vpos correct. - */ -static int calc_copcomp_true_vpos(int currvpos, int currhpos) -{ - UWORD vp = currvpos & (((copi2 >> 8) & 0x7F) | 0x80); - UWORD hp = currhpos & (copi2 & 0xFE); - UWORD vcmp = ((copi1 & (copi2 | 0x8000)) >> 8); - UWORD hcmp = (copi1 & copi2 & 0xFE); - int copper_time_hpos; - int cycleadd = maxhpos - currhpos; - int coptime = 0; - - /* see above */ - if (hcmp == 0xDC) - hcmp += 2; - - if ((vp > vcmp || (vp == vcmp && hp >= hcmp)) && ((copi2 & 0x8000) || !(DMACONR() & 0x4000))) - return 0; - - while (vp < vcmp) { - currvpos++; - if (currvpos > maxvpos + 1) - return -1; - currhpos = 0; - coptime += cycleadd; - cycleadd = maxhpos; - vp = currvpos & (((copi2 >> 8) & 0x7F) | 0x80); - } - return coptime; -} - -static enum copper_states cop_cmds[4] = { COP_move, COP_wait, COP_move, COP_skip }; - -/* This function is not always correct, but it's the best we can do. */ -static int copper_memory_cycles (int n) -{ - int current_cycle = current_hpos (); - int n_needed = 0; - int planes = ((bplcon0 >> 12) & 7) * (bplcon0 & 0x8000 ? 2 : 1); - - while (n) { - /* This sucks. The DIW may end vertically at exactly this point. Therefore, - * we must call decide_line(). If we're vertically outside the DIW, - * copper_cycle_time will be != -1 after this call [Sanity Interference] */ - decide_line (); - - if (copper_cycle_time == -1 && current_cycle >= 0x14 - && current_cycle >= plfstrt && current_cycle < plfstrt + plflinelen - && (planes == 6 || (planes == 5 && (current_cycle % 8) < 4))) - { - n_needed += 4; - current_cycle += 4; - } else { - n_needed += 2; - current_cycle += 2; - } - n--; - } - return n_needed; + t = cycles_for_plane[planes][hpos & 7]; +#if 0 + if (t == -1) + abort (); +#endif + return t; } -static __inline__ int calc_copper_cycles (int n_cycles) +static void update_copper_1 (int until_hpos) { - return copper_cycle_time != -1 ? copper_cycle_time * n_cycles : copper_memory_cycles (n_cycles); -} + unsigned int vp, hp, vcmp, hcmp; + int c_hpos = cop_state.hpos; + int c_vpos = cop_state.vpos; -static __inline__ int copper_init_read (int n_cycles) -{ - if (dmaen(DMA_COPPER)){ - int t = calc_copper_cycles (n_cycles); + vp = vpos & (((cop_state.i2 >> 8) & 0x7F) | 0x80); + hp = cop_state.count & (cop_state.i2 & 0xFE); + vcmp = ((cop_state.i1 & (cop_state.i2 | 0x8000)) >> 8); + hcmp = (cop_state.i1 & cop_state.i2 & 0xFE); - eventtab[ev_copper].evtime = t + cycles; - return 1; - } else { - copstate = COP_read; - eventtab[ev_copper].active = 0; - return 0; + if (cop_state.state == COP_wait2) + cop_state.state = COP_wait1b; + + for (;;) { + if (c_hpos == (maxhpos & ~1)) { + c_hpos = 0; + cop_state.count = 0; + c_vpos++; + } + + if (! dmaen (DMA_COPPER)) + cop_state.state = COP_stop; + + if (c_vpos > vpos + || c_hpos > until_hpos + || cop_state.state == COP_stop) + break; + + if (c_hpos - COP_OFFSET == plfstrt) + copper_adjust_diw (&cop_state); + + switch (cop_state.state) { + case COP_rdelay1: + cop_state.state = COP_read1; + break; + + case COP_read1: + if (copper_cant_read (cop_state.vdiw, c_hpos, corrected_nr_planes_from_bplcon0)) + break; + + if (cop_state.do_move) { + cop_state.do_move = 0; + if (cop_state.i1 < (copcon & 2 ? ((currprefs.chipset_mask & CSMASK_AGA) ? 0 : 0x40u) : 0x80u)) { + cop_state.state = COP_stop; + break; + } + switch (cop_state.i1) { + case 0x088: + cop_state.ip = cop1lc; + cop_state.state = COP_rdelay1; + break; + case 0x08A: + cop_state.ip = cop2lc; + cop_state.state = COP_rdelay1; + break; + default: + custom_wput_1 (c_hpos, cop_state.i1, cop_state.i2); + break; + } + if (cop_state.state != COP_read1) + 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 (cop_state.vdiw, c_hpos, corrected_nr_planes_from_bplcon0)) + break; + cop_state.i2 = chipmem_bank.wget (cop_state.ip); + cop_state.ip += 2; + if (cop_state.ignore_next) { + cop_state.ignore_next = 0; + cop_state.state = COP_read1; + break; + } + if ((cop_state.i1 & 1) == 0) { + cop_state.state = COP_read1; + cop_state.do_move = 1; + } else { + vp = vpos & (((cop_state.i2 >> 8) & 0x7F) | 0x80); + hp = cop_state.count & (cop_state.i2 & 0xFE); + vcmp = ((cop_state.i1 & (cop_state.i2 | 0x8000)) >> 8); + hcmp = (cop_state.i1 & cop_state.i2 & 0xFE); + + if ((cop_state.i2 & 1) == 0) { + cop_state.state = COP_wait1; + if (cop_state.i1 == 0xFFFF && cop_state.i2 == 0xFFFE) + cop_state.state = COP_stop; + } else { + /* Skip instruction. */ + if ((vp > vcmp || (vp == vcmp && hp >= hcmp)) + && ((cop_state.i2 & 0x8000) != 0 || ! (DMACONR() & 0x4000))) + cop_state.ignore_next = 1; + cop_state.state = COP_read1; + } + } + break; + + case COP_wait1: + if (copper_cant_read (cop_state.vdiw, c_hpos, corrected_nr_planes_from_bplcon0)) + break; + + /* fall through */ + + case COP_wait1b: + { + int do_wait2 = cop_state.state == COP_wait1b; + cop_state.state = COP_wait2; + if (vp == vcmp && corrected_nr_planes_from_bplcon0 < 8) { + int t = cop_state.count + 2; + int next_count = (t & waitmasktab[cop_state.i2 & 0xfe]) | hcmp; + int nexthpos; + if (next_count < t) + next_count = t; + nexthpos = c_hpos + next_count - cop_state.count; + if (nexthpos < (maxhpos & ~1)) { + if (c_hpos - COP_OFFSET < plfstrt && nexthpos - COP_OFFSET >= plfstrt) + copper_adjust_diw (&cop_state); + c_hpos = nexthpos; + cop_state.count = next_count; + do_wait2 = 1; + } + } + if (! do_wait2) + break; + } + + /* fall through */ + + case COP_wait2: + if (vp < vcmp) { + if (c_hpos - COP_OFFSET < plfstrt) + copper_adjust_diw (&cop_state); + + c_vpos++; + c_hpos = 0; + cop_state.count = 0; + continue; + } + hp = cop_state.count & (cop_state.i2 & 0xFE); + if (vp == vcmp && hp < hcmp) + break; + /* Now we know that the comparisons were successful. */ + if ((cop_state.i2 & 0x8000) == 0x8000 || ! (DMACONR() & 0x4000)) + cop_state.state = COP_read1; + else { + /* We need to wait for the blitter. It won't stop while + * we're in update_copper, so we _could_ as well proceed to + * until_hpos in one big step. There are some tricky + * issues to be considered, though, so use the slow method + * for now. */ + cop_state.state = COP_bltwait; + } + break; + + default: + /* Delay cycles. */ + break; + } + + c_hpos += 2; + if (corrected_nr_planes_from_bplcon0 < 8 || ! copper_in_playfield (cop_state.vdiw, c_hpos)) + cop_state.count += 2; } + cop_state.hpos = c_hpos; + cop_state.vpos = c_vpos; } -static __inline__ void copper_read (void) +static __inline__ void update_copper (int until_hpos) { - int cmd; - - copi1 = chipmem_bank.wget(coplc); - copi2 = chipmem_bank.wget(coplc+2); - coplc += 4; - eventtab[ev_copper].oldcycles = cycles; - - cmd = (copi1 & 1) | ((copi2 & 1) << 1); - copstate = cop_cmds[cmd]; - eventtab[ev_copper].oldcycles = cycles; + if (cop_state.vpos > vpos + || cop_state.hpos > until_hpos + || cop_state.state == COP_stop) + return; + update_copper_1 (until_hpos); } -static __inline__ void handle_bltfinish_wait (void) +static int dangerous_reg (int reg) { - if (bltstate == BLT_done) { - copstate = COP_read; - /* Don't need to wait. Experimental: No copper wakeup time in this case. */ - } else { - eventtab[ev_copper].active = 0; - copstate = COP_morewait; - copper_waiting_for_blitter = 1; - } + /* 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; } -void blitter_done_notify (void) +static void prepare_copper_1 (void) { - if (copper_waiting_for_blitter) { - copper_waiting_for_blitter = 0; - eventtab[ev_copper].active = 1; - eventtab[ev_copper].oldcycles = cycles; - eventtab[ev_copper].evtime = 1 + cycles; - events_schedule (); - } -} + struct copper cst = cop_state; + unsigned int vp, hp, vcmp, hcmp; -static void do_copper(void) -{ - int coptime, t; - for (;;) - switch(copstate){ - case COP_read: - eventtab[ev_copper].oldcycles = cycles; - if (!copper_init_read (2)) - return; - copstate = COP_do_read; - return; - - case COP_do_read: - copper_read (); - break; + vp = vpos & (((cop_state.i2 >> 8) & 0x7F) | 0x80); + hp = cop_state.count & (cop_state.i2 & 0xFE); + vcmp = ((cop_state.i1 & (cop_state.i2 | 0x8000)) >> 8); + hcmp = (cop_state.i1 & cop_state.i2 & 0xFE); - case COP_read_ignore: - eventtab[ev_copper].oldcycles = cycles; - if (!copper_init_read (2)) - return; - copstate = COP_do_read_ignore; + if (cst.state == COP_wait2) + cst.state = COP_wait1b; + + for (;;) { + if (cst.hpos == (maxhpos & ~1)) { + cst.hpos = 0; + cst.count = 0; + cst.vpos++; + } + + if (! dmaen (DMA_COPPER)) + cst.state = COP_stop; + + if (cst.vpos > vpos + || cst.state == COP_stop) + { + eventtab[ev_copper].active = 0; return; + } + + if (cst.hpos - COP_OFFSET == plfstrt) + copper_adjust_diw (&cst); - case COP_do_read_ignore: - copper_read (); - copstate = COP_read; + switch (cst.state) { + case COP_rdelay1: + cst.state = COP_read1; break; - case COP_move: - if (copi1 >= (copcon & 2 ? 0x40 : 0x80)) { - custom_bank.wput(copi1,copi2); - copstate = COP_read; + case COP_read1: + if (copper_cant_read (cst.vdiw, cst.hpos, corrected_nr_planes_from_bplcon0)) break; - } else { - copstate = COP_stop; - eventtab[ev_copper].active = 0; - copper_active = 0; + + if (cst.do_move) { + cst.do_move = 0; + if (cst.i1 < (copcon & 2 ? ((currprefs.chipset_mask & CSMASK_AGA) ? 0 : 0x40u) : 0x80u)) { + cst.state = COP_stop; + eventtab[ev_copper].active = 0; + return; + } else if (dangerous_reg (cst.i1)) { + eventtab[ev_copper].active = 1; + eventtab[ev_copper].oldcycles = cycles; + eventtab[ev_copper].evtime = cycles + cst.hpos - current_hpos () + (cst.vpos - cop_state.vpos) * maxhpos; + return; + } } - return; - case COP_skip: - copstate = COP_read; - if (calc_copcomp_true(vpos, current_hpos()) == 0) - copstate = COP_read_ignore; + cst.i1 = chipmem_bank.wget (cst.ip); + cst.ip += 2; + cst.state = COP_read2; break; - case COP_wait: - /* Recognize blitter wait statements. This is a speed optimization - * only.*/ - if (copi1 == 1 && copi2 == 0) { - handle_bltfinish_wait (); - if (!eventtab[ev_copper].active) - return; + case COP_read2: + if (copper_cant_read (cst.vdiw, cst.hpos, corrected_nr_planes_from_bplcon0)) + break; + cst.i2 = chipmem_bank.wget (cst.ip); + cst.ip += 2; + if (cst.ignore_next) { + cst.ignore_next = 0; + cst.state = COP_read1; break; } - coptime = calc_copcomp_true_vpos(vpos, current_hpos()); - if (coptime > 0) { - copstate = COP_morewait; - eventtab[ev_copper].oldcycles = cycles; - eventtab[ev_copper].evtime = coptime + cycles; - return; - } - coptime = calc_copcomp_true(vpos, current_hpos()); - if (coptime < 0) { - copstate = COP_stop; - eventtab[ev_copper].active = 0; - copper_active = 0; - return; - } - if (coptime) { - copstate = COP_morewait; - eventtab[ev_copper].evtime = coptime + cycles; - return; + if ((cst.i1 & 1) == 0) { + cst.state = COP_read1; + cst.do_move = 1; + } else { + vp = vpos & (((cst.i2 >> 8) & 0x7F) | 0x80); + hp = cst.count & (cst.i2 & 0xFE); + vcmp = ((cst.i1 & (cst.i2 | 0x8000)) >> 8); + hcmp = (cst.i1 & cst.i2 & 0xFE); + + if ((cst.i2 & 1) == 0) { + cst.state = COP_wait1; + if (cst.i1 == 0xFFFF && cst.i2 == 0xFFFE) + cst.state = COP_stop; + } else { + /* Skip instruction. */ + if ((vp > vcmp || (vp == vcmp && hp >= hcmp)) + && ((cst.i2 & 0x8000) != 0 || ! (DMACONR() & 0x4000))) + cst.ignore_next = 1; + cst.state = COP_read1; + } } - copstate = COP_read; - /* Experimental: no copper wakeup time in this case. The HRM says - * nothing about this. */ break; - case COP_morewait: - coptime = calc_copcomp_true(vpos, current_hpos()); - if (coptime < 0) { - copstate = COP_stop; - eventtab[ev_copper].active = 0; - copper_active = 0; - return; + case COP_wait1: + if (copper_cant_read (cst.vdiw, cst.hpos, corrected_nr_planes_from_bplcon0)) + break; + + /* fall through */ + + case COP_wait1b: + { + int do_wait2 = cst.state == COP_wait1b; + cst.state = COP_wait2; + if (vp == vcmp && corrected_nr_planes_from_bplcon0 < 8) { + int t = cst.count + 2; + int next_count = (t & waitmasktab[cst.i2 & 0xfe]) | hcmp; + int nexthpos; + if (next_count < t) + next_count = t; + nexthpos = cst.hpos + next_count - cst.count; + if (nexthpos < (maxhpos & ~1)) { + if (cst.hpos - COP_OFFSET < plfstrt && nexthpos - COP_OFFSET >= plfstrt) + copper_adjust_diw (&cst); + cst.hpos = nexthpos; + cst.count = next_count; + do_wait2 = 1; + } + } + if (! do_wait2) + break; + } + + /* fall through */ + + case COP_wait2: + if (vp < vcmp) { + if (cst.hpos - COP_OFFSET < plfstrt) + copper_adjust_diw (&cst); + + cst.vpos++; + cst.count = 0; + cst.hpos = 0; + continue; } - if (coptime) { - eventtab[ev_copper].evtime = coptime + cycles; - return; + hp = cst.count & (cst.i2 & 0xFE); + if (vp == vcmp && hp < hcmp) + break; +#if 0 + if (nexthpos != -1) + if (nexthpos != cst.count) + printf ("ERROR\n"); + nexthpos = -1; +#endif + /* Now we know that the comparisons were successful. */ + if ((cst.i2 & 0x8000) == 0x8000 || ! (DMACONR() & 0x4000)) + cst.state = COP_read1; + else { + /* We need to wait for the blitter. It won't stop while + * we're in update_copper, so we _could_ as well proceed to + * until_hpos in one big step. There are some tricky + * issues to be considered, though, so use the slow method + * for now. */ + cst.state = COP_bltwait; } - /* Copper wakeup time: 1 memory cycle, plus 2 for the next read */ - eventtab[ev_copper].oldcycles = cycles; - if (!copper_init_read (3)) - return; - copstate = COP_do_read; - return; + break; - case COP_stop: - eventtab[ev_copper].active = 0; - copper_active = 0; - return; + default: + /* Delay cycles. */ + break; } + + cst.hpos += 2; + if (corrected_nr_planes_from_bplcon0 < 8 || ! copper_in_playfield (cst.vdiw, cst.hpos)) + cst.count += 2; + } +} + +void blitter_done_notify (void) +{ + if (cop_state.state != COP_bltwait) + return; + update_copper (current_hpos ()); + cop_state.state = COP_wait2; + eventtab[ev_copper].active = 1; + eventtab[ev_copper].oldcycles = cycles; + eventtab[ev_copper].evtime = (cycles + 2) & ~1; + events_schedule (); +} + +static void do_copper (void) +{ + int hpos = current_hpos (); + update_copper (hpos); + prepare_copper (); + if (eventtab[ev_copper].evtime == cycles && eventtab[ev_copper].active) + abort (); } -static void diskblk_handler(void) +static void diskblk_handler (void) { regs.spcflags |= SPCFLAG_DISK; eventtab[ev_diskblk].active = 0; } -void do_disk(void) +void do_disk (void) { if (dskdmaen != 2 && (regs.spcflags & SPCFLAG_DISK)) { - fprintf(stderr, "BUG!\n"); + 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)) { - fprintf(stderr, "warning: Bad disk write DMA pointer\n"); + write_log ("warning: Bad disk write DMA pointer\n"); } else { - UBYTE *mfmp = get_real_address (dskpt); + uae_u8 *mfmp = get_real_address (dskpt); int i; DISK_InitWrite(); for (i = 0; i < dsklength; i++) { - UWORD d = (*mfmp << 8) + *(mfmp+1); + uae_u16 d = (*mfmp << 8) + *(mfmp+1); mfmwrite[i] = d; mfmp += 2; } DISK_WriteData(dsklength); } } else { - int result = DISK_ReadMFM (dskpt); + DISK_ReadMFM (dskpt); } regs.spcflags &= ~SPCFLAG_DISK; INTREQ(0x9002); @@ -2507,16 +2557,15 @@ void do_disk(void) } } -static void do_sprites(int currvp, int currhp) -{ +static void do_sprites (int currvp, int currhp) +{ int i; - /* The graph in the HRM, p. 195 seems to indicate that sprite 0 is - * fetched at cycle 0x14 and thus can't be disabled by bitplane DMA. */ - int maxspr = currhp/4 - 0x14/4; + int maxspr; + #if 0 if (currvp == 0) return; -#else +#else /* I don't know whether this is right. Some programs write the sprite pointers * directly at the start of the copper list. With the currvp==0 check, the * first two words of data are read on the second line in the frame. The problem @@ -2526,38 +2575,45 @@ static void do_sprites(int currvp, int c * is disabled until the end of the vertical blanking interval. The HRM * isn't clear - it says that the vertical sprite position can be set to any * value, but this wouldn't be the first mistake... */ - /* Update: I modified one of the programs to write the sprite pointers the + /* Update: I modified one of the programs to write the sprite pointers the * second time only _after_ the VBlank interval, and it showed the same behaviour * as it did unmodified under UAE with the above check. This indicates that the * solution below is correct. */ if (currvp < vblank_endline) return; #endif + + /* The graph in the HRM, p. 195 seems to indicate that sprite 0 is + * fetched at cycle 0x14 and thus can't be disabled by bitplane DMA. */ + maxspr = currhp/4 - 0x14/4; if (maxspr < 0) return; if (maxspr > 8) maxspr = 8; - + for (i = 0; i < maxspr; i++) { int fetch = 0; - - if (spron[i] == SPR_restart) { + + if (spron[i] == 0) + continue; + + if (sprst[i] == SPR_restart) { fetch = 2; - spron[i] = SPR_waiting_start; - } else if ((spron[i] == SPR_waiting_start && sprvstart[i] == vpos) || spron[i] == SPR_waiting_stop) { + spron[i] = 1; + } else if ((sprst[i] == SPR_waiting_start && sprvstart[i] == vpos) || sprst[i] == SPR_waiting_stop) { fetch = 1; - spron[i] = SPR_waiting_stop; + sprst[i] = SPR_waiting_stop; } - if (spron[i] == SPR_waiting_stop && sprvstop[i] == vpos) { + if (sprst[i] == SPR_waiting_stop && sprvstop[i] == vpos) { fetch = 2; - spron[i] = SPR_waiting_start; + sprst[i] = SPR_waiting_start; } if (fetch && dmaen(DMA_SPRITE)) { - UWORD data1 = chipmem_bank.wget(sprpt[i]); - UWORD data2 = chipmem_bank.wget(sprpt[i]+2); + uae_u16 data1 = chipmem_bank.wget(sprpt[i]); + uae_u16 data2 = chipmem_bank.wget(sprpt[i]+2); sprpt[i] += 4; - + if (fetch == 1) { /* Hack for X mouse auto-calibration */ if (i == 0 && !sprvbfl && ((sprpos[0] & 0xff) << 2) > 2 * DISPLAY_LEFT_SHIFT) { @@ -2575,1669 +2631,79 @@ static void do_sprites(int currvp, int c } } -#if AGA_CHIPSET == 0 -static void pfield_sprite (int num, int sprxp, UWORD data, UWORD datb, int ctl) -{ - int i; - int sprx_inc; - int *lookup = bpldualpf ? (bpldualpfpri ? dblpf_ind2 : dblpf_ind1) : linear_map_256; - int *lookup_no = bpldualpf ? (bpldualpfpri ? dblpf_2nd2 : dblpf_2nd1) : lots_of_twos; - - sprx_inc = 1; - if (!gfx_requested_lores) - sprx_inc = 2; -#ifdef LORES_HACK - else if (gfx_requested_lores == 2) - sprxp >>= 1; -#endif - sprxp += sprx_inc * 16 - sprx_inc; - for(i = 15; i >= 0; i--, data >>= 1, datb >>= 1, sprxp -= sprx_inc) { - int plno; - int col; - - /* Check the priority, but only if we did not already put a sprite - * pixel at this position. If there's already a sprite pixel here, - * the priority was previously tested. */ - if (!spixstate[sprxp]) { - /* ??? What about hires mode when one hires pixel is 0, enabling the - * sprite, and the other is != 0, blocking it? */ - plno = lookup_no[pixdata.apixels[sprxp]]; - if (plno != 0 && (1 << num) >= plfpri[plno]) - continue; - } - - if ((ctl & 0x80) && (num & 1)) { - /* Attached sprite */ - col = ((data << 2) & 4) + ((datb << 3) & 8); - spixstate[sprxp] |= 1 << (num-1); - spixels[sprxp] = col; - } else { - col = (data & 1) | ((datb << 1) & 2); - if (spixstate[sprxp] & (1 << num)) { - /* Finish attached sprite */ - /* Did the upper half of the sprite have any bits set? */ - if (spixstate[sprxp] & (1 << (num+1))) - col += spixels[sprxp]; - /* Is there any sprite pixel at this position at all? */ - if (!col) { - spixstate[sprxp] &= ~(3 << num); - } else - col += 16; - } else { - if (col) { - col |= 16 | ((num & 6) << 1); - } - } - } - if (col) { - pixdata.apixels[sprxp] = col; - spixstate[sprxp] |= 1 << num; - - if (!gfx_requested_lores) { - pixdata.apixels[sprxp+1] = col; - spixstate[sprxp+1] |= 1 << num; - } - if (bplham && bplplanecnt == 6) { - ham_linebuf[sprxp] = colors_for_drawing.color_regs[col]; - if (!gfx_requested_lores) - ham_linebuf[sprxp+1] = colors_for_drawing.color_regs[col]; - } - } - } -} -#else /* AGA version */ -static void pfield_sprite (int num, int sprxp, UWORD data, UWORD datb) +static void init_sprites (void) { int i; - int *lookup = bpldualpf ? (bpldualpfpri ? dblpf_ind2 : dblpf_ind1) : linear_map_256; - int *lookup_no = bpldualpf ? (bpldualpfpri ? dblpf_2nd2 : dblpf_2nd1) : lots_of_twos; - - for(i = 15; i >= 0; i--, data >>= 1, datb >>= 1) { - int sprxpos = sprxp + (i << lores_shift); - int plno; - int col; - - /* Check the priority, but only if we did not already put a sprite - * pixel at this position. If there's already a sprite pixel here, - * the priority was previously tested. */ - if (!spixstate[sprxpos]) { - /* ??? What about hires mode when one hires pixel is 0, enabling the - * sprite, and the other is != 0, blocking it? */ - plno = lookup_no[pixdata.apixels[sprxpos]]; - if (plno != 0 && (1 << num) >= plfpri[plno]) - continue; - } - - if ((sprctl[num] & 0x80) && (num & 1)) { - /* Attached sprite */ - col = ((data << 2) & 4) + ((datb << 3) & 8); - spixstate[sprxpos] |= 1 << (num-1); - spixels[sprxpos] = col; - } else { - col = (data & 1) | ((datb << 1) & 2); - if (spixstate[sprxpos] & (1 << num)) { - /* Finish attached sprite */ - /* Did the upper half of the sprite have any bits set? */ - if (spixstate[sprxpos] & (1 << (num+1))) - col += spixels[sprxpos]; - /* Is there any sprite pixel at this position at all? */ - if (!col) { - spixstate[sprxpos] &= ~(3 << num); - } else - col += ((bplcon4 << (num & 1 ? 4 : 0)) & 240); - } else { - if (col) { - col |= ((bplcon4 << (num & 1 ? 4 : 0)) & 240) | ((num & 6) << 1); - } - } - } - if (col) { - pixdata.apixels[sprxpos] = col; - spixstate[sprxpos] |= 1<plflinelen >> 1; - for (i = 0; i < len; i++) { - unsigned int data1; - ULONG v1, v2; - - data1 = *(ptr + i); - v1 = hirestab_h[data1][0]; - v2 = hirestab_h[data1][1]; - - if (nplanes > 1) { - unsigned int data2 = *(ptr + i + 2*MAX_WORDS_PER_LINE*2); - v1 |= hirestab_h[data2][0] << 2; - v2 |= hirestab_h[data2][1] << 2; - } - if (nplanes > 2) { - unsigned int data3 = *(ptr + i + 4*MAX_WORDS_PER_LINE*2); - v1 |= hirestab_h[data3][0] << 4; - v2 |= hirestab_h[data3][1] << 4; - } - if (nplanes > 3) { - unsigned int data4 = *(ptr + i + 6*MAX_WORDS_PER_LINE*2); - v1 |= hirestab_h[data4][0] << 6; - v2 |= hirestab_h[data4][1] << 6; - } - if (do_or) { - app[i*2] |= v1 << 1; - app[i*2 + 1] |= v2 << 1; - } else { - app[i*2] = v1; - app[i*2 + 1] = v2; - } - } -} - -static __inline__ void doop_planes_lores_unaligned_h (ULONG *app, UBYTE *ptr, int nplanes, int do_or) -{ - int i; - int len = dp_for_drawing->plflinelen >> 2; - for (i = 0; i < len; i++) { - unsigned int data1; - ULONG v1, v2, v3, v4; - - data1 = *(ptr + i); - v1 = lorestab_h[data1][0]; - v2 = lorestab_h[data1][1]; - v3 = lorestab_h[data1][2]; - v4 = lorestab_h[data1][3]; - - if (nplanes > 1) { - unsigned int data2 = *(ptr + i + 2*MAX_WORDS_PER_LINE*2); - v1 |= lorestab_h[data2][0] << 2; - v2 |= lorestab_h[data2][1] << 2; - v3 |= lorestab_h[data2][2] << 2; - v4 |= lorestab_h[data2][3] << 2; - } - - if (nplanes > 2) { - unsigned int data3 = *(ptr + i + 4*MAX_WORDS_PER_LINE*2); - v1 |= lorestab_h[data3][0] << 4; - v2 |= lorestab_h[data3][1] << 4; - v3 |= lorestab_h[data3][2] << 4; - v4 |= lorestab_h[data3][3] << 4; - } - - if (nplanes > 3) { - unsigned int data4 = *(ptr + i + 6*MAX_WORDS_PER_LINE*2); - v1 |= lorestab_h[data4][0] << 6; - v2 |= lorestab_h[data4][1] << 6; - v3 |= lorestab_h[data4][2] << 6; - v4 |= lorestab_h[data4][3] << 6; - } - if (do_or) { - app[i*4] |= v1 << 1; - app[i*4 + 1] |= v2 << 1; - app[i*4 + 2] |= v3 << 1; - app[i*4 + 3] |= v4 << 1; - } else { - app[i*4] = v1; - app[i*4 + 1] = v2; - app[i*4 + 2] = v3; - app[i*4 + 3] = v4; - } - } -} - -static __inline__ void doop_planes_hires_unaligned_l (ULONG *app, UBYTE *ptr, int nplanes, int do_or) -{ - int i; - int len = dp_for_drawing->plflinelen >> 1; - for (i = 0; i < len; i++) { - unsigned int data1; - ULONG v; - - data1 = *(ptr + i); - v = hirestab_l[data1][0]; - if (nplanes > 1) { - unsigned int data2 = *(ptr + i + 2*MAX_WORDS_PER_LINE*2); - v |= hirestab_l[data2][0] << 2; - } - if (nplanes > 2) { - unsigned int data3 = *(ptr + i + 4*MAX_WORDS_PER_LINE*2); - v |= hirestab_l[data3][0] << 4; - } - if (nplanes > 3) { - unsigned int data4 = *(ptr + i + 6*MAX_WORDS_PER_LINE*2); - v |= hirestab_l[data4][0] << 6; - } - if (do_or) - app[i] |= v << 1; - else - app[i] = v; - } -} - -static __inline__ void doop_planes_lores_unaligned_l (ULONG *app, UBYTE *ptr, int nplanes, int do_or) -{ - int i; - int len = dp_for_drawing->plflinelen >> 2; - for (i = 0; i < len; i++) { - unsigned int data1; - ULONG v1, v2; - - data1 = *(ptr + i); - v1 = lorestab_l[data1][0]; - v2 = lorestab_l[data1][1]; - - if (nplanes > 1) { - unsigned int data2 = *(ptr + i + 2*MAX_WORDS_PER_LINE*2); - v1 |= lorestab_l[data2][0] << 2; - v2 |= lorestab_l[data2][1] << 2; - } - if (nplanes > 2) { - unsigned int data3 = *(ptr + i + 4*MAX_WORDS_PER_LINE*2); - v1 |= lorestab_l[data3][0] << 4; - v2 |= lorestab_l[data3][1] << 4; - } - if (nplanes > 3) { - unsigned int data4 = *(ptr + i + 6*MAX_WORDS_PER_LINE*2); - v1 |= lorestab_l[data4][0] << 6; - v2 |= lorestab_l[data4][1] << 6; - } - if (do_or) { - app[i*2] |= v1 << 1; - app[i*2 + 1] |= v2 << 1; - } else { - app[i*2] = v1; - app[i*2 + 1] = v2; - } - } -} - -static __inline__ void set_planes_hires_unaligned_h (ULONG *app, UBYTE *ptr, int nplanes) -{ - int i; - int len = dp_for_drawing->plflinelen >> 1; - for (i = 0; i < len; i++) { - unsigned int data1; - ULONG v1, v2; - - data1 = *(ptr + i); - v1 = hirestab_h[data1][0]; - v2 = hirestab_h[data1][1]; - - if (nplanes > 1) { - unsigned int data2 = *(ptr + i + 1*MAX_WORDS_PER_LINE*2); - v1 |= hirestab_h[data2][0] << 1; - v2 |= hirestab_h[data2][1] << 1; - } - - if (nplanes > 2) { - unsigned int data3 = *(ptr + i + 2*MAX_WORDS_PER_LINE*2); - v1 |= hirestab_h[data3][0] << 2; - v2 |= hirestab_h[data3][1] << 2; - } - - if (nplanes > 3) { - unsigned int data4 = *(ptr + i + 3*MAX_WORDS_PER_LINE*2); - v1 |= hirestab_h[data4][0] << 3; - v2 |= hirestab_h[data4][1] << 3; - } - - if (nplanes > 4) { - unsigned int data5 = *(ptr + i + 4*MAX_WORDS_PER_LINE*2); - v1 |= hirestab_h[data5][0] << 4; - v2 |= hirestab_h[data5][1] << 4; - } - - if (nplanes > 5) { - unsigned int data6 = *(ptr + i + 5*MAX_WORDS_PER_LINE*2); - v1 |= hirestab_h[data6][0] << 5; - v2 |= hirestab_h[data6][1] << 5; - } - - if (nplanes > 6) { - unsigned int data7 = *(ptr + i + 6*MAX_WORDS_PER_LINE*2); - v1 |= hirestab_h[data7][0] << 6; - v2 |= hirestab_h[data7][1] << 6; - } - - if (nplanes > 7) { - unsigned int data8 = *(ptr + i + 7*MAX_WORDS_PER_LINE*2); - v1 |= hirestab_h[data8][0] << 7; - v2 |= hirestab_h[data8][1] << 7; - } - app[i*2] = v1; - app[i*2 + 1] = v2; - } -} - -static __inline__ void set_planes_lores_unaligned_h (ULONG *app, UBYTE *ptr, int nplanes) -{ - int i; - int len = dp_for_drawing->plflinelen >> 2; - for (i = 0; i < len; i++) { - unsigned int data1; - ULONG v1, v2, v3, v4; - - data1 = *(ptr + i); - v1 = lorestab_h[data1][0]; - v2 = lorestab_h[data1][1]; - v3 = lorestab_h[data1][2]; - v4 = lorestab_h[data1][3]; - - if (nplanes > 1) { - unsigned int data2 = *(ptr + i + 1*MAX_WORDS_PER_LINE*2); - v1 |= lorestab_h[data2][0] << 1; - v2 |= lorestab_h[data2][1] << 1; - v3 |= lorestab_h[data2][2] << 1; - v4 |= lorestab_h[data2][3] << 1; - } - - if (nplanes > 2) { - unsigned int data3 = *(ptr + i + 2*MAX_WORDS_PER_LINE*2); - v1 |= lorestab_h[data3][0] << 2; - v2 |= lorestab_h[data3][1] << 2; - v3 |= lorestab_h[data3][2] << 2; - v4 |= lorestab_h[data3][3] << 2; - } - - if (nplanes > 3) { - unsigned int data4 = *(ptr + i + 3*MAX_WORDS_PER_LINE*2); - v1 |= lorestab_h[data4][0] << 3; - v2 |= lorestab_h[data4][1] << 3; - v3 |= lorestab_h[data4][2] << 3; - v4 |= lorestab_h[data4][3] << 3; - } - - if (nplanes > 4) { - unsigned int data5 = *(ptr + i + 4*MAX_WORDS_PER_LINE*2); - v1 |= lorestab_h[data5][0] << 4; - v2 |= lorestab_h[data5][1] << 4; - v3 |= lorestab_h[data5][2] << 4; - v4 |= lorestab_h[data5][3] << 4; - } - - if (nplanes > 5) { - unsigned int data6 = *(ptr + i + 5*MAX_WORDS_PER_LINE*2); - v1 |= lorestab_h[data6][0] << 5; - v2 |= lorestab_h[data6][1] << 5; - v3 |= lorestab_h[data6][2] << 5; - v4 |= lorestab_h[data6][3] << 5; - } - - if (nplanes > 6) { - unsigned int data7 = *(ptr + i + 6*MAX_WORDS_PER_LINE*2); - v1 |= lorestab_h[data7][0] << 6; - v2 |= lorestab_h[data7][1] << 6; - v3 |= lorestab_h[data7][2] << 6; - v4 |= lorestab_h[data7][3] << 6; - } - - if (nplanes > 7) { - unsigned int data8 = *(ptr + i + 7*MAX_WORDS_PER_LINE*2); - v1 |= lorestab_h[data8][0] << 7; - v2 |= lorestab_h[data8][1] << 7; - v3 |= lorestab_h[data8][2] << 7; - v4 |= lorestab_h[data8][3] << 7; - } - app[i*4] = v1; - app[i*4 + 1] = v2; - app[i*4 + 2] = v3; - app[i*4 + 3] = v4; - } -} - -static __inline__ void set_planes_hires_unaligned_l (ULONG *app, UBYTE *ptr, int nplanes) -{ - int i; - int len = dp_for_drawing->plflinelen >> 1; - for (i = 0; i < len; i++) { - unsigned int data1; - ULONG v; - - data1 = *(ptr + i); - - v = hirestab_l[data1][0]; - if (nplanes > 1) { - unsigned int data2 = *(ptr + i + 1*MAX_WORDS_PER_LINE*2); - v |= hirestab_l[data2][0] << 1; - } - if (nplanes > 2) { - unsigned int data3 = *(ptr + i + 2*MAX_WORDS_PER_LINE*2); - v |= hirestab_l[data3][0] << 2; - } - if (nplanes > 3) { - unsigned int data4 = *(ptr + i + 3*MAX_WORDS_PER_LINE*2); - v |= hirestab_l[data4][0] << 3; - } - if (nplanes > 4) { - unsigned int data5 = *(ptr + i + 4*MAX_WORDS_PER_LINE*2); - v |= hirestab_l[data5][0] << 4; - } - if (nplanes > 5) { - unsigned int data6 = *(ptr + i + 5*MAX_WORDS_PER_LINE*2); - v |= hirestab_l[data6][0] << 5; - } - if (nplanes > 6) { - unsigned int data7 = *(ptr + i + 6*MAX_WORDS_PER_LINE*2); - v |= hirestab_l[data7][0] << 6; - } - if (nplanes > 7) { - unsigned int data8 = *(ptr + i + 7*MAX_WORDS_PER_LINE*2); - v |= hirestab_l[data8][0] << 7; - } - app[i] = v; + for (i = 0; i < 8; i++) { + /* ???? */ + sprst[i] = SPR_stop; + spron[i] = 0; } -} - -static __inline__ void set_planes_lores_unaligned_l (ULONG *app, UBYTE *ptr, int nplanes) -{ - int i; - int len = dp_for_drawing->plflinelen >> 2; - for (i = 0; i < len; i++) { - unsigned int data1; - ULONG v1, v2; - - data1 = *(ptr + i); - v1 = lorestab_l[data1][0]; - v2 = lorestab_l[data1][1]; - - if (nplanes > 1) { - unsigned int data2 = *(ptr + i + 1*MAX_WORDS_PER_LINE*2); - v1 |= lorestab_l[data2][0] << 1; - v2 |= lorestab_l[data2][1] << 1; - } - - if (nplanes > 2) { - unsigned int data3 = *(ptr + i + 2*MAX_WORDS_PER_LINE*2); - v1 |= lorestab_l[data3][0] << 2; - v2 |= lorestab_l[data3][1] << 2; - } - - if (nplanes > 3) { - unsigned int data4 = *(ptr + i + 3*MAX_WORDS_PER_LINE*2); - v1 |= lorestab_l[data4][0] << 3; - v2 |= lorestab_l[data4][1] << 3; - } - - if (nplanes > 4) { - unsigned int data5 = *(ptr + i + 4*MAX_WORDS_PER_LINE*2); - v1 |= lorestab_l[data5][0] << 4; - v2 |= lorestab_l[data5][1] << 4; - } - if (nplanes > 5) { - unsigned int data6 = *(ptr + i + 5*MAX_WORDS_PER_LINE*2); - v1 |= lorestab_l[data6][0] << 5; - v2 |= lorestab_l[data6][1] << 5; - } - - if (nplanes > 6) { - unsigned int data7 = *(ptr + i + 6*MAX_WORDS_PER_LINE*2); - v1 |= lorestab_l[data7][0] << 6; - v2 |= lorestab_l[data7][1] << 6; - } - - if (nplanes > 7) { - unsigned int data8 = *(ptr + i + 7*MAX_WORDS_PER_LINE*2); - v1 |= lorestab_l[data8][0] << 7; - v2 |= lorestab_l[data8][1] << 7; - } - - app[i*2] = v1; - app[i*2 + 1] = v2; - } + memset (sprpos, 0, sizeof sprpos); + memset (sprctl, 0, sizeof sprctl); } -static void pfield_doline_unaligned_h (int lineno) +static void adjust_array_sizes (void) { - int xpos = dp_for_drawing->plfstrt * 4 - DISPLAY_LEFT_SHIFT * 2; - - if (bplhires) { - int xpos1 = xpos + 16 + bpldelay1*2; - int xpos2; - UBYTE *dataptr = line_data[lineno]; - - if (bpldelay1 == bpldelay2) { - switch (bplplanecnt) { - case 1: set_planes_hires_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 1); break; - case 2: set_planes_hires_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 2); break; - case 3: set_planes_hires_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 3); break; - case 4: set_planes_hires_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 4); break; - case 5: set_planes_hires_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 5); break; - case 6: set_planes_hires_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 6); break; - case 7: set_planes_hires_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 7); break; - case 8: set_planes_hires_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 8); break; - } - } else { - switch (bplplanecnt) { - case 1: case 2: doop_planes_hires_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 1, 0); break; - case 3: case 4: doop_planes_hires_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 2, 0); break; - case 5: case 6: doop_planes_hires_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 3, 0); break; - case 7: case 8: doop_planes_hires_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 4, 0); break; - } - - dataptr += MAX_WORDS_PER_LINE*2; - xpos2 = xpos + 16 + bpldelay2*2; - switch (bplplanecnt) { - case 2: case 3: doop_planes_hires_unaligned_h ((ULONG *)(pixdata.apixels + xpos2), dataptr, 1, 1); break; - case 4: case 5: doop_planes_hires_unaligned_h ((ULONG *)(pixdata.apixels + xpos2), dataptr, 2, 1); break; - case 6: case 7: doop_planes_hires_unaligned_h ((ULONG *)(pixdata.apixels + xpos2), dataptr, 3, 1); break; - case 8: doop_planes_hires_unaligned_h ((ULONG *)(pixdata.apixels + xpos2), dataptr, 4, 1); break; - } - } - } else { - int xpos1 = xpos + 32 + bpldelay1*2; - int xpos2; - UBYTE *dataptr = line_data[lineno]; - - if (bpldelay1 == bpldelay2) { - switch (bplplanecnt) { - case 1: set_planes_lores_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 1); break; - case 2: set_planes_lores_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 2); break; - case 3: set_planes_lores_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 3); break; - case 4: set_planes_lores_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 4); break; - case 5: set_planes_lores_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 5); break; - case 6: set_planes_lores_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 6); break; - case 7: set_planes_lores_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 7); break; - case 8: set_planes_lores_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 8); break; - } - } else { - switch (bplplanecnt) { - case 1: case 2: doop_planes_lores_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 1, 0); break; - case 3: case 4: doop_planes_lores_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 2, 0); break; - case 5: case 6: doop_planes_lores_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 3, 0); break; - case 7: case 8: doop_planes_lores_unaligned_h ((ULONG *)(pixdata.apixels + xpos1), dataptr, 4, 0); break; - } - - dataptr += MAX_WORDS_PER_LINE*2; - xpos2 = xpos + 32 + bpldelay2*2; - switch (bplplanecnt) { - case 2: case 3: doop_planes_lores_unaligned_h ((ULONG *)(pixdata.apixels + xpos2), dataptr, 1, 1); break; - case 4: case 5: doop_planes_lores_unaligned_h ((ULONG *)(pixdata.apixels + xpos2), dataptr, 2, 1); break; - case 6: case 7: doop_planes_lores_unaligned_h ((ULONG *)(pixdata.apixels + xpos2), dataptr, 3, 1); break; - case 8: doop_planes_lores_unaligned_h ((ULONG *)(pixdata.apixels + xpos2), dataptr, 4, 1); break; - } +#ifdef OS_WITHOUT_MEMORY_MANAGEMENT + if (delta_sprite_draw) { + void *p1,*p2; + int mcc = max_sprite_draw + 200 + delta_sprite_draw; + delta_sprite_draw = 0; + p1 = realloc (sprite_positions[0], mcc * sizeof (struct sprite_draw)); + p2 = realloc (sprite_positions[1], mcc * sizeof (struct sprite_draw)); + if (p1) sprite_positions[0] = p1; + if (p2) sprite_positions[1] = p2; + if (p1 && p2) { + fprintf (stderr, "new max_sprite_draw=%d\n",mcc); + max_sprite_draw = mcc; } } -} - -static void pfield_doline_unaligned_l (int lineno) -{ - int xpos = dp_for_drawing->plfstrt * 2 - DISPLAY_LEFT_SHIFT; - - if (bplhires) { - int xpos1 = xpos + 8 + bpldelay1; - int xpos2; - UBYTE *dataptr = line_data[lineno]; - - if (bpldelay1 == bpldelay2) { - switch (bplplanecnt) { - case 1: set_planes_hires_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 1); break; - case 2: set_planes_hires_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 2); break; - case 3: set_planes_hires_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 3); break; - case 4: set_planes_hires_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 4); break; - case 5: set_planes_hires_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 5); break; - case 6: set_planes_hires_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 6); break; - case 7: set_planes_hires_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 7); break; - case 8: set_planes_hires_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 8); break; - } - } else { - switch (bplplanecnt) { - case 1: case 2: doop_planes_hires_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 1, 0); break; - case 3: case 4: doop_planes_hires_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 2, 0); break; - case 5: case 6: doop_planes_hires_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 3, 0); break; - case 7: case 8: doop_planes_hires_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 4, 0); break; - } - - dataptr += MAX_WORDS_PER_LINE*2; - xpos2 = xpos + 8 + bpldelay2; - switch (bplplanecnt) { - case 2: case 3: doop_planes_hires_unaligned_l ((ULONG *)(pixdata.apixels + xpos2), dataptr, 1, 1); break; - case 4: case 5: doop_planes_hires_unaligned_l ((ULONG *)(pixdata.apixels + xpos2), dataptr, 2, 1); break; - case 6: case 7: doop_planes_hires_unaligned_l ((ULONG *)(pixdata.apixels + xpos2), dataptr, 3, 1); break; - case 8: doop_planes_hires_unaligned_l ((ULONG *)(pixdata.apixels + xpos2), dataptr, 4, 1); break; - } - } - } else { - int xpos1 = xpos + 16 + bpldelay1; - int xpos2; - UBYTE *dataptr = line_data[lineno]; - - if (bpldelay1 == bpldelay2) { - switch (bplplanecnt) { - case 1: set_planes_lores_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 1); break; - case 2: set_planes_lores_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 2); break; - case 3: set_planes_lores_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 3); break; - case 4: set_planes_lores_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 4); break; - case 5: set_planes_lores_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 5); break; - case 6: set_planes_lores_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 6); break; - case 7: set_planes_lores_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 7); break; - case 8: set_planes_lores_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 8); break; - } - } else { - switch (bplplanecnt) { - case 1: case 2: doop_planes_lores_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 1, 0); break; - case 3: case 4: doop_planes_lores_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 2, 0); break; - case 5: case 6: doop_planes_lores_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 3, 0); break; - case 7: case 8: doop_planes_lores_unaligned_l ((ULONG *)(pixdata.apixels + xpos1), dataptr, 4, 0); break; - } - - dataptr += MAX_WORDS_PER_LINE*2; - xpos2 = xpos + 16 + bpldelay2; - switch (bplplanecnt) { - case 2: case 3: doop_planes_lores_unaligned_l ((ULONG *)(pixdata.apixels + xpos2), dataptr, 1, 1); break; - case 4: case 5: doop_planes_lores_unaligned_l ((ULONG *)(pixdata.apixels + xpos2), dataptr, 2, 1); break; - case 6: case 7: doop_planes_lores_unaligned_l ((ULONG *)(pixdata.apixels + xpos2), dataptr, 3, 1); break; - case 8: doop_planes_lores_unaligned_l ((ULONG *)(pixdata.apixels + xpos2), dataptr, 4, 1); break; - } + if (delta_color_change) { + void *p1,*p2; + int mcc = max_color_change + 200 + delta_color_change; + delta_color_change = 0; + p1 = realloc (color_changes[0], mcc * sizeof (struct color_change)); + p2 = realloc (color_changes[1], mcc * sizeof (struct color_change)); + if (p1) color_changes[0] = p1; + if (p2) color_changes[1] = p2; + if (p1 && p2) { + fprintf (stderr, "new max_color_change=%d\n",mcc); + max_color_change = mcc; } } -} - -#define pfield_doline_h pfield_doline_unaligned_h -#define pfield_doline_l pfield_doline_unaligned_l - -#else /* not UNALIGNED_PROFITABLE */ - - -static __inline__ void pfield_orword_hires_h(int data, unsigned char *dp, int bit) -{ - ULONG *pixptr = (ULONG *)dp; - - *pixptr |= hirestab_h[data >> 8][0] << bit; - *(pixptr+1) |= hirestab_h[data >> 8][1] << bit; - *(pixptr+2) |= hirestab_h[data & 255][0] << bit; - *(pixptr+3) |= hirestab_h[data & 255][1] << bit; -} - -static __inline__ void pfield_orword_lores_h(int data, unsigned char *dp, int bit) -{ - ULONG *pixptr = (ULONG *)dp; - - *pixptr |= lorestab_h[data >> 8][0] << bit; - *(pixptr+1) |= lorestab_h[data >> 8][1] << bit; - *(pixptr+2) |= lorestab_h[data >> 8][2] << bit; - *(pixptr+3) |= lorestab_h[data >> 8][3] << bit; - *(pixptr+4) |= lorestab_h[data & 255][0] << bit; - *(pixptr+5) |= lorestab_h[data & 255][1] << bit; - *(pixptr+6) |= lorestab_h[data & 255][2] << bit; - *(pixptr+7) |= lorestab_h[data & 255][3] << bit; -} - -static __inline__ void pfield_setword_hires_h(int data, unsigned char *dp, int bit) -{ - ULONG *pixptr = (ULONG *)dp; - - *pixptr = hirestab_h[data >> 8][0] << bit; - *(pixptr+1) = hirestab_h[data >> 8][1] << bit; - *(pixptr+2) = hirestab_h[data & 255][0] << bit; - *(pixptr+3) = hirestab_h[data & 255][1] << bit; -} - -static __inline__ void pfield_setword_lores_h(int data, unsigned char *dp, int bit) -{ - ULONG *pixptr = (ULONG *)dp; - - *pixptr = lorestab_h[data >> 8][0] << bit; - *(pixptr+1) = lorestab_h[data >> 8][1] << bit; - *(pixptr+2) = lorestab_h[data >> 8][2] << bit; - *(pixptr+3) = lorestab_h[data >> 8][3] << bit; - *(pixptr+4) = lorestab_h[data & 255][0] << bit; - *(pixptr+5) = lorestab_h[data & 255][1] << bit; - *(pixptr+6) = lorestab_h[data & 255][2] << bit; - *(pixptr+7) = lorestab_h[data & 255][3] << bit; -} - -static __inline__ void pfield_orword_hires_l(int data, unsigned char *dp, int bit) -{ - ULONG *pixptr = (ULONG *)dp; - - *pixptr |= hirestab_l[data >> 8][0] << bit; - *(pixptr+1) |= hirestab_l[data & 255][0] << bit; -} - -static __inline__ void pfield_orword_lores_l(int data, unsigned char *dp, int bit) -{ - ULONG *pixptr = (ULONG *)dp; - - *pixptr |= lorestab_l[data >> 8][0] << bit; - *(pixptr+1) |= lorestab_l[data >> 8][1] << bit; - *(pixptr+2) |= lorestab_l[data & 255][0] << bit; - *(pixptr+3) |= lorestab_l[data & 255][1] << bit; -} - -static __inline__ void pfield_setword_hires_l(int data, unsigned char *dp, int bit) -{ - ULONG *pixptr = (ULONG *)dp; - - *pixptr = hirestab_l[data >> 8][0] << bit; - *(pixptr+1) = hirestab_l[data & 255][0] << bit; -} - -static __inline__ void pfield_setword_lores_l(int data, unsigned char *dp, int bit) -{ - ULONG *pixptr = (ULONG *)dp; - - *pixptr = lorestab_l[data >> 8][0] << bit; - *(pixptr+1) = lorestab_l[data >> 8][1] << bit; - *(pixptr+2) = lorestab_l[data & 255][0] << bit; - *(pixptr+3) = lorestab_l[data & 255][1] << bit; -} - -#define DO_ONE_PLANE(POINTER, MULT, FUNC, DELAY, LL_SUB, P_ADD) { \ - int i; \ - unsigned int bpldat1; \ - UWORD data; \ - unsigned int bpldat2 = 0; \ - UBYTE *ptr = (POINTER); \ - for (i = dp_for_drawing->plflinelen; i > 0; i -= LL_SUB) { \ - bpldat1 = bpldat2; \ - bpldat2 = do_get_mem_word ((UWORD *)ptr); \ - ptr+=2; \ - data = (bpldat1 << (16 - DELAY)) | (bpldat2 >> DELAY); \ - FUNC(data, app, MULT); \ - app += P_ADD; \ - } \ - data = bpldat2 << (16 - DELAY); \ - FUNC(data, app, MULT); \ -} - -#ifdef SMART_UPDATE -#define DATA_POINTER(n) (dataptr + (n)*MAX_WORDS_PER_LINE*2) -#else -#define DATA_POINTER(n) (real_bplpt[n]) -#endif - -static void pfield_doline_aligned_h (int lineno) -{ - int xpos = dp_for_drawing->plfstrt * 4 - DISPLAY_LEFT_SHIFT * 2; - - if (bplhires) { - if (bplplanecnt > 0) { - int xpos1 = xpos + 16 + (bpldelay1 >= 8 ? 16 : 0); - int xpos2 = xpos + 16 + (bpldelay2 >= 8 ? 16 : 0); - int delay1 = 2*(bpldelay1 & 7); - int delay2 = 2*(bpldelay2 & 7); - unsigned char *app = pixdata.apixels + xpos1; - UBYTE *dataptr = line_data[lineno]; - - DO_ONE_PLANE(DATA_POINTER(0), 0, pfield_setword_hires_h, delay1, 4, 16); - if (bplplanecnt > 2) { - app = pixdata.apixels + xpos1; - DO_ONE_PLANE(DATA_POINTER(2), 2, pfield_orword_hires_h, delay1, 4, 16); - } -#if AGA_CHIPSET == 1 - if (bplplanecnt > 4) { - app = pixdata.apixels + xpos1; - DO_ONE_PLANE(DATA_POINTER(4), 4, pfield_orword_hires_h, delay1, 4, 16); - } - if (bplplanecnt > 6) { - app = pixdata.apixels + xpos1; - DO_ONE_PLANE(DATA_POINTER(6), 6, pfield_orword_hires_h, delay1, 4, 16); - } -#endif - if (bplplanecnt > 1) { - app = pixdata.apixels + xpos2; - DO_ONE_PLANE(DATA_POINTER(1), 1, pfield_orword_hires_h, delay2, 4, 16); - } - if (bplplanecnt > 3) { - app = pixdata.apixels + xpos2; - DO_ONE_PLANE(DATA_POINTER(3), 3, pfield_orword_hires_h, delay2, 4, 16); - } -#if AGA_CHIPSET == 1 - if (bplplanecnt > 5) { - app = pixdata.apixels + xpos2; - DO_ONE_PLANE(DATA_POINTER(5), 5, pfield_orword_hires_h, delay2, 4, 16); - } - if (bplplanecnt > 7) { - app = pixdata.apixels + xpos2; - DO_ONE_PLANE(DATA_POINTER(7), 7, pfield_orword_hires_h, delay2, 4, 16); - } -#endif - } else { - memset(pixdata.apixels, 0, sizeof(pixdata.apixels)); - } - } else { - if (bplplanecnt > 0) { - int x = xpos + 32; - unsigned char *app = pixdata.apixels + x; - UBYTE *dataptr = line_data[lineno]; - - DO_ONE_PLANE(DATA_POINTER(0), 0, pfield_setword_lores_h, bpldelay1, 8, 32); - if (bplplanecnt > 2) { - app = pixdata.apixels + x; - DO_ONE_PLANE(DATA_POINTER(2), 2, pfield_orword_lores_h, bpldelay1, 8, 32); - } - if (bplplanecnt > 4) { - app = pixdata.apixels + x; - DO_ONE_PLANE(DATA_POINTER(4), 4, pfield_orword_lores_h, bpldelay1, 8, 32); - } -#if AGA_CHIPSET == 1 - if (bplplanecnt > 6) { - app = pixdata.apixels + x; - DO_ONE_PLANE(DATA_POINTER(6), 6, pfield_orword_lores_h, bpldelay1, 8, 32); - } -#endif - if (bplplanecnt > 1) { - app = pixdata.apixels + x; - DO_ONE_PLANE(DATA_POINTER(1), 1, pfield_orword_lores_h, bpldelay2, 8, 32); - } - if (bplplanecnt > 3) { - app = pixdata.apixels + x; - DO_ONE_PLANE(DATA_POINTER(3), 3, pfield_orword_lores_h, bpldelay2, 8, 32); - } - if (bplplanecnt > 5) { - app = pixdata.apixels + x; - DO_ONE_PLANE(DATA_POINTER(5), 5, pfield_orword_lores_h, bpldelay2, 8, 32); - } -#if AGA_CHIPSET == 1 - if (bplplanecnt > 7) { - app = pixdata.apixels + x; - DO_ONE_PLANE(DATA_POINTER(7), 7, pfield_orword_lores_h, bpldelay2, 8, 32); - } -#endif - } else { - memset(pixdata.apixels, 0, sizeof(pixdata.apixels)); + if (delta_delay_change) { + void *p; + int mcc = max_delay_change + 200 + delta_delay_change; + delta_delay_change = 0; + p = realloc (delay_changes, mcc * sizeof (struct delay_change)); + if (p) { + fprintf (stderr, "new max_delay_change=%d\n",mcc); + delay_changes = p; + max_delay_change = mcc; } } -} - -static void pfield_doline_aligned_l (int lineno) -{ - int xpos = dp_for_drawing->plfstrt * 2 - DISPLAY_LEFT_SHIFT; - - if (bplhires) { - if (bplplanecnt > 0) { - int xpos1 = xpos + 8 + (bpldelay1 >= 8 ? 8 : 0); - int xpos2 = xpos + 8 + (bpldelay2 >= 8 ? 8 : 0); - int delay1 = (bpldelay1 & 7) * 2; - int delay2 = (bpldelay2 & 7) * 2; - unsigned char *app = pixdata.apixels + xpos1; - UBYTE *dataptr = line_data[lineno]; - - DO_ONE_PLANE(DATA_POINTER(0), 0, pfield_setword_hires_l, delay1, 4, 8); - if (bplplanecnt > 2) { - app = pixdata.apixels + xpos1; - DO_ONE_PLANE(DATA_POINTER(2), 2, pfield_orword_hires_l, delay1, 4, 8); - } -#if AGA_CHIPSET == 1 - if (bplplanecnt > 4) { - app = pixdata.apixels + xpos1; - DO_ONE_PLANE(DATA_POINTER(4), 4, pfield_orword_hires_l, delay1, 4, 8); - } - if (bplplanecnt > 6) { - app = pixdata.apixels + xpos1; - DO_ONE_PLANE(DATA_POINTER(6), 6, pfield_orword_hires_l, delay1, 4, 8); - } -#endif - if (bplplanecnt > 1) { - app = pixdata.apixels + xpos2; - DO_ONE_PLANE(DATA_POINTER(1), 1, pfield_orword_hires_l, delay2, 4, 8); - } - if (bplplanecnt > 3) { - app = pixdata.apixels + xpos2; - DO_ONE_PLANE(DATA_POINTER(3), 3, pfield_orword_hires_l, delay2, 4, 8); - } -#if AGA_CHIPSET == 1 - if (bplplanecnt > 5) { - app = pixdata.apixels + xpos2; - DO_ONE_PLANE(DATA_POINTER(5), 5, pfield_orword_hires_l, delay2, 4, 8); - } - if (bplplanecnt > 7) { - app = pixdata.apixels + xpos2; - DO_ONE_PLANE(DATA_POINTER(7), 7, pfield_orword_hires_l, delay2, 4, 8); - } -#endif - } else { - memset(pixdata.apixels, 0, sizeof(pixdata.apixels)); - } - } else { - if (bplplanecnt > 0) { - int x = xpos + 16; - int delay1 = bpldelay1; - int delay2 = bpldelay2; - unsigned char *app = pixdata.apixels + x; - UBYTE *dataptr = line_data[lineno]; - - DO_ONE_PLANE(DATA_POINTER(0), 0, pfield_setword_lores_l, delay1, 8, 16); - if (bplplanecnt > 2) { - app = pixdata.apixels + x; - DO_ONE_PLANE(DATA_POINTER(2), 2, pfield_orword_lores_l, delay1, 8, 16); - } - if (bplplanecnt > 4) { - app = pixdata.apixels + x; - DO_ONE_PLANE(DATA_POINTER(4), 4, pfield_orword_lores_l, delay1, 8, 16); - } -#if AGA_CHIPSET == 1 - if (bplplanecnt > 6) { - app = pixdata.apixels + x; - DO_ONE_PLANE(DATA_POINTER(6), 6, pfield_orword_lores_l, delay1, 8, 16); - } #endif - if (bplplanecnt > 1) { - app = pixdata.apixels + x; - DO_ONE_PLANE(DATA_POINTER(1), 1, pfield_orword_lores_l, delay2, 8, 16); - } - if (bplplanecnt > 3) { - app = pixdata.apixels + x; - DO_ONE_PLANE(DATA_POINTER(3), 3, pfield_orword_lores_l, delay2, 8, 16); - } - if (bplplanecnt > 5) { - app = pixdata.apixels + x; - DO_ONE_PLANE(DATA_POINTER(5), 5, pfield_orword_lores_l, delay2, 8, 16); - } -#if AGA_CHIPSET == 1 - if (bplplanecnt > 7) { - app = pixdata.apixels + x; - DO_ONE_PLANE(DATA_POINTER(7), 7, pfield_orword_lores_l, delay2, 8, 16); - } -#endif - } else { - memset(pixdata.apixels, 0, sizeof(pixdata.apixels)); - } - } -} - -#define pfield_doline_h pfield_doline_aligned_h -#define pfield_doline_l pfield_doline_aligned_l - -#endif /* UNALIGNED_PROFITABLE */ - -static void pfield_adjust_delay (void) -{ - int ddf_left = dp_for_drawing->plfstrt; - int ddf_right = dp_for_drawing->plfstrt + dp_for_drawing->plflinelen; - int i; - - for (i = dip_for_drawing->last_delay_change-1; i >= dip_for_drawing->first_delay_change-1; i--) { - int delayreg = i < dip_for_drawing->first_delay_change ? dp_for_drawing->bplcon1 : delay_changes[i].value; - int delay1 = delayreg & 0xF; - int delay2 = (delayreg >> 4) & 0xF; - int startpos = i == dip_for_drawing->last_delay_change - 1 ? ddf_right + 8 : delay_changes[i+1].linepos; - int stoppos = i < dip_for_drawing->first_delay_change ? ddf_left : delay_changes[i].linepos; - int j; - startpos = PIXEL_XPOS (startpos + (bplhires ? 4 : 8)); - stoppos = PIXEL_XPOS (stoppos + (bplhires ? 4 : 8)); - if (gfx_requested_lores == 0) - delay1 <<= 1, delay2 <<= 1; - else if (gfx_requested_lores == 2) - startpos >>= 1, stoppos >>= 1; - for (j = startpos-1; j >= stoppos; j--) { - pixdata.apixels [j] = (pixdata.apixels[j-delay1] & 0x55) | (pixdata.apixels[j-delay2] & 0xAA); - } - } } static void init_hardware_frame (void) { - int i; - - for (i = 0; i < 8; i++) - spron[i] = SPR_vtop; -#if 0 - memset(sprpos, 0, sizeof sprpos); - memset(sprctl, 0, sizeof sprctl); -#endif - next_lineno = 0; - nln_how = 0; + nextline_how = nln_normal; diwstate = DIW_waiting_start; + hdiwstate = DIW_waiting_start; } -static void setdontcare(void) +void init_hardware_for_drawing_frame (void) { - fprintf(stderr, "Don't care mouse mode set\n"); - mousestate = dont_care_mouse; - lastspr0x = lastmx; lastspr0y = lastmy; - mstepx = defstepx; mstepy = defstepy; -} - -static void setfollow(void) -{ - fprintf(stderr, "Follow sprite mode set\n"); - mousestate = follow_mouse; - lastdiffx = lastdiffy = 0; - sprvbfl = 0; - spr0ctl=spr0pos = 0; - mstepx = defstepx; mstepy = defstepy; -} - -void togglemouse(void) -{ - switch(mousestate) { - case dont_care_mouse: setfollow(); break; - case follow_mouse: setdontcare(); break; - default: break; /* Nnnnnghh! */ - } -} - -static __inline__ int adjust(int val) -{ - if (val>127) - return 127; - else if (val<-127) - return -127; - return val; -} - -static void do_mouse_hack(void) -{ - int spr0x = ((spr0pos & 0xff) << 2) | ((spr0ctl & 1) << 1); - int spr0y = ((spr0pos >> 8) | ((spr0ctl & 4) << 6)) << 1; - int diffx, diffy; - - switch (mousestate) { - case normal_mouse: - diffx = lastmx - lastsampledmx; - diffy = lastmy - lastsampledmy; - if (!newmousecounters) { - if (diffx > 127) diffx = 127; - if (diffx < -127) diffx = -127; - joy0x += diffx; - if (diffy > 127) diffy = 127; - if (diffy < -127) diffy = -127; - joy0y += diffy; - } - lastsampledmx += diffx; lastsampledmy += diffy; - break; - - case dont_care_mouse: - diffx = adjust (((lastmx-lastspr0x) * mstepx) >> 16); - diffy = adjust (((lastmy-lastspr0y) * mstepy) >> 16); - lastspr0x=lastmx; lastspr0y=lastmy; - joy0x+=diffx; joy0y+=diffy; - break; - - case follow_mouse: - if (sprvbfl && sprvbfl-- >1) { - int mousexpos, mouseypos; - - if ((lastdiffx > docal || lastdiffx < -docal) && lastspr0x != spr0x - && spr0x > plfstrt*4 + 34 + xcaloff && spr0x < plfstop*4 - xcaloff) - { - int val = (lastdiffx << 16) / (spr0x - lastspr0x); - if (val>=0x8000) mstepx=(mstepx*(calweight-1)+val)/calweight; - } - if ((lastdiffy > docal || lastdiffy < -docal) && lastspr0y != spr0y - && spr0y>plffirstline+ycaloff && spr0y=0x8000) mstepy=(mstepy*(calweight-1)+val)/calweight; - } - mousexpos = lastmx + linetoscr_x_adjust; - if (lastmy >= gfxvidinfo.maxline) - lastmy = gfxvidinfo.maxline-1; - mouseypos = native2amiga_line_map[lastmy] + thisframe_y_adjust - minfirstline; - mouseypos <<= 1; - mousexpos <<= (1-lores_shift); - mousexpos += 2*DISPLAY_LEFT_SHIFT; - diffx = adjust ((((mousexpos + xoffs - spr0x) & ~1) * mstepx) >> 16); - diffy = adjust ((((mouseypos + yoffs - spr0y) & ~1) * mstepy) >> 16); - lastspr0x=spr0x; lastspr0y=spr0y; - lastdiffx=diffx; lastdiffy=diffy; - joy0x+=diffx; joy0y+=diffy; - } - break; - } -} - -/* @@@ Are those still useful? */ - -/* - * A raster line has been built in the graphics buffer. Tell the graphics code - * to do anything necessary to display it. - */ -static __inline__ void do_flush_line_1 (int lineno) -{ - if (lineno < first_drawn_line) - first_drawn_line = lineno; - if (lineno > last_drawn_line) - last_drawn_line = lineno; - - if (gfxvidinfo.maxblocklines == 0) - flush_line(lineno); - else { - if ((last_block_line+1) != lineno) { - if (first_block_line != -2) - flush_block (first_block_line, last_block_line); - first_block_line = lineno; - } - last_block_line = lineno; - if (last_block_line - first_block_line >= gfxvidinfo.maxblocklines) { - flush_block (first_block_line, last_block_line); - first_block_line = last_block_line = -2; - } - } -} - -static void do_flush_line (int lineno) -{ - /* We don't want to call X libraries from the second thread right now. */ -#ifndef SUPPORT_PENGUINS - do_flush_line_1 (lineno); -#else - line_drawn[lineno] = 1; -#endif -} - -/* - * One Amiga frame has been finished. Tell the graphics code about it. - * Note that the actual flush_screen() call is a no-op for all reasonable - * systems. - */ - -static void do_flush_screen (int start, int stop) -{ - int i; -#ifdef SUPPORT_PENGUINS - for (i = 0; i < gfxvidinfo.maxline; i++) { - if (line_drawn[i]) - do_flush_line_1 (i); - } -#endif - if (gfxvidinfo.maxblocklines != 0 && first_block_line != -2) { - flush_block (first_block_line, last_block_line); - } - if (start <= stop) - flush_screen (start, stop); -} - -static void adjust_drawing_colors (int ctable, int bplham) -{ - if (drawing_color_matches != ctable) { - if (bplham) { - memcpy (&colors_for_drawing, curr_color_tables + ctable, - sizeof colors_for_drawing); - color_match_type = color_match_full; - } else { - memcpy (colors_for_drawing.acolors, curr_color_tables[ctable].acolors, - sizeof colors_for_drawing.acolors); - color_match_type = color_match_acolors; - } - drawing_color_matches = ctable; - } else if (bplham && color_match_type != color_match_full) { - memcpy (colors_for_drawing.color_regs, curr_color_tables[ctable].color_regs, - sizeof colors_for_drawing.color_regs); - color_match_type = color_match_full; - } -} - -static __inline__ void adjust_color0_for_color_change (void) -{ - drawing_color_matches = -1; - if (dp_for_drawing->color0 != 0xFFFFFFFFul) { - colors_for_drawing.color_regs[0] = dp_for_drawing->color0; - colors_for_drawing.acolors[0] = xcolors[dp_for_drawing->color0]; - } -} - -static __inline__ void do_color_changes (line_draw_func worker) -{ - int lastpos = 0, nextpos, i; - struct color_change *cc = curr_color_changes + dip_for_drawing->first_color_change; - - for (i = dip_for_drawing->first_color_change; i <= dip_for_drawing->last_color_change; i++, cc++) { - if (i == dip_for_drawing->last_color_change) - nextpos = max_diwlastword; - else - nextpos = PIXEL_XPOS (cc->linepos) + (COPPER_MAGIC_FUDGE << lores_shift); - worker (lastpos, nextpos); - if (i != dip_for_drawing->last_color_change) { - colors_for_drawing.color_regs[cc->regno] = cc->value; - colors_for_drawing.acolors[cc->regno] = xcolors[cc->value]; - } - if (nextpos > lastpos) { - lastpos = nextpos; - if (lastpos >= linetoscr_right_x) - break; - } - } -} - -static void pfield_expand_dp_bplcon (void) -{ - bplhires = (dp_for_drawing->bplcon0 & 0x8000) == 0x8000; - bplplanecnt = (dp_for_drawing->bplcon0 & 0x7000) >> 12; - bplham = (dp_for_drawing->bplcon0 & 0x800) == 0x800; -#if AGA_CHIPSET == 1 /* The KILLEHB bit exists in ECS, but is apparently meant for Genlock - * stuff, and it's set by some demos (e.g. Andromeda Seven Seas) */ - bplehb = ((dp_for_drawing->bplcon0 & 0xFCC0) == 0x6000 && !(dp_for_drawing->bplcon2 & 0x200)); -#else - bplehb = (dp_for_drawing->bplcon0 & 0xFC00) == 0x6000; -#endif - bpldelay1 = dp_for_drawing->bplcon1 & 0xF; - bpldelay2 = (dp_for_drawing->bplcon1 >> 4) & 0xF; - plfpri[1] = 1 << 2*(dp_for_drawing->bplcon2 & 7); - plfpri[2] = 1 << 2*((dp_for_drawing->bplcon2 >> 3) & 7); - bpldualpf = (dp_for_drawing->bplcon0 & 0x400) == 0x400; - bpldualpfpri = (dp_for_drawing->bplcon2 & 0x40) == 0x40; -} - -static __inline__ void pfield_draw_line(int lineno, int gfx_ypos, int follow_ypos) -{ - int border = 0; - int to_screen = 0; - int do_double = 0; - - dp_for_drawing = 0; - dip_for_drawing = 0; - switch (linestate[lineno]) { - case LINE_AS_PREVIOUS: - case LINE_REMEMBERED_AS_PREVIOUS: - { - static int warned = 0; - if (!warned) - fprintf(stderr, "Shouldn't get here... this is a bug.\n"), warned++; - } - line_decisions[lineno].which = -2; - return; - - case LINE_BORDER_PREV: - border = 1; - dp_for_drawing = line_decisions + lineno - 1; - dip_for_drawing = curr_drawinfo + lineno - 1; - break; - - case LINE_BORDER_NEXT: - border = 1; - dp_for_drawing = line_decisions + lineno + 1; - dip_for_drawing = curr_drawinfo + lineno + 1; - break; - - case LINE_DONE_AS_PREVIOUS: - line_decisions[lineno].which = -2; - /* fall through */ - case LINE_DONE: - return; - - case LINE_DECIDED_DOUBLE: - line_decisions[lineno+1].which = -2; - if (follow_ypos != -1) { - do_double = 1; - linetoscr_double_offset = gfxvidinfo.rowbytes * (follow_ypos - gfx_ypos); - } - - /* fall through */ - default: - dip_for_drawing = curr_drawinfo + lineno; - dp_for_drawing = line_decisions + lineno; - if (dp_for_drawing->which != 1) - border = 1; - break; - } - - if (!line_changed[lineno] && !frame_redraw_necessary) { - /* The case where we can skip redrawing this line. If this line - * is supposed to be doubled, and the next line is remembered as - * having been doubled, then the next line is done as well. */ - if (do_double) { - if (linestate[lineno+1] != LINE_REMEMBERED_AS_PREVIOUS) { - memcpy (gfxvidinfo.bufmem + gfxvidinfo.rowbytes * follow_ypos, - gfxvidinfo.bufmem + gfxvidinfo.rowbytes * gfx_ypos, - gfxvidinfo.rowbytes); - line_decisions[lineno + 1].which = -2; - do_flush_line (follow_ypos); - } - linestate[lineno + 1] = LINE_DONE_AS_PREVIOUS; - } - linestate[lineno] = LINE_DONE; - return; - } - - if (!border) { - xlinebuffer = gfxvidinfo.bufmem + gfxvidinfo.rowbytes * gfx_ypos - gfxvidinfo.pixbytes * linetoscr_x_adjust; - aga_lbufptr = aga_linebuf; - - pfield_expand_dp_bplcon (); - -#ifdef LORES_HACK - if (!bplhires && !gfx_requested_lores && dip_for_drawing->nr_color_changes == 0 - && !bplham && !bplehb && !bpldualpf) - gfx_requested_lores = 2; -#endif - pfield_init_linetoscr (); - if (dip_for_drawing->first_delay_change != dip_for_drawing->last_delay_change) { - bpldelay1 = bpldelay2 = 0; - if (gfx_requested_lores) - pfield_doline_l (lineno); - else - pfield_doline_h (lineno); - pfield_adjust_delay (); - } else { - if (gfx_requested_lores) - pfield_doline_l (lineno); - else - pfield_doline_h (lineno); - } - - /* Check color0 adjust only if we have color changes - shouldn't happen - * otherwise. */ - adjust_drawing_colors (dp_for_drawing->ctable, bplham || bplehb); - - /* The problem is that we must call decode_ham6() BEFORE we do the - * sprites. */ - if (bplham) { - if (dip_for_drawing->nr_color_changes == 0) { - /* The easy case: need to do HAM decoding only once for the - * full line. */ - decode_ham6 (linetoscr_x_adjust, linetoscr_right_x); - } else /* Argh. */ { - adjust_color0_for_color_change (); - do_color_changes (decode_ham6); - adjust_drawing_colors (dp_for_drawing->ctable, bplham || bplehb); - } - } - - if (dip_for_drawing->nr_sprites != 0) { - int spr; - for(spr = 7; spr >= 0; spr--) { - struct sprite_draw *spd = curr_sprite_positions + dip_for_drawing->first_sprite_draw; - int i; - - for (i = dip_for_drawing->first_sprite_draw; i < dip_for_drawing->last_sprite_draw; i++, spd++) { - if (spd->num != spr) - continue; - pfield_sprite (spr, spd->linepos, spd->data, spd->datb, spd->ctl); - } - } - } - if (dip_for_drawing->nr_color_changes == 0) { - pfield_do_linetoscr_full (do_double); - do_flush_line (gfx_ypos); - linestate[lineno] = LINE_DONE; - - if (do_double) { - linestate[lineno + 1] = LINE_DONE_AS_PREVIOUS; - do_flush_line (follow_ypos); - } - } else { - int lastpos = 0, nextpos, i; - - adjust_color0_for_color_change (); - do_color_changes (pfield_do_linetoscr); - - linestate[lineno] = LINE_DONE; - do_flush_line (gfx_ypos); - if (do_double) { - memcpy (gfxvidinfo.bufmem + gfxvidinfo.rowbytes * follow_ypos, - gfxvidinfo.bufmem + gfxvidinfo.rowbytes * gfx_ypos, - gfxvidinfo.rowbytes); - linestate[lineno + 1] = LINE_DONE_AS_PREVIOUS; - line_decisions[lineno + 1].which = -2; - do_flush_line (follow_ypos); - } - } - /* Clean up the spixstate array. */ - { - struct sprite_draw *spd = curr_sprite_positions + dip_for_drawing->first_sprite_draw; - int i; - -#ifdef LORES_HACK - if (gfx_requested_lores == 2) { - for (i = dip_for_drawing->first_sprite_draw; i < dip_for_drawing->last_sprite_draw; i++, spd++) - fuzzy_memset_le32 (spixstate, 0, (spd->linepos >> 1), 16*sizeof *spixstate); - } else -#endif - if (gfx_requested_lores) { - for (i = dip_for_drawing->first_sprite_draw; i < dip_for_drawing->last_sprite_draw; i++, spd++) - fuzzy_memset_le32 (spixstate, 0, spd->linepos, 16*sizeof *spixstate); - } else { - for (i = dip_for_drawing->first_sprite_draw; i < dip_for_drawing->last_sprite_draw; i++, spd++) - fuzzy_memset_le32 (spixstate, 0, spd->linepos, 32*sizeof *spixstate); - } - } -#ifdef LORES_HACK - if (gfx_requested_lores == 2) - gfx_requested_lores = 0; -#endif - } else { - /* Border. */ - int i, lastpos = 0, nextpos; - struct color_change *cc; - - xlinebuffer = gfxvidinfo.bufmem + gfxvidinfo.rowbytes * gfx_ypos - gfxvidinfo.pixbytes * linetoscr_x_adjust; - - adjust_drawing_colors (dp_for_drawing->ctable, 0); - /* Check color0 adjust only if we have color changes - shouldn't happen - * otherwise. */ - - if (dip_for_drawing->nr_color_changes == 0) { - fill_line (); - do_flush_line (gfx_ypos); - linestate[lineno] = LINE_DONE; - if (do_double) { - xlinebuffer = gfxvidinfo.bufmem + gfxvidinfo.rowbytes * follow_ypos - gfxvidinfo.pixbytes * linetoscr_x_adjust; - fill_line (); - do_flush_line (follow_ypos); - linestate[lineno+1] = LINE_DONE_AS_PREVIOUS; - } - return; - } - - adjust_color0_for_color_change (); - do_color_changes (pfield_do_fill_line); - - do_flush_line (gfx_ypos); - linestate[lineno] = LINE_DONE; - if (do_double) { - memcpy (gfxvidinfo.bufmem + gfxvidinfo.rowbytes * follow_ypos, - gfxvidinfo.bufmem + gfxvidinfo.rowbytes * gfx_ypos, - gfxvidinfo.rowbytes); - linestate[lineno + 1] = LINE_DONE_AS_PREVIOUS; - line_decisions[lineno + 1].which = -2; - do_flush_line (follow_ypos); - } - } -} - -#ifdef SUPPORT_PENGUINS -static smp_comm_pipe drawing_pipe, drawing_lock_pipe; -#include -static void drawing_penguin (void) -{ - int l; - /* fprintf(stderr, "Hello, world!\n"); */ - signal (SIGINT, SIG_IGN); - - for (;;) { - /* Start of a frame. */ - int k = read_comm_pipe_int_blocking (&drawing_pipe); - if (k != -2) { - fprintf (stderr, "Penguin got out of sync.\n"); - return; /* what can we do? */ - } - - for (;;) { - int i, where; - int l = read_comm_pipe_int_blocking (&drawing_pipe); - if (l == -1) { - /* End-of-frame synchronization. */ - write_comm_pipe_int (&drawing_lock_pipe, -1); - break; - } - /* l is the line that has been finished for drawing. */ - i = l - thisframe_y_adjust_real; - if (i < 0 || i >= max_ypos_thisframe) - continue; - - if (linestate[l] == LINE_UNDECIDED) { - fprintf (stderr, "Line scheduled for drawing, but undecided %d!?\n", l); - continue; - } - where = amiga2aspect_line_map[i+min_ypos_for_screen]; - if (where >= gfxvidinfo.maxline || where == -1) - continue; - - pfield_draw_line (l, where, amiga2aspect_line_map[i+min_ypos_for_screen+1]); - } - } -} - -static penguin_id our_penguin; - -static void kill_drawing_penguin (void) -{ - kill (our_penguin, SIGQUIT); -} - -#endif - -static int penguins_enabled_thisframe; - -static void init_drawing_frame (void) -{ - int i, maxline; - -#ifdef OS_WITHOUT_MEMORY_MANAGEMENT - if(_max_sprite_draw > max_sprite_draw) { - void *p1,*p2; - int mcc = _max_sprite_draw + 128; - _max_sprite_draw = 0; - p1 = realloc(sprite_positions[0], mcc*sizeof(struct sprite_draw)); - p2 = realloc(sprite_positions[1], mcc*sizeof(struct sprite_draw)); - if(p1) sprite_positions[0] = p1; - if(p2) sprite_positions[1] = p2; - if(p1 && p2) { - max_sprite_draw = mcc; - printf("sam: sprite: %s\n", mcc); - } - } - if(_max_color_change > max_color_change) { - void *p1,*p2; - int mcc = _max_color_change + 128; - _max_color_change = 0; - p1 = realloc(color_changes[0], mcc*sizeof(struct color_change)); - p2 = realloc(color_changes[1], mcc*sizeof(struct color_change)); - if(p1) color_changes[0] = p1; - if(p2) color_changes[1] = p2; - if(p1 && p2) { - max_color_change = mcc; - printf("sam: color: %s\n", mcc); - } - } -#endif - - if (max_diwstop == 0) - max_diwstop = diwlastword; - if (min_diwstart > max_diwstop) - min_diwstart = 0; - - if (thisframe_first_drawn_line == -1) - thisframe_first_drawn_line = minfirstline; - if (thisframe_first_drawn_line > thisframe_last_drawn_line) - thisframe_last_drawn_line = thisframe_first_drawn_line; + adjust_array_sizes (); next_color_change = 0; next_delay_change = 0; next_sprite_draw = 0; - maxline = gfx_requested_linedbl ? (maxvpos+1) * 2 + 1 : (maxvpos+1) + 1; -#ifdef SMART_UPDATE - for (i = 0; i < maxline; i++) - linestate[i] = linestate[i] == LINE_DONE_AS_PREVIOUS ? LINE_REMEMBERED_AS_PREVIOUS : LINE_UNDECIDED; -#else - memset (linestate, LINE_UNDECIDED, maxline); -#endif - last_drawn_line = 0; - first_drawn_line = 32767; - first_block_line = last_block_line = -2; - if (test_drawing_speed) - frame_redraw_necessary = 1; - else if (frame_redraw_necessary) - frame_redraw_necessary--; - next_color_entry = 0; remembered_color_entry = -1; prev_sprite_positions = sprite_positions[current_change_set]; @@ -4246,201 +2712,131 @@ static void init_drawing_frame (void) curr_color_changes = color_changes[current_change_set ^ 1]; prev_color_tables = color_tables[current_change_set]; curr_color_tables = color_tables[current_change_set ^ 1]; - - prev_drawinfo = line_drawinfo[current_change_set]; - curr_drawinfo = line_drawinfo[current_change_set ^= 1]; - drawing_color_matches = -1; - color_src_match = color_dest_match = -1; - - prev_x_adjust = linetoscr_x_adjust; - prev_y_adjust = thisframe_y_adjust; - if (gfx_requested_xcenter) { - if (max_diwstop - min_diwstart < gfxvidinfo.maxlinetoscr && gfx_requested_xcenter == 2) - /* Try to center. */ - linetoscr_x_adjust = ((max_diwstop - min_diwstart - gfxvidinfo.maxlinetoscr) / 2 + min_diwstart) & ~1; - else - linetoscr_x_adjust = max_diwstop - gfxvidinfo.maxlinetoscr; + prev_drawinfo = line_drawinfo[current_change_set]; + curr_drawinfo = line_drawinfo[current_change_set ^ 1]; + current_change_set ^= 1; - /* Should we try to be clever? */ - if (gfx_requested_xcenter == 2) { - /* Don't change x_adjust if wthe new display will fit in the old range. */ - if (linetoscr_x_adjust < prev_x_adjust && prev_x_adjust < min_diwstart) - linetoscr_x_adjust = prev_x_adjust; - } - } else - linetoscr_x_adjust = max_diwlastword - gfxvidinfo.maxlinetoscr; - if (linetoscr_x_adjust < 0) - linetoscr_x_adjust = 0; - - linetoscr_right_x = linetoscr_x_adjust + gfxvidinfo.maxlinetoscr; - if (linetoscr_right_x > max_diwlastword) - linetoscr_right_x = max_diwlastword; - - thisframe_y_adjust = minfirstline; - if (gfx_requested_ycenter && thisframe_first_drawn_line != -1) { - if (thisframe_last_drawn_line - thisframe_first_drawn_line < max_drawn_amiga_line && gfx_requested_ycenter == 2) - thisframe_y_adjust = (thisframe_last_drawn_line - thisframe_first_drawn_line - max_drawn_amiga_line) / 2 + thisframe_first_drawn_line; - else - thisframe_y_adjust = thisframe_first_drawn_line; - if (gfx_requested_ycenter == 2) { - if (thisframe_y_adjust != prev_y_adjust - && prev_y_adjust <= thisframe_first_drawn_line - && prev_y_adjust + max_drawn_amiga_line > thisframe_last_drawn_line) - thisframe_y_adjust = prev_y_adjust; - } - if (thisframe_y_adjust + max_drawn_amiga_line > maxvpos) - thisframe_y_adjust = maxvpos - max_drawn_amiga_line; - if (thisframe_y_adjust < minfirstline) - thisframe_y_adjust = minfirstline; - } - thisframe_y_adjust_real = thisframe_y_adjust << (gfx_requested_linedbl ? 1 : 0); - max_ypos_thisframe = (maxvpos - thisframe_y_adjust) << (gfx_requested_linedbl ? 1 : 0); - - if (prev_x_adjust != linetoscr_x_adjust || prev_y_adjust != thisframe_y_adjust) - frame_redraw_necessary |= (bplcon0 & 4) && gfx_requested_linedbl ? 2 : 1; - - max_diwstop = 0; - min_diwstart = 10000; - thisframe_first_drawn_line = -1; - thisframe_last_drawn_line = -1; -#ifdef SUPPORT_PENGUINS - penguins_enabled_thisframe = 1; - /* Tell the other thread that it can now expect data from us. */ - write_comm_pipe_int (&drawing_pipe, -2); - memset (line_drawn, 0, sizeof line_drawn); -#endif + color_src_match = color_dest_match = -1; } -static void finish_drawing_frame (void) +static void vsync_handler (void) { - int i; + if (currprefs.m68k_speed == -1) { + frame_time_t curr_time = read_processor_time (); + vsyncmintime += vsynctime; + /* @@@ Mathias? How do you think we should do this? */ + /* If we are too far behind, or we just did a reset, adjust the + * needed time. */ + if ((long int)(curr_time - vsyncmintime) > 0 || rpt_did_reset) + vsyncmintime = curr_time + vsynctime; + rpt_did_reset = 0; + } -#ifdef SUPPORT_PENGUINS - /* Synchronize with other thread, then see whether there's something left for - * us to draw. @@@ This is probably a big waste of cycles if the two threads - * run at very different speeds. */ - write_comm_pipe_int (&drawing_pipe, -1); - read_comm_pipe_int_blocking (&drawing_lock_pipe); -#endif + handle_events (); -#ifndef SMART_UPDATE - /* @@@ This isn't exactly right yet. FIXME */ - if (!interlace_seen) { - do_flush_screen (first_drawn_line, last_drawn_line); - return; - } -#endif - for (i = 0; i < max_ypos_thisframe; i++) { - int where; - int line = i + thisframe_y_adjust_real; + getjoystate (0, &joy0dir, &joy0button); + getjoystate (1, &joy1dir, &joy1button); - if (linestate[line] == LINE_UNDECIDED) - break; + INTREQ (0x8020); + if (bplcon0 & 4) + lof ^= 0x8000; - where = amiga2aspect_line_map[i+min_ypos_for_screen]; - if (where >= gfxvidinfo.maxline) - break; - if (where == -1) - continue; + vsync_handle_redraw (lof, lof_changed); + if (quit_program > 0) + return; - pfield_draw_line (line, where, amiga2aspect_line_map[i+min_ypos_for_screen+1]); + { + static int cnt = 0; + if (cnt == 0) { + /* resolution_check_change (); */ + DISK_check_change (); + cnt = 5; + } + cnt--; } - do_flush_screen (first_drawn_line, last_drawn_line); -} - -static void vsync_handler (void) -{ - UWORD dir; - int button; - handle_events(); - getjoystate(&joy0dir, &joy0button); + /* For now, let's only allow this to change at vsync time. It gets too + * hairy otherwise. */ + if (beamcon0 != new_beamcon0) + init_hz (); - do_mouse_hack(); - - INTREQ(0x8020); - if (bplcon0 & 4) - lof ^= 0x8000; - - last_redraw_point++; - if (lof_changed || !interlace_seen || last_redraw_point >= 2 || lof) { - if (framecnt == 0) - finish_drawing_frame (); - count_frame (); - last_redraw_point = 0; - if (framecnt == 0) - init_drawing_frame (); - } - lof_changed = 0; - interlace_seen = 0; - COPJMP1(0); - - init_hardware_frame(); + + cop_state.ip = cop1lc; + cop_state.state = COP_read1; + cop_state.vpos = 0; + cop_state.hpos = 0; + cop_state.count = 0; + cop_state.do_move = 0; + cop_state.ignore_next = 0; + cop_state.vdiw = DIW_waiting_start; + + init_hardware_frame (); + #ifdef HAVE_GETTIMEOFDAY { struct timeval tv; unsigned long int newtime; - - gettimeofday(&tv,NULL); + + gettimeofday(&tv,NULL); newtime = (tv.tv_sec-seconds_base) * 1000 + tv.tv_usec / 1000; - - if (!bogusframe) { - frametime += newtime - msecs; + + if (!bogusframe) { + lastframetime = newtime - msecs; + +#if 0 /* This doesn't appear to work too well yet... later. */ + if (n_consecutive_skipped > currprefs.sound_pri_cutoff + || lastframetime < currprefs.sound_pri_time) + { + n_consecutive_skipped = 0; + clear_inhibit_frame (IHF_SOUNDADJUST); + } else { + n_consecutive_skipped++; + set_inhibit_frame (IHF_SOUNDADJUST); + total_skipped++; + } +#endif + + frametime += lastframetime; timeframes++; + + if ((timeframes & 127) == 0) + gui_fps (1000 * timeframes / frametime); } msecs = newtime; bogusframe = 0; } #endif + if (ievent_alive > 0) + ievent_alive--; + if (timehack_alive > 0) + timehack_alive--; CIA_vsync_handler(); } -static void hsync_handler(void) +static void hsync_handler (void) { - int lineno = next_lineno; - int lineisdouble = 0; - int line_was_doubled = 0; - + update_copper (maxhpos); + finish_decisions (); - do_modulos (); + do_modulos (current_hpos ()); - if (framecnt == 0) { - switch (nln_how) { - case 0: - linestate[lineno] = LINE_DECIDED; - break; - case 1: - linestate[lineno] = LINE_DECIDED_DOUBLE; - if (linestate[lineno+1] != LINE_REMEMBERED_AS_PREVIOUS) - linestate[lineno+1] = LINE_AS_PREVIOUS; - break; - case 2: - if (linestate[lineno-1] == LINE_UNDECIDED) - linestate[lineno-1] = LINE_BORDER_NEXT; - linestate[lineno] = LINE_DECIDED; - break; - case 3: - linestate[lineno] = LINE_DECIDED; - if (linestate[lineno+1] == LINE_UNDECIDED - || linestate[lineno+1] == LINE_REMEMBERED_AS_PREVIOUS - || linestate[lineno+1] == LINE_AS_PREVIOUS) - linestate[lineno+1] = LINE_BORDER_PREV; - break; - } - } + hsync_record_line_state (next_lineno, nextline_how, thisline_changed); eventtab[ev_hsync].evtime += cycles - eventtab[ev_hsync].oldcycles; eventtab[ev_hsync].oldcycles = cycles; CIA_hsync_handler(); - - if (produce_sound > 0) { + + if (currprefs.produce_sound > 0) { int nr; + + update_audio (); + /* Sound data is fetched at the beginning of each line */ for (nr = 0; nr < 4; nr++) { struct audio_channel_data *cdp = audio_channel + nr; - + if (cdp->data_written == 2) { cdp->data_written = 0; cdp->nextdat = chipmem_bank.wget(cdp->pt); @@ -4456,227 +2852,160 @@ static void hsync_handler(void) } } } -#ifdef SUPPORT_PENGUINS - if (framecnt == 0 && penguins_enabled_thisframe) { - /* This is awfully bad. Just think about how many syscalls this does - * in one second and you'll be ill. But before I change it I want to - * hear from someone who has an SMP machine just exactly how bad this - * is. */ - write_comm_pipe_int (&drawing_pipe, next_lineno); - } -#endif -#ifndef SMART_UPDATE - { - int i, where; - /* l is the line that has been finished for drawing. */ - i = next_lineno - thisframe_y_adjust_real; - if (i >= 0 && i < max_ypos_thisframe) { - where = amiga2aspect_line_map[i+min_ypos_for_screen]; - if (where < gfxvidinfo.maxline && where != -1) - pfield_draw_line (next_lineno, where, amiga2aspect_line_map[i+min_ypos_for_screen+1]); - } - } -#endif + + hardware_line_completed (next_lineno); + if (++vpos == (maxvpos + (lof != 0))) { vpos = 0; vsync_handler(); } - if ((bplcon0 & 4) && gfx_requested_linedbl) { - interlace_seen = 1, penguins_enabled_thisframe = 0; - } + is_lastline = vpos + 1 == maxvpos + (lof != 0) && currprefs.m68k_speed == -1 && ! rpt_did_reset; + + if ((bplcon0 & 4) && currprefs.gfx_linedbl) + notice_interlace_seen (); if (framecnt == 0) { - lineno = vpos; - nln_how = 0; - if (gfx_requested_linedbl) { + int lineno = vpos; + nextline_how = nln_normal; + if (currprefs.gfx_linedbl) { lineno *= 2; - nln_how = 1; + nextline_how = currprefs.gfx_linedbl == 1 ? nln_doubled : nln_nblack; if (bplcon0 & 4) { if (!lof) { lineno++; - nln_how = 2; + nextline_how = nln_lower; } else { - nln_how = 3; + nextline_how = nln_upper; } } } next_lineno = lineno; reset_decisions (); } + if (uae_int_requested) { + set_uae_int_flag (); + INTREQ (0xA000); + } + update_copper (0); + prepare_copper (); + if (eventtab[ev_copper].evtime == cycles && eventtab[ev_copper].active) + abort (); } -void customreset(void) +static void init_eventtab (void) { - int i, maxl; - double native_lines_per_amiga_line; + int i; + + for(i = 0; i < ev_max; i++) { + eventtab[i].active = 0; + eventtab[i].oldcycles = 0; + } + + eventtab[ev_cia].handler = CIA_handler; + eventtab[ev_copper].handler = do_copper; + eventtab[ev_hsync].handler = hsync_handler; + eventtab[ev_hsync].evtime = maxhpos + cycles; + eventtab[ev_hsync].active = 1; + + 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; + + events_schedule (); +} + +void customreset (void) +{ + int i; #ifdef HAVE_GETTIMEOFDAY struct timeval tv; #endif - inhibit_frame = 0; - expamem_reset(); - CIA_reset(); - cycles = 0; + for (i = 0; i < sizeof current_colors.color_regs / sizeof *current_colors.color_regs; i++) + current_colors.color_regs[i] = -1; + + expamem_reset (); + + CIA_reset (); + cycles = 0; regs.spcflags &= SPCFLAG_BRK; - - lores_factor = gfx_requested_lores ? 1 : 2; - lores_shift = gfx_requested_lores ? 0 : 1; - sprite_width = gfx_requested_lores ? 16 : 32; - + vpos = 0; lof = 0; - max_diwstop = 0; - - if (needmousehack()) { - if (mousestate != follow_mouse) setfollow(); + + if (needmousehack ()) { +#if 0 + mousehack_setfollow(); +#else + mousehack_setdontcare(); +#endif } else { mousestate = normal_mouse; } + ievent_alive = 0; + timehack_alive = 0; - memset(spixstate, 0, sizeof(spixstate)); - - /*memset(blitcount, 0, sizeof(blitcount)); blitter debug */ - for (i = 0; i < (maxvpos+1)*2 + 1; i++) { - linestate[i] = LINE_UNDECIDED; - } - xlinebuffer = gfxvidinfo.bufmem; + clx_sprmask = 0xFF; + clxdat = 0; + + memset (sprarmed, 0, sizeof sprarmed); + nr_armed = 0; dmacon = intena = 0; bltstate = BLT_done; - copstate = COP_stop; + cop_state.state = COP_stop; diwstate = DIW_waiting_start; + hdiwstate = DIW_waiting_start; copcon = 0; dskdmaen = 0; cycles = 0; - - memset(audio_channel, 0, sizeof audio_channel); bplcon4 = 0x11; /* Get AGA chipset into ECS compatibility mode */ bplcon3 = 0xC00; - for(i = 0; i < ev_max; i++) { - eventtab[i].active = 0; - eventtab[i].oldcycles = 0; - } - copper_active = 0; - eventtab[ev_cia].handler = CIA_handler; - eventtab[ev_copper].handler = do_copper; - eventtab[ev_hsync].handler = hsync_handler; - eventtab[ev_hsync].evtime = maxhpos + cycles; - eventtab[ev_hsync].active = 1; - 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; -#ifndef DONT_WANT_SOUND - eventtab[ev_aud0].handler = aud0_handler; - eventtab[ev_aud0].active = 0; - eventtab[ev_aud1].handler = aud1_handler; - eventtab[ev_aud1].active = 0; - eventtab[ev_aud2].handler = aud2_handler; - eventtab[ev_aud2].active = 0; - eventtab[ev_aud3].handler = aud3_handler; - eventtab[ev_aud3].active = 0; - if (sound_available) { - eventtab[ev_sample].active = 1; - eventtab[ev_sample].evtime += cycles; - eventtab[ev_sample].oldcycles = cycles; - } else { - eventtab[ev_sample].active = 0; - } -#endif - events_schedule (); + new_beamcon0 = ntscmode ? 0x00 : 0x20; + init_hz (); - if (native2amiga_line_map) - free (native2amiga_line_map); - if (amiga2aspect_line_map) - free (amiga2aspect_line_map); - - /* At least for this array the +1 is necessary. */ - amiga2aspect_line_map = (int *)malloc (sizeof (int) * (maxvpos+1)*2 + 1); - native2amiga_line_map = (int *)malloc (sizeof (int) * gfxvidinfo.maxline); - - if (gfx_requested_correct_aspect) - native_lines_per_amiga_line = ((double)gfxvidinfo.maxline - * (gfx_requested_lores ? 320 : 640) - / (gfx_requested_linedbl ? 512 : 256) - / gfxvidinfo.maxlinetoscr); - else - native_lines_per_amiga_line = 1; + audio_reset (); - maxl = (maxvpos+1) * (gfx_requested_linedbl ? 2 : 1); - min_ypos_for_screen = minfirstline << (gfx_requested_linedbl ? 1 : 0); - max_drawn_amiga_line = -1; - for (i = 0; i < maxl; i++) { - int v = (i - min_ypos_for_screen) * native_lines_per_amiga_line; - if (v >= gfxvidinfo.maxline && max_drawn_amiga_line == -1) - max_drawn_amiga_line = i-min_ypos_for_screen; - if (i < min_ypos_for_screen || v >= gfxvidinfo.maxline) - v = -1; - amiga2aspect_line_map[i] = v; - } - if (gfx_requested_linedbl) - max_drawn_amiga_line >>= 1; - - for (i = 0; i < gfxvidinfo.maxline; i++) - native2amiga_line_map[i] = -1; - - if (native_lines_per_amiga_line < 1) { - /* Must omit drawing some lines. */ - for (i = maxl-1; i > min_ypos_for_screen; i--) { - if (amiga2aspect_line_map[i] == amiga2aspect_line_map[i-1]) { - if (gfx_requested_linedbl && (i & 1) == 0 && amiga2aspect_line_map[i+1] != -1) { - /* If only the first line of a line pair would be omitted, - * omit the second one instead to avoid problems with line - * doubling. */ - amiga2aspect_line_map[i] = amiga2aspect_line_map[i+1]; - amiga2aspect_line_map[i+1] = -1; - } else - amiga2aspect_line_map[i] = -1; - } - } - } + init_eventtab (); + + init_sprites (); - for (i = maxl-1; i >= min_ypos_for_screen; i--) { - int j; - if (amiga2aspect_line_map[i] == -1) - continue; - for (j = amiga2aspect_line_map[i]; j < gfxvidinfo.maxline && native2amiga_line_map[j] == -1; j++) - native2amiga_line_map[j] = i >> (gfx_requested_linedbl ? 1 : 0); - } - - line_drawn = (char *)malloc (gfxvidinfo.maxline); - init_hardware_frame (); - init_drawing_frame (); - last_redraw_point = 0; + reset_drawing (); + reset_decisions (); - + #ifdef HAVE_GETTIMEOFDAY - gettimeofday(&tv,NULL); + gettimeofday (&tv, NULL); seconds_base = tv.tv_sec; bogusframe = 1; #endif } -void dumpcustom(void) +void dumpcustom (void) { - int i; - fprintf(stderr, "DMACON: %x INTENA: %x INTREQ: %x VPOS: %x HPOS: %x\n", DMACONR(), - intena, intreq, vpos, current_hpos()); - if (timeframes) { - fprintf(stderr, "Average frame time: %d ms [frames: %d time: %d]\n", - frametime/timeframes, timeframes, frametime); + write_log ("DMACON: %x INTENA: %x INTREQ: %x VPOS: %x HPOS: %x\n", DMACONR(), + (unsigned int)intena, (unsigned int)intreq, (unsigned int)vpos, (unsigned int)current_hpos()); + write_log ("COP1LC: %08lx, COP2LC: %08lx\n", (unsigned long)cop1lc, (unsigned long)cop2lc); + if (timeframes) { + write_log ("Average frame time: %d ms [frames: %d time: %d]\n", + frametime / timeframes, timeframes, frametime); + if (total_skipped) + write_log ("Skipped frames: %d\n", total_skipped); } - /*for (i=0; i<256; i++) if (blitcount[i]) fprintf(stderr, "minterm %x = %d\n",i,blitcount[i]); blitter debug */ + dump_audio_bench (); + /*for (i=0; i<256; i++) if (blitcount[i]) fprintf (stderr, "minterm %x = %d\n",i,blitcount[i]); blitter debug */ } -int intlev(void) +int intlev (void) { - UWORD imask = intreq & intena; + uae_u16 imask = intreq & intena; if (imask && (intena & 0x4000)){ if (imask & 0x2000) return 6; if (imask & 0x1800) return 5; @@ -4684,87 +3013,96 @@ int intlev(void) if (imask & 0x0070) return 3; if (imask & 0x0008) return 2; if (imask & 0x0007) return 1; - if (regs.spcflags & SPCFLAG_TIMER) - return 7; } return -1; } -void custom_init(void) +static void gen_custom_tables (void) { - int num; + int i; + for (i = 0; i < 256; i++) { + unsigned int j; + sprtaba[i] = ((((i >> 7) & 1) << 0) + | (((i >> 6) & 1) << 2) + | (((i >> 5) & 1) << 4) + | (((i >> 4) & 1) << 6) + | (((i >> 3) & 1) << 8) + | (((i >> 2) & 1) << 10) + | (((i >> 1) & 1) << 12) + | (((i >> 0) & 1) << 14)); + sprtabb[i] = sprtaba[i] * 2; + for (j = 0; j < 511; j = (j << 1) | 1) + if ((i & ~j) == 0) + waitmasktab[i] = ~j; + } +} + +void custom_init (void) +{ + uaecptr pos; #ifdef OS_WITHOUT_MEMORY_MANAGEMENT - for(num=0;num<2;++num) { - sprite_positions[num] = malloc(max_sprite_draw * sizeof(struct sprite_draw)); - color_changes[num] = malloc(max_color_change * sizeof(struct color_change)); - if(!sprite_positions[num] || !color_changes[num]) { - printf("Out of mem int %s %d!\n",__FILE__,__LINE__); - abort(); - } + int num; + + for (num = 0; num < 2; num++) { + sprite_positions[num] = xmalloc (max_sprite_draw * sizeof (struct sprite_draw)); + color_changes[num] = xmalloc (max_color_change * sizeof (struct color_change)); } + delay_changes = xmalloc (max_delay_change * sizeof (struct delay_change)); #endif - - if (needmousehack()) - setfollow(); - init_regchanges (); + + pos = here (); + + org (0xF0FF70); + calltrap (deftrap (mousehack_helper)); + dw (RTS); + + org (0xF0FFA0); + calltrap (deftrap (timehack_helper)); + dw (RTS); + + org (pos); + init_decisions (); - for (num = 0; num < 256; num++) { - int plane1 = (num & 1) | ((num >> 1) & 2) | ((num >> 2) & 4) | ((num >> 3) & 8); - int plane2 = ((num >> 1) & 1) | ((num >> 2) & 2) | ((num >> 3) & 4) | ((num >> 4) & 8); - dblpf_2nd1[num] = plane1 == 0 ? (plane2 == 0 ? 0 : 2) : 1; - dblpf_2nd2[num] = plane2 == 0 ? (plane1 == 0 ? 0 : 1) : 2; - dblpf_aga1[num] = plane1 == 0 ? plane2 : plane1; - dblpf_aga2[num] = plane2 == 0 ? plane1 : plane2; - if (plane2 > 0) plane2 += 8; - dblpf_ind1[num] = plane1 == 0 ? plane2 : plane1; - dblpf_ind2[num] = plane2 == 0 ? plane1 : plane2; - - lots_of_twos[num] = num == 0 ? 0 : 2; - linear_map_256[num] = num; - } - build_blitfilltable(); - gen_pfield_tables(); - native2amiga_line_map = 0; - amiga2aspect_line_map = 0; - line_drawn = 0; -#ifdef SUPPORT_PENGUINS - init_comm_pipe (&drawing_pipe); - init_comm_pipe (&drawing_lock_pipe); - our_penguin = start_penguin (drawing_penguin); - atexit(kill_drawing_penguin); -#endif + gen_custom_tables (); + build_blitfilltable (); + + drawing_init (); + + mousestate = unknown_mouse; + + if (needmousehack ()) + mousehack_setfollow(); } /* Custom chip memory bank */ -static ULONG custom_lget(CPTR) REGPARAM; -static ULONG custom_wget(CPTR) REGPARAM; -static ULONG custom_bget(CPTR) REGPARAM; -static void custom_lput(CPTR, ULONG) REGPARAM; -static void custom_wput(CPTR, ULONG) REGPARAM; -static void custom_bput(CPTR, ULONG) REGPARAM; +static uae_u32 custom_lget (uaecptr) REGPARAM; +static uae_u32 custom_wget (uaecptr) REGPARAM; +static uae_u32 custom_bget (uaecptr) REGPARAM; +static void custom_lput (uaecptr, uae_u32) REGPARAM; +static void custom_wput (uaecptr, uae_u32) REGPARAM; +static void custom_bput (uaecptr, uae_u32) REGPARAM; addrbank custom_bank = { - default_alget, default_awget, custom_lget, custom_wget, custom_bget, custom_lput, custom_wput, custom_bput, default_xlate, default_check }; -ULONG REGPARAM2 custom_wget(CPTR addr) +uae_u32 REGPARAM2 custom_wget (uaecptr addr) { - switch(addr & 0x1FE) { + switch (addr & 0x1FE) { case 0x002: return DMACONR(); case 0x004: return VPOSR(); case 0x006: return VHPOSR(); - + case 0x008: return DSKDATR(); case 0x00A: return JOY0DAT(); case 0x00C: return JOY1DAT(); - case 0x00E: return 0; /* CLXDAT */ + case 0x00E: return CLXDAT(); case 0x010: return ADKCONR(); case 0x012: return POT0DAT(); @@ -4773,202 +3111,208 @@ ULONG REGPARAM2 custom_wget(CPTR addr) case 0x01A: return DSKBYTR(); case 0x01C: return INTENAR(); case 0x01E: return INTREQR(); -#if AGA_CHIPSET == 1 - case 0x07C: return 0xF8; -#elif defined ECS_DENISE - case 0x07C: return 0xFC; -#endif + case 0x07C: return DENISEID(); default: custom_wput(addr,0); return 0xffff; } } -ULONG REGPARAM2 custom_bget(CPTR addr) +uae_u32 REGPARAM2 custom_bget (uaecptr addr) { return custom_wget(addr & 0xfffe) >> (addr & 1 ? 0 : 8); } -ULONG REGPARAM2 custom_lget(CPTR addr) +uae_u32 REGPARAM2 custom_lget (uaecptr addr) { - return ((ULONG)custom_wget(addr & 0xfffe) << 16) | custom_wget((addr+2) & 0xfffe); + return ((uae_u32)custom_wget(addr & 0xfffe) << 16) | custom_wget((addr+2) & 0xfffe); } -void REGPARAM2 custom_wput(CPTR addr, ULONG value) +void REGPARAM2 custom_wput_1 (int hpos, uaecptr addr, uae_u32 value) { addr &= 0x1FE; - cregs[addr>>1] = value; - switch(addr) { - case 0x020: DSKPTH(value); break; - case 0x022: DSKPTL(value); break; - case 0x024: DSKLEN(value); break; - case 0x026: DSKDAT(value); break; - - case 0x02A: VPOSW(value); break; - case 0x2E: COPCON(value); break; - case 0x030: SERDAT(value); break; - case 0x032: SERPER(value); break; - - case 0x040: BLTCON0(value); break; - case 0x042: BLTCON1(value); break; - - case 0x044: BLTAFWM(value); break; - case 0x046: BLTALWM(value); break; - - case 0x050: BLTAPTH(value); break; - case 0x052: BLTAPTL(value); break; - case 0x04C: BLTBPTH(value); break; - case 0x04E: BLTBPTL(value); break; - case 0x048: BLTCPTH(value); break; - case 0x04A: BLTCPTL(value); break; - case 0x054: BLTDPTH(value); break; - case 0x056: BLTDPTL(value); break; - - case 0x058: BLTSIZE(value); break; - - case 0x064: BLTAMOD(value); break; - case 0x062: BLTBMOD(value); break; - case 0x060: BLTCMOD(value); break; - case 0x066: BLTDMOD(value); break; - - case 0x070: BLTCDAT(value); break; - case 0x072: BLTBDAT(value); break; - case 0x074: BLTADAT(value); break; - - case 0x07E: DSKSYNC(value); break; - - case 0x080: COP1LCH(value); break; - case 0x082: COP1LCL(value); break; - case 0x084: COP2LCH(value); break; - case 0x086: COP2LCL(value); break; - - case 0x088: COPJMP1(value); break; - case 0x08A: COPJMP2(value); break; - - case 0x08E: DIWSTRT(value); break; - case 0x090: DIWSTOP(value); break; - case 0x092: DDFSTRT(value); break; - case 0x094: DDFSTOP(value); break; - - case 0x096: DMACON(value); break; - case 0x09A: INTENA(value); break; - case 0x09C: INTREQ(value); break; - case 0x09E: ADKCON(value); break; - - case 0x0A0: AUDxLCH(0, value); break; - case 0x0A2: AUDxLCL(0, value); break; - case 0x0A4: AUDxLEN(0, value); break; - case 0x0A6: AUDxPER(0, value); break; - case 0x0A8: AUDxVOL(0, value); break; - case 0x0AA: AUDxDAT(0, value); break; - - case 0x0B0: AUDxLCH(1, value); break; - case 0x0B2: AUDxLCL(1, value); break; - case 0x0B4: AUDxLEN(1, value); break; - case 0x0B6: AUDxPER(1, value); break; - case 0x0B8: AUDxVOL(1, value); break; - case 0x0BA: AUDxDAT(1, value); break; - - case 0x0C0: AUDxLCH(2, value); break; - case 0x0C2: AUDxLCL(2, value); break; - case 0x0C4: AUDxLEN(2, value); break; - case 0x0C6: AUDxPER(2, value); break; - case 0x0C8: AUDxVOL(2, value); break; - case 0x0CA: AUDxDAT(2, value); break; - - case 0x0D0: AUDxLCH(3, value); break; - case 0x0D2: AUDxLCL(3, value); break; - case 0x0D4: AUDxLEN(3, value); break; - case 0x0D6: AUDxPER(3, value); break; - case 0x0D8: AUDxVOL(3, value); break; - case 0x0DA: AUDxDAT(3, value); break; - - case 0x0E0: BPLPTH(value, 0); break; - case 0x0E2: BPLPTL(value, 0); break; - case 0x0E4: BPLPTH(value, 1); break; - case 0x0E6: BPLPTL(value, 1); break; - case 0x0E8: BPLPTH(value, 2); break; - case 0x0EA: BPLPTL(value, 2); break; - case 0x0EC: BPLPTH(value, 3); break; - case 0x0EE: BPLPTL(value, 3); break; - case 0x0F0: BPLPTH(value, 4); break; - case 0x0F2: BPLPTL(value, 4); break; - case 0x0F4: BPLPTH(value, 5); break; - case 0x0F6: BPLPTL(value, 5); break; - - case 0x100: BPLCON0(value); break; - case 0x102: BPLCON1(value); break; - case 0x104: BPLCON2(value); break; - case 0x106: BPLCON3(value); break; - - case 0x108: BPL1MOD(value); break; - case 0x10A: BPL2MOD(value); break; + switch (addr) { + case 0x020: DSKPTH (value); break; + case 0x022: DSKPTL (value); break; + case 0x024: DSKLEN (value); break; + case 0x026: DSKDAT (value); break; + + case 0x02A: VPOSW (value); break; + case 0x2E: COPCON (value); break; + case 0x030: SERDAT (value); break; + case 0x032: SERPER (value); break; + case 0x34: POTGO (value); break; + case 0x040: BLTCON0 (value); break; + case 0x042: BLTCON1 (value); break; + + case 0x044: BLTAFWM (value); break; + case 0x046: BLTALWM (value); break; + + case 0x050: BLTAPTH (value); break; + case 0x052: BLTAPTL (value); break; + case 0x04C: BLTBPTH (value); break; + case 0x04E: BLTBPTL (value); break; + case 0x048: BLTCPTH (value); break; + case 0x04A: BLTCPTL (value); break; + case 0x054: BLTDPTH (value); break; + case 0x056: BLTDPTL (value); break; + + case 0x058: BLTSIZE (value); break; + + case 0x064: BLTAMOD (value); break; + case 0x062: BLTBMOD (value); break; + case 0x060: BLTCMOD (value); break; + case 0x066: BLTDMOD (value); break; + + case 0x070: BLTCDAT (value); break; + case 0x072: BLTBDAT (value); break; + case 0x074: BLTADAT (value); break; + + case 0x07E: DSKSYNC (value); break; + + case 0x080: COP1LCH (value); break; + case 0x082: COP1LCL (value); break; + case 0x084: COP2LCH (value); break; + case 0x086: COP2LCL (value); break; + + case 0x088: COPJMP1 (value); break; + case 0x08A: COPJMP2 (value); break; + + case 0x08E: DIWSTRT (hpos, value); break; + case 0x090: DIWSTOP (hpos, value); break; + case 0x092: DDFSTRT (hpos, value); break; + case 0x094: DDFSTOP (hpos, value); break; + + case 0x096: DMACON (value); break; + case 0x098: CLXCON (value); break; + case 0x09A: INTENA (value); break; + case 0x09C: INTREQ (value); break; + case 0x09E: ADKCON (value); break; + + case 0x0A0: AUDxLCH (0, value); break; + case 0x0A2: AUDxLCL (0, value); break; + case 0x0A4: AUDxLEN (0, value); break; + case 0x0A6: AUDxPER (0, value); break; + case 0x0A8: AUDxVOL (0, value); break; + case 0x0AA: AUDxDAT (0, value); break; + + case 0x0B0: AUDxLCH (1, value); break; + case 0x0B2: AUDxLCL (1, value); break; + case 0x0B4: AUDxLEN (1, value); break; + case 0x0B6: AUDxPER (1, value); break; + case 0x0B8: AUDxVOL (1, value); break; + case 0x0BA: AUDxDAT (1, value); break; + + case 0x0C0: AUDxLCH (2, value); break; + case 0x0C2: AUDxLCL (2, value); break; + case 0x0C4: AUDxLEN (2, value); break; + case 0x0C6: AUDxPER (2, value); break; + case 0x0C8: AUDxVOL (2, value); break; + case 0x0CA: AUDxDAT (2, value); break; + + case 0x0D0: AUDxLCH (3, value); break; + case 0x0D2: AUDxLCL (3, value); break; + case 0x0D4: AUDxLEN (3, value); break; + case 0x0D6: AUDxPER (3, value); break; + case 0x0D8: AUDxVOL (3, value); break; + case 0x0DA: AUDxDAT (3, value); break; + + case 0x0E0: BPLPTH (hpos, value, 0); break; + case 0x0E2: BPLPTL (hpos, value, 0); break; + case 0x0E4: BPLPTH (hpos, value, 1); break; + case 0x0E6: BPLPTL (hpos, value, 1); break; + case 0x0E8: BPLPTH (hpos, value, 2); break; + case 0x0EA: BPLPTL (hpos, value, 2); break; + case 0x0EC: BPLPTH (hpos, value, 3); break; + case 0x0EE: BPLPTL (hpos, value, 3); break; + case 0x0F0: BPLPTH (hpos, value, 4); break; + case 0x0F2: BPLPTL (hpos, value, 4); break; + case 0x0F4: BPLPTH (hpos, value, 5); break; + case 0x0F6: BPLPTL (hpos, value, 5); break; + case 0x0F8: BPLPTH (hpos, value, 6); break; + case 0x0FA: BPLPTL (hpos, value, 6); break; + case 0x0FC: BPLPTH (hpos, value, 7); break; + case 0x0FE: BPLPTL (hpos, value, 7); break; + + case 0x100: BPLCON0 (hpos, value); break; + case 0x102: BPLCON1 (hpos, value); break; + case 0x104: BPLCON2 (hpos, value); break; + case 0x106: BPLCON3 (hpos, value); break; + + case 0x108: BPL1MOD (hpos, value); break; + case 0x10A: BPL2MOD (hpos, value); break; + + case 0x110: BPL1DAT (value); break; + case 0x112: BPL2DAT (value); break; + case 0x114: BPL3DAT (value); break; + case 0x116: BPL4DAT (value); break; + case 0x118: BPL5DAT (value); break; + case 0x11A: BPL6DAT (value); break; + case 0x11C: BPL7DAT (value); break; + case 0x11E: BPL8DAT (value); break; - case 0x110: BPL1DAT(value); break; - case 0x112: BPL2DAT(value); break; - case 0x114: BPL3DAT(value); break; - case 0x116: BPL4DAT(value); break; - case 0x118: BPL5DAT(value); break; - case 0x11A: BPL6DAT(value); break; - case 0x180: case 0x182: case 0x184: case 0x186: case 0x188: case 0x18A: case 0x18C: case 0x18E: case 0x190: case 0x192: case 0x194: case 0x196: case 0x198: case 0x19A: case 0x19C: case 0x19E: case 0x1A0: case 0x1A2: case 0x1A4: case 0x1A6: case 0x1A8: case 0x1AA: case 0x1AC: case 0x1AE: case 0x1B0: case 0x1B2: case 0x1B4: case 0x1B6: case 0x1B8: case 0x1BA: case 0x1BC: case 0x1BE: - COLOR(value & 0xFFF, (addr & 0x3E) / 2); + COLOR (hpos, value & 0xFFF, (addr & 0x3E) / 2); break; case 0x120: case 0x124: case 0x128: case 0x12C: case 0x130: case 0x134: case 0x138: case 0x13C: - SPRxPTH(value, (addr - 0x120) / 4); + SPRxPTH (hpos, value, (addr - 0x120) / 4); break; case 0x122: case 0x126: case 0x12A: case 0x12E: case 0x132: case 0x136: case 0x13A: case 0x13E: - SPRxPTL(value, (addr - 0x122) / 4); + SPRxPTL (hpos, value, (addr - 0x122) / 4); break; case 0x140: case 0x148: case 0x150: case 0x158: case 0x160: case 0x168: case 0x170: case 0x178: - SPRxPOS(value, (addr - 0x140) / 8); + SPRxPOS (hpos, value, (addr - 0x140) / 8); break; case 0x142: case 0x14A: case 0x152: case 0x15A: case 0x162: case 0x16A: case 0x172: case 0x17A: - SPRxCTL(value, (addr - 0x142) / 8); + SPRxCTL (hpos, value, (addr - 0x142) / 8); break; case 0x144: case 0x14C: case 0x154: case 0x15C: case 0x164: case 0x16C: case 0x174: case 0x17C: - SPRxDATA(value, (addr - 0x144) / 8); + SPRxDATA (hpos, value, (addr - 0x144) / 8); break; case 0x146: case 0x14E: case 0x156: case 0x15E: case 0x166: case 0x16E: case 0x176: case 0x17E: - SPRxDATB(value, (addr - 0x146) / 8); + SPRxDATB (hpos, value, (addr - 0x146) / 8); break; - - case 0x36: JOYTEST(value); break; -#if defined(ECS_AGNUS) || (AGA_CHIPSET == 1) - case 0x5A: BLTCON0L(value); break; - case 0x5C: BLTSIZV(value); break; - case 0x5E: BLTSIZH(value); break; -#endif -#if AGA_CHIPSET == 1 - case 0x10C: BPLCON4(value); break; - case 0x1FC: fmode = value; break; -#endif + + case 0x36: JOYTEST (value); break; + case 0x5A: BLTCON0L (value); break; + case 0x5C: BLTSIZV (value); break; + case 0x5E: BLTSIZH (value); break; + case 0x1E4: DIWHIGH (hpos, value); break; + case 0x10C: BPLCON4 (hpos, value); break; + case 0x1FC: FMODE (value); break; } } -void REGPARAM2 custom_bput(CPTR addr, ULONG value) +void REGPARAM2 custom_wput (uaecptr addr, uae_u32 value) +{ + int hpos = current_hpos (); + update_copper (hpos); + custom_wput_1 (hpos, addr, value); +} + +void REGPARAM2 custom_bput (uaecptr addr, uae_u32 value) { static int warned = 0; /* Is this correct now? (There are people who bput things to the upper byte of AUDxVOL). */ - UWORD rval = (value << 8) | (value & 0xFF); + uae_u16 rval = (value << 8) | (value & 0xFF); custom_wput(addr, rval); if (!warned) - fprintf(stderr, "Byte put to custom register.\n"), warned++; + write_log ("Byte put to custom register.\n"), warned++; } -void REGPARAM2 custom_lput(CPTR addr, ULONG value) +void REGPARAM2 custom_lput(uaecptr addr, uae_u32 value) { custom_wput(addr & 0xfffe, value >> 16); - custom_wput((addr+2) & 0xfffe, (UWORD)value); + custom_wput((addr+2) & 0xfffe, (uae_u16)value); }