--- hatari/src/uae-cpu/newcpu.h 2019/04/01 07:11:37 1.1.1.7 +++ hatari/src/uae-cpu/newcpu.h 2019/04/09 08:54:38 1.1.1.15 @@ -7,8 +7,8 @@ * * Adaptation to Hatari by Thomas Huth * - * This file is distributed under the GNU Public License, version 2 or at - * your option any later version. Read the file gpl.txt for details. + * This file is distributed under the GNU General Public License, version 2 + * or at your option any later version. Read the file gpl.txt for details. */ #ifndef UAE_NEWCPU_H @@ -16,9 +16,18 @@ #include "readcpu.h" #include "m68k.h" +#include "memory.h" + + +/* Possible exceptions sources for M68000_Exception() and Exception() */ +#define M68000_EXC_SRC_CPU 1 /* Direct CPU exception */ +#define M68000_EXC_SRC_AUTOVEC 2 /* Auto-vector exception (e.g. VBL) */ +#define M68000_EXC_SRC_INT_MFP 3 /* MFP interrupt exception */ +#define M68000_EXC_SRC_INT_DSP 4 /* DSP interrupt exception */ /* Special flags */ +#define SPCFLAG_DEBUGGER 1 #define SPCFLAG_STOP 2 #define SPCFLAG_BUSERROR 4 #define SPCFLAG_INT 8 @@ -30,6 +39,7 @@ #define SPCFLAG_MFP 0x200 #define SPCFLAG_EXEC 0x400 #define SPCFLAG_MODE_CHANGE 0x800 +#define SPCFLAG_DSP 0x1000 #ifndef SET_CFLG @@ -56,8 +66,8 @@ #define COPY_CARRY (SET_XFLG (GET_CFLG)) #endif -extern int areg_byteinc[]; -extern int imm8_table[]; +extern const int areg_byteinc[]; +extern const int imm8_table[]; extern int movem_index1[256]; extern int movem_index2[256]; @@ -152,24 +162,54 @@ STATIC_INLINE uaecptr m68k_getpc_p (uae_ return regs.pc + ((char *)p - (char *)regs.pc_oldp); } -#define get_ibyte(o) do_get_mem_byte((uae_u8 *)(regs.pc_p + (o) + 1)) -#define get_iword(o) do_get_mem_word((uae_u16 *)(regs.pc_p + (o))) -#define get_ilong(o) do_get_mem_long((uae_u32 *)(regs.pc_p + (o))) +#define get_ibyte(o) do_get_mem_byte(regs.pc_p + (o) + 1) +#define get_iword(o) do_get_mem_word(regs.pc_p + (o)) +#define get_ilong(o) do_get_mem_long(regs.pc_p + (o)) STATIC_INLINE void refill_prefetch (uae_u32 currpc, uae_u32 offs) { uae_u32 t = (currpc + offs) & ~1; - uae_s32 pc_p_offs = t - currpc; - uae_u8 *ptr = regs.pc_p + pc_p_offs; uae_u32 r; #ifdef UNALIGNED_PROFITABLE - r = *(uae_u32 *)ptr; + if ( t - regs.prefetch_pc == 2 ) /* keep 1 word and read 1 new word */ + { + r = regs.prefetch; + r <<= 16; + r |= get_word (t+2); + } + else + { + /* [NP] FIXME : when we refill with 4 bytes, we should not read one long */ + /* but 2 words, else some bus errors are not detected if the address overlaps */ + /* on a bus error region (eg : get_long(t=213ffffe) doesn't give a bus error, */ + /* but it should. This should be better handled in memory.c */ +// r = get_long (t); /* read 2 new words */ + r = get_word (t); + r <<= 16; + r |= get_word (t+2); + } regs.prefetch = r; #else - r = do_get_mem_long ((uae_u32 *)ptr); + if ( t - regs.prefetch_pc == 2 ) /* keep 1 word and read 1 new word */ + { + r = do_get_mem_word (((uae_u8 *)®s.prefetch) + 2); + r <<= 16; + r |= get_word (t+2); + } + else + { + /* [NP] FIXME : when we refill with 4 bytes, we should not read one long */ + /* but 2 words, else some bus errors are not detected if the address overlaps */ + /* on a bus error region (eg : get_long(t=213ffffe) doesn't give a bus error, */ + /* but it should. This should be better handled in memory.c */ +// r = get_long (t); /* read 2 new words */ + r = get_word (t); + r <<= 16; + r |= get_word (t+2); + } do_put_mem_long (®s.prefetch, r); #endif - /* printf ("PC %lx T %lx PCPOFFS %d R %lx\n", currpc, t, pc_p_offs, r); */ +//fprintf (stderr,"PC %x PREFPC %x T %x R %x\n", currpc, regs.prefetch_pc, t, r); regs.prefetch_pc = t; } @@ -195,13 +235,15 @@ STATIC_INLINE uae_u32 get_iword_prefetch uae_u32 addr = currpc + o; uae_u32 offs = addr - regs.prefetch_pc; uae_u32 v; +//fprintf (stderr,"get_iword PC %lx ADDR %lx OFFS %lx V %lx\n", currpc, addr, offs, v); if (offs > 3) { refill_prefetch (currpc, o); offs = addr - regs.prefetch_pc; } - v = do_get_mem_word ((uae_u16 *)(((uae_u8 *)®s.prefetch) + offs)); + v = do_get_mem_word (((uae_u8 *)®s.prefetch) + offs); if (offs >= 2) refill_prefetch (currpc, 2); +//fprintf (stderr,"get_iword PC %lx ADDR %lx OFFS %lx V %lx\n", currpc, addr, offs, v); /* printf ("get_iword PC %lx ADDR %lx OFFS %lx V %lx\n", currpc, addr, offs, v); */ return v; } @@ -287,7 +329,7 @@ extern uae_s32 ShowEA (FILE *, int reg, extern void MakeSR (void); extern void MakeFromSR (void); -extern void Exception (int, uaecptr); +extern void Exception (int, uaecptr, int); extern void dump_counts (void); extern int m68k_move2c (int, uae_u32 *); extern int m68k_movec2 (int, uae_u32 *); @@ -310,6 +352,8 @@ extern void fbcc_opp (uae_u32, uaecptr, extern void fsave_opp (uae_u32); extern void frestore_opp (uae_u32); +extern int getDivu68kCycles (uae_u32 dividend, uae_u16 divisor); +extern int getDivs68kCycles (uae_s32 dividend, uae_s16 divisor); /* Opcode of faulting instruction */ extern uae_u16 last_op_for_exception_3; @@ -321,20 +365,27 @@ extern uaecptr last_fault_for_exception_ #define CPU_OP_NAME(a) op ## a /* 68040 */ -extern struct cputbl op_smalltbl_0_ff[]; +extern const struct cputbl op_smalltbl_0_ff[]; /* 68020 + 68881 */ -extern struct cputbl op_smalltbl_1_ff[]; +extern const struct cputbl op_smalltbl_1_ff[]; /* 68020 */ -extern struct cputbl op_smalltbl_2_ff[]; +extern const struct cputbl op_smalltbl_2_ff[]; /* 68010 */ -extern struct cputbl op_smalltbl_3_ff[]; +extern const struct cputbl op_smalltbl_3_ff[]; /* 68000 */ -extern struct cputbl op_smalltbl_4_ff[]; +extern const struct cputbl op_smalltbl_4_ff[]; /* 68000 slow but compatible. */ -extern struct cputbl op_smalltbl_5_ff[]; +extern const struct cputbl op_smalltbl_5_ff[]; extern cpuop_func *cpufunctbl[65536]; -extern uae_u32 reg_caar, reg_cacr; +extern uae_u32 caar, cacr; + +/* Family of the latest instruction executed (to check for pairing) */ +extern int OpcodeFamily; /* see instrmnem in readcpu.h */ + +/* How many cycles to add to the current instruction in case a "misaligned" bus acces is made */ +/* (used when addressing mode is d8(an,ix)) */ +extern int BusCyclePenalty; #endif /* UAE_NEWCPU_H */