--- uae/src/include/newcpu.h 2018/04/24 16:38:39 1.1 +++ uae/src/include/newcpu.h 2018/04/24 17:11:10 1.1.1.14 @@ -1,11 +1,38 @@ - /* + /* * UAE - The Un*x Amiga Emulator - * + * * MC68000 emulation * * Copyright 1995 Bernd Schmidt */ +#include "readcpu.h" +#include "machdep/m68k.h" + +#ifndef SET_CFLG + +#define SET_CFLG(x) (CFLG = (x)) +#define SET_NFLG(x) (NFLG = (x)) +#define SET_VFLG(x) (VFLG = (x)) +#define SET_ZFLG(x) (ZFLG = (x)) +#define SET_XFLG(x) (XFLG = (x)) + +#define GET_CFLG CFLG +#define GET_NFLG NFLG +#define GET_VFLG VFLG +#define GET_ZFLG ZFLG +#define GET_XFLG XFLG + +#define CLEAR_CZNV do { \ + SET_CFLG (0); \ + SET_ZFLG (0); \ + SET_NFLG (0); \ + SET_VFLG (0); \ +} while (0) + +#define COPY_CARRY (SET_XFLG (GET_CFLG)) +#endif + extern int areg_byteinc[]; extern int imm8_table[]; @@ -19,48 +46,34 @@ extern int fpp_movem_next[256]; extern int broken_in; -typedef void cpuop_func(ULONG) REGPARAM; +typedef unsigned long cpuop_func (uae_u32) REGPARAM; struct cputbl { cpuop_func *handler; int specific; - UWORD opcode; + uae_u16 opcode; }; -extern struct cputbl smallcputbl[]; +extern unsigned long op_illg (uae_u32) REGPARAM; -extern cpuop_func *cpufunctbl[65536]; -extern void op_illg(ULONG) REGPARAM; +typedef char flagtype; -typedef char flagtype; +/* You can set this to long double to be more accurate. However, the + resulting alignment issues will cost a lot of performance in some + apps */ +#define USE_LONG_DOUBLE 0 -/* Arrrghh.. */ - -#if defined(USE_COMPILER) && !defined(USE_POINTER) -#define USE_POINTER -#undef NEED_TO_DEBUG_BADLY -#endif -#if defined(NEED_TO_DEBUG_BADLY) && !defined(USE_POINTER) -#define USE_POINTER +#if USE_LONG_DOUBLE +typedef long double fptype; +#else +typedef double fptype; #endif -struct flag_struct { - unsigned int c:1; /* first byte */ - int :5; - unsigned int z:1; - unsigned int n:1; - int :3; - unsigned int v:1; /* second byte */ - int :4; - unsigned int x:1; /* third & fourth */ - int :15; -}; - -extern struct regstruct +extern struct regstruct { - ULONG d[8]; - CPTR a[8],usp,isp,msp; - UWORD sr; + uae_u32 regs[16]; + uaecptr usp,isp,msp; + uae_u16 sr; flagtype t1; flagtype t0; flagtype s; @@ -68,196 +81,174 @@ extern struct regstruct flagtype x; flagtype stopped; int intmask; - ULONG pc; -#ifdef USE_POINTER - UBYTE *pc_p; - UBYTE *pc_oldp; -#endif - - ULONG vbr,sfc,dfc; - double fp[8]; - ULONG fpcr,fpsr,fpiar; - ULONG spcflags; -} regs, lastint_regs; + uae_u32 pc; + uae_u8 *pc_p; + uae_u8 *pc_oldp; -#ifdef INTEL_FLAG_OPT -extern struct flag_struct regflags __asm__ ("regflags"); -#else -extern struct flag_struct regflags; -#endif + uae_u32 vbr,sfc,dfc; -#define ZFLG (regflags.z) -#define NFLG (regflags.n) -#define CFLG (regflags.c) -#define VFLG (regflags.v) -#define XFLG (regflags.x) + fptype fp[8]; + fptype fp_result; -#ifdef USE_POINTER -static __inline__ UWORD nextiword(void) -{ - UWORD r = (*(regs.pc_p) << 8) | (*(regs.pc_p + 1) << 0); - regs.pc_p += 2; - return r; -} + uae_u32 fpcr,fpsr,fpiar; + uae_u32 fpsr_highbyte; + + uae_u32 spcflags; + uae_u32 kick_mask; + uae_u32 address_space_mask; + uae_u16 irc, ir; -static __inline__ ULONG nextilong(void) + uae_u8 panic; + uae_u32 panic_pc, panic_addr; +} regs, lastint_regs; + +STATIC_INLINE uae_u32 munge24(uae_u32 x) { - ULONG r = (*regs.pc_p << 24) | (*(regs.pc_p + 1) << 16) | (*(regs.pc_p + 2) << 8) | (*(regs.pc_p + 3) << 0); - regs.pc_p += 4; - return r; + return x & regs.address_space_mask; } -#else -static __inline__ UWORD nextiword(void) +STATIC_INLINE void set_special (uae_u32 x) { - UWORD r = get_aword(regs.pc); - regs.pc += 2; - return r; + regs.spcflags |= x; } -static __inline__ ULONG nextilong(void) +STATIC_INLINE void unset_special (uae_u32 x) { - ULONG r = get_along(regs.pc); - regs.pc += 4; - return r; + regs.spcflags &= ~x; } -#endif +#define m68k_dreg(r,num) ((r).regs[(num)]) +#define m68k_areg(r,num) (((r).regs + 8)[(num)]) -#ifdef USE_POINTER - -#if !defined(NEED_TO_DEBUG_BADLY) && !defined(USE_COMPILER) -static __inline__ void m68k_setpc(CPTR newpc) +STATIC_INLINE void m68k_setpc (uaecptr newpc) { + regs.pc_p = regs.pc_oldp = get_real_address (newpc); regs.pc = newpc; - regs.pc_p = regs.pc_oldp = get_real_address(newpc); } -#else -extern void m68k_setpc(CPTR newpc); -#endif -static __inline__ CPTR m68k_getpc(void) +STATIC_INLINE uaecptr m68k_getpc (void) { return regs.pc + ((char *)regs.pc_p - (char *)regs.pc_oldp); } -#else +STATIC_INLINE uaecptr m68k_getpc_p (uae_u8 *p) +{ + 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))) -static __inline__ void m68k_setpc(CPTR newpc) +#define m68k_incpc(o) (regs.pc_p += (o)) + +/* These are only used by the 68020/68881 code, and therefore don't + * need to handle prefetch. */ +STATIC_INLINE uae_u32 next_ibyte (void) { - regs.pc = newpc; + uae_u32 r = get_ibyte (0); + m68k_incpc (2); + return r; } -static __inline__ CPTR m68k_getpc(void) +STATIC_INLINE uae_u32 next_iword (void) { - return regs.pc; + uae_u32 r = get_iword (0); + m68k_incpc (2); + return r; } -#endif -#ifdef USE_COMPILER -extern void m68k_setpc_fast(CPTR newpc); -extern void m68k_setpc_bcc(CPTR newpc); -extern void m68k_setpc_rte(CPTR newpc); -#else -#define m68k_setpc_fast m68k_setpc -#define m68k_setpc_bcc m68k_setpc -#define m68k_setpc_rte m68k_setpc -#endif +STATIC_INLINE uae_u32 next_ilong (void) +{ + uae_u32 r = get_ilong (0); + m68k_incpc (4); + return r; +} -static __inline__ void m68k_setstopped(int stop) +STATIC_INLINE void m68k_do_rts(void) { - regs.stopped = stop; - if (stop) - regs.spcflags |= SPCFLAG_STOP; + m68k_setpc(get_long(m68k_areg(regs, 7))); + m68k_areg(regs, 7) += 4; } -static __inline__ int cctrue(const int cc) +STATIC_INLINE void m68k_do_bsr(uaecptr oldpc, uae_s32 offset) { - switch(cc){ - case 0: return 1; /* T */ - case 1: return 0; /* F */ - case 2: return !CFLG && !ZFLG; /* HI */ - case 3: return CFLG || ZFLG; /* LS */ - case 4: return !CFLG; /* CC */ - case 5: return CFLG; /* CS */ - case 6: return !ZFLG; /* NE */ - case 7: return ZFLG; /* EQ */ - case 8: return !VFLG; /* VC */ - case 9: return VFLG; /* VS */ - case 10:return !NFLG; /* PL */ - case 11:return NFLG; /* MI */ - case 12:return NFLG == VFLG; /* GE */ - case 13:return NFLG != VFLG; /* LT */ - case 14:return !ZFLG && (NFLG == VFLG); /* GT */ - case 15:return ZFLG || (NFLG != VFLG); /* LE */ - } - abort(); - return 0; -} - -#if CPU_LEVEL > 1 -static __inline__ ULONG get_disp_ea (ULONG base) -{ - UWORD dp = nextiword(); - int reg = (dp >> 12) & 7; - LONG regd = dp & 0x8000 ? regs.a[reg] : regs.d[reg]; - if ((dp & 0x800) == 0) - regd = (LONG)(WORD)regd; - regd <<= (dp >> 9) & 3; - if (dp & 0x100) { - LONG outer = 0; - if (dp & 0x80) base = 0; - if (dp & 0x40) regd = 0; - - if ((dp & 0x30) == 0x20) base += (LONG)(WORD)nextiword(); - if ((dp & 0x30) == 0x30) base += nextilong(); - - if ((dp & 0x3) == 0x2) outer = (LONG)(WORD)nextiword(); - if ((dp & 0x3) == 0x3) outer = nextilong(); - - if ((dp & 0x4) == 0) base += regd; - if (dp & 0x3) base = get_long (base); - if (dp & 0x4) base += regd; - - return base + outer; - } else { - return base + (LONG)((BYTE)dp) + regd; - } + m68k_areg(regs, 7) -= 4; + put_long(m68k_areg(regs, 7), oldpc); + m68k_incpc(offset); } -#else -static __inline__ ULONG get_disp_ea (ULONG base) + +STATIC_INLINE void m68k_do_jsr(uaecptr oldpc, uaecptr dest) { - UWORD dp = nextiword(); - int reg = (dp >> 12) & 7; - LONG regd = dp & 0x8000 ? regs.a[reg] : regs.d[reg]; - if ((dp & 0x800) == 0) - regd = (LONG)(WORD)regd; - return base + (BYTE)(dp) + regd; + m68k_areg(regs, 7) -= 4; + put_long(m68k_areg(regs, 7), oldpc); + m68k_setpc(dest); } -#endif -extern void MakeSR(void); -extern void MakeFromSR(void); -extern void Exception(int, CPTR); -extern void dump_counts(void); -extern void m68k_move2c(int, ULONG *); -extern void m68k_movec2(int, ULONG *); -extern void m68k_divl (ULONG, ULONG, UWORD, CPTR); -extern void m68k_mull (ULONG, ULONG, UWORD); +STATIC_INLINE void m68k_setstopped (int stop) +{ + regs.stopped = stop; + /* A traced STOP instruction drops through immediately without + actually stopping. */ + if (stop && (regs.spcflags & SPCFLAG_DOTRACE) == 0) + regs.spcflags |= SPCFLAG_STOP; +} + +extern uae_u32 get_disp_ea_020 (uae_u32 base, uae_u32 dp); +extern uae_u32 get_disp_ea_000 (uae_u32 base, uae_u32 dp); + +extern uae_s32 ShowEA (FILE *, int reg, amodes mode, wordsizes size, char *buf); + +extern void MakeSR (void); +extern void MakeFromSR (void); +extern void Exception (int, uaecptr); +extern void dump_counts (void); +extern int m68k_move2c (int, uae_u32 *); +extern int m68k_movec2 (int, uae_u32 *); +extern void m68k_divl (uae_u32, uae_u32, uae_u16, uaecptr); +extern void m68k_mull (uae_u32, uae_u32, uae_u16); extern void init_m68k (void); -extern void m68k_run(void); -extern void m68k_go(int); -extern void m68k_run_2(void); -extern void m68k_dumpstate(CPTR *); -extern void m68k_disasm(CPTR,CPTR *,int); -extern void m68k_reset(void); -extern void mmu_op (ULONG, UWORD); -extern void fpp_opp (ULONG, UWORD); -extern void fdbcc_opp (ULONG, UWORD); -extern void fscc_opp (ULONG, UWORD); -extern void ftrapcc_opp (ULONG,CPTR); -extern void fbcc_opp (ULONG, CPTR, ULONG); -extern void fsave_opp (ULONG); -extern void frestore_opp (ULONG); +extern void m68k_go (int); +extern void m68k_dumpstate (FILE *, uaecptr *); +extern void m68k_disasm (FILE *, uaecptr, uaecptr *, int); +extern void m68k_reset (void); + +extern void mmu_op (uae_u32, uae_u16); + +extern void fpp_opp (uae_u32, uae_u16); +extern void fdbcc_opp (uae_u32, uae_u16); +extern void fscc_opp (uae_u32, uae_u16); +extern void ftrapcc_opp (uae_u32,uaecptr); +extern void fbcc_opp (uae_u32, uaecptr, uae_u32); +extern void fsave_opp (uae_u32); +extern void frestore_opp (uae_u32); + +extern void exception3 (uae_u32 opcode, uaecptr addr, uaecptr fault); +extern void exception3i (uae_u32 opcode, uaecptr addr, uaecptr fault); +extern void exception2 (uaecptr addr, uaecptr fault); +extern void cpureset (void); + +extern void fill_prefetch_slow (void); + +#define CPU_OP_NAME(a) op ## a + +/* 68040 */ +extern struct cputbl op_smalltbl_0_ff[]; +/* 68020 + 68881 */ +extern struct cputbl op_smalltbl_1_ff[]; +/* 68020 */ +extern struct cputbl op_smalltbl_2_ff[]; +/* 68010 */ +extern struct cputbl op_smalltbl_3_ff[]; +/* 68000 */ +extern struct cputbl op_smalltbl_4_ff[]; +/* 68000 slow but compatible. */ +extern struct cputbl op_smalltbl_5_ff[]; +extern cpuop_func *cpufunctbl[65536] ASM_SYM_FOR_FUNC ("cpufunctbl"); + +#ifdef JIT +#else +#define flush_icache(X) do {} while (0) +#endif