ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/uae_cpu/newcpu.h
(Generate patch)

Comparing BasiliskII/src/uae_cpu/newcpu.h (file contents):
Revision 1.7 by gbeauche, 2002-03-23T13:57:38Z vs.
Revision 1.14 by gbeauche, 2005-06-04T16:47:14Z

# Line 9 | Line 9
9   #ifndef NEWCPU_H
10   #define NEWCPU_H
11  
12 < #define SPCFLAG_STOP 2
13 < #define SPCFLAG_DISK 4
14 < #define SPCFLAG_INT  8
15 < #define SPCFLAG_BRK  16
16 < #define SPCFLAG_EXTRA_CYCLES 32
17 < #define SPCFLAG_TRACE 64
18 < #define SPCFLAG_DOTRACE 128
19 < #define SPCFLAG_DOINT 256
20 < #define SPCFLAG_BLTNASTY 512
21 < #define SPCFLAG_EXEC 1024
22 < #define SPCFLAG_MODE_CHANGE 8192
12 > #ifndef FLIGHT_RECORDER
13 > #define FLIGHT_RECORDER 0
14 > #endif
15  
16 + #include "m68k.h"
17 + #include "readcpu.h"
18 + #include "spcflags.h"
19 +
20   extern int areg_byteinc[];
21   extern int imm8_table[];
22  
# Line 28 | Line 24 | extern int movem_index1[256];
24   extern int movem_index2[256];
25   extern int movem_next[256];
26  
31 extern int fpp_movem_index1[256];
32 extern int fpp_movem_index2[256];
33 extern int fpp_movem_next[256];
34
27   extern int broken_in;
28  
29 < typedef void REGPARAM2 cpuop_func (uae_u32) REGPARAM;
29 > #ifdef X86_ASSEMBLY
30 > /* This hack seems to force all register saves (pushl %reg) to be moved to the
31 >   begining of the function, thus making it possible to cpuopti to remove them
32 >   since m68k_run_1 will save those registers before calling the instruction
33 >   handler */
34 > # define cpuop_tag(tag)         __asm__ __volatile__ ( "#cpuop_" tag )
35 > #else
36 > # define cpuop_tag(tag)         ;
37 > #endif
38 >
39 > #define cpuop_begin()           do { cpuop_tag("begin"); } while (0)
40 > #define cpuop_end()                     do { cpuop_tag("end"); } while (0)
41  
42 + typedef void REGPARAM2 cpuop_func (uae_u32) REGPARAM;
43 +
44   struct cputbl {
45      cpuop_func *handler;
46 <    int specific;
46 >    uae_u16 specific;
47      uae_u16 opcode;
48   };
49  
50 < extern void REGPARAM2 op_illg (uae_u32) REGPARAM;
50 > extern cpuop_func *cpufunctbl[65536] ASM_SYM_FOR_FUNC ("cpufunctbl");
51  
52 < typedef char flagtype;
52 > #if USE_JIT
53 > typedef void compop_func (uae_u32) REGPARAM;
54  
55 < extern struct regstruct
56 < {
57 <    uae_u32 regs[16];
58 <    uaecptr  usp,isp,msp;
59 <    uae_u16 sr;
60 <    flagtype t1;
61 <    flagtype t0;
62 <    flagtype s;
57 <    flagtype m;
58 <    flagtype x;
59 <    flagtype stopped;
60 <    int intmask;
61 <
62 <    uae_u32 pc;
63 <    uae_u8 *pc_p;
64 <    uae_u8 *pc_oldp;
55 > struct comptbl {
56 >    compop_func *handler;
57 >        uae_u32         specific;
58 >        uae_u32         opcode;
59 > };
60 > #endif
61 >
62 > extern void REGPARAM2 op_illg (uae_u32) REGPARAM;
63  
64 <    uae_u32 vbr,sfc,dfc;
64 > typedef char flagtype;
65  
66 <    double fp[8];
67 <    uae_u32 fpcr,fpsr,fpiar;
66 > struct regstruct {
67 >    uae_u32             regs[16];
68  
69 <    uae_u32 spcflags;
70 <    uae_u32 kick_mask;
69 >    uae_u32             pc;
70 >    uae_u8 *    pc_p;
71 >    uae_u8 *    pc_oldp;
72 >
73 >        spcflags_t      spcflags;
74 >    int                 intmask;
75 >
76 >    uae_u32             vbr, sfc, dfc;
77 >    uaecptr             usp, isp, msp;
78 >    uae_u16             sr;
79 >    flagtype    t1;
80 >    flagtype    t0;
81 >    flagtype    s;
82 >    flagtype    m;
83 >    flagtype    x;
84 >    flagtype    stopped;
85  
86 + #if USE_PREFETCH_BUFFER
87      /* Fellow sources say this is 4 longwords. That's impossible. It needs
88       * to be at least a longword. The HRM has some cryptic comment about two
89       * instructions being on the same longword boundary.
90       * The way this is implemented now seems like a good compromise.
91       */
92      uae_u32 prefetch;
93 < } regs, lastint_regs;
93 > #endif
94 > };
95 >
96 > extern regstruct regs, lastint_regs;
97  
98   #define m68k_dreg(r,num) ((r).regs[(num)])
99   #define m68k_areg(r,num) (((r).regs + 8)[(num)])
# Line 92 | Line 108 | extern struct regstruct
108   #define GET_OPCODE (get_iword (0))
109   #endif
110  
111 + #if USE_PREFETCH_BUFFER
112   static __inline__ uae_u32 get_ibyte_prefetch (uae_s32 o)
113   {
114      if (o > 3 || o < 0)
# Line 114 | Line 131 | static __inline__ uae_u32 get_ilong_pref
131          return do_get_mem_long(&regs.prefetch);
132      return (do_get_mem_word (((uae_u16 *)&regs.prefetch) + 1) << 16) | do_get_mem_word ((uae_u16 *)(regs.pc_p + 4));
133   }
134 + #endif
135  
136   #define m68k_incpc(o) (regs.pc_p += (o))
137  
# Line 166 | Line 184 | static __inline__ uae_u32 next_ilong (vo
184      return r;
185   }
186  
169 #if !defined USE_COMPILER
187   static __inline__ void m68k_setpc (uaecptr newpc)
188   {
189   #if REAL_ADDRESSING || DIRECT_ADDRESSING
# Line 176 | Line 193 | static __inline__ void m68k_setpc (uaecp
193      regs.pc = newpc;
194   #endif
195   }
179 #else
180 extern void m68k_setpc (uaecptr newpc);
181 #endif
196  
197   static __inline__ uaecptr m68k_getpc (void)
198   {
# Line 189 | Line 203 | static __inline__ uaecptr m68k_getpc (vo
203   #endif
204   }
205  
192 #ifdef USE_COMPILER
193 extern void m68k_setpc_fast (uaecptr newpc);
194 extern void m68k_setpc_bcc (uaecptr newpc);
195 extern void m68k_setpc_rte (uaecptr newpc);
196 #else
206   #define m68k_setpc_fast m68k_setpc
207   #define m68k_setpc_bcc  m68k_setpc
208   #define m68k_setpc_rte  m68k_setpc
200 #endif
209  
210   static __inline__ void m68k_do_rts(void)
211   {
# Line 225 | Line 233 | static __inline__ void m68k_setstopped (
233      /* A traced STOP instruction drops through immediately without
234         actually stopping.  */
235      if (stop && (regs.spcflags & SPCFLAG_DOTRACE) == 0)
236 <        regs.spcflags |= SPCFLAG_STOP;
236 >    SPCFLAGS_SET( SPCFLAG_STOP );
237   }
238  
239   extern uae_u32 get_disp_ea_020 (uae_u32 base, uae_u32 dp);
# Line 241 | Line 249 | extern int m68k_move2c (int, uae_u32 *);
249   extern int m68k_movec2 (int, uae_u32 *);
250   extern void m68k_divl (uae_u32, uae_u32, uae_u16, uaecptr);
251   extern void m68k_mull (uae_u32, uae_u32, uae_u16);
252 + extern void m68k_emulop (uae_u32);
253 + extern void m68k_emulop_return (void);
254   extern void init_m68k (void);
255   extern void exit_m68k (void);
246 extern void m68k_go (int);
256   extern void m68k_dumpstate (uaecptr *);
257   extern void m68k_disasm (uaecptr, uaecptr *, int);
258   extern void m68k_reset (void);
259   extern void m68k_enter_debugger(void);
260 + extern int m68k_do_specialties(void);
261  
262   extern void mmu_op (uae_u32, uae_u16);
263  
254 extern void fpp_opp (uae_u32, uae_u16);
255 extern void fdbcc_opp (uae_u32, uae_u16);
256 extern void fscc_opp (uae_u32, uae_u16);
257 extern void ftrapcc_opp (uae_u32,uaecptr);
258 extern void fbcc_opp (uae_u32, uaecptr, uae_u32);
259 extern void fsave_opp (uae_u32);
260 extern void frestore_opp (uae_u32);
261
262 extern void fpu_set_integral_fpu (bool is_integral);
263 extern void fpu_init (void);
264 extern void fpu_exit (void);
265 extern void fpu_reset (void);
266
264   /* Opcode of faulting instruction */
265   extern uae_u16 last_op_for_exception_3;
266   /* PC at fault time */
# Line 274 | Line 271 | extern uaecptr last_fault_for_exception_
271   #define CPU_OP_NAME(a) op ## a
272  
273   /* 68020 + 68881 */
274 < extern struct cputbl op_smalltbl_0[];
274 > extern struct cputbl op_smalltbl_0_ff[];
275   /* 68020 */
276 < extern struct cputbl op_smalltbl_1[];
276 > extern struct cputbl op_smalltbl_1_ff[];
277   /* 68010 */
278 < extern struct cputbl op_smalltbl_2[];
278 > extern struct cputbl op_smalltbl_2_ff[];
279   /* 68000 */
280 < extern struct cputbl op_smalltbl_3[];
280 > extern struct cputbl op_smalltbl_3_ff[];
281   /* 68000 slow but compatible.  */
282 < extern struct cputbl op_smalltbl_4[];
286 <
287 < extern cpuop_func *cpufunctbl[65536] ASM_SYM_FOR_FUNC ("cpufunctbl");
282 > extern struct cputbl op_smalltbl_4_ff[];
283  
284 + #if FLIGHT_RECORDER
285 + extern void m68k_record_step(uaecptr) REGPARAM;
286 + #endif
287 + extern void m68k_do_execute(void);
288 + extern void m68k_execute(void);
289 + #if USE_JIT
290 + #if defined(X86_ASSEMBLY) || defined(X86_64_ASSEMBLY)
291 + /* This is generated code */
292 + extern void (*m68k_compile_execute)(void);
293 + #else
294 + extern void m68k_do_compile_execute(void);
295 + extern void m68k_compile_execute(void);
296 + #endif
297 + #endif
298 +
299   #endif /* NEWCPU_H */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines