jepler/Musashi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move the reset_cycles to the cpu context

Browse source
This commit is contained in:
Emmanuel Anne 2019-12-12 10:41:54 +01:00
parent 414590fc75
commit 8126887721
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
m68kcpu.c
View file

@ -53,7 +53,6 @@ extern void m68ki_build_opcode_table(void);
int m68ki_initial_cycles;
int m68ki_remaining_cycles = 0; /* Number of clocks remaining */
uint m68ki_reset_cycles;
uint m68ki_tracing = 0;
uint m68ki_address_space;
@ -903,9 +902,9 @@ void m68k_set_cpu_type(unsigned int cpu_type)
int m68k_execute(int num_cycles)
{
/* eat up any reset cycles */
if (m68ki_reset_cycles) {
int rc = m68ki_reset_cycles;
m68ki_reset_cycles = 0;
if (RESET_CYCLES) {
int rc = RESET_CYCLES;
RESET_CYCLES = 0;
num_cycles -= rc;
if (num_cycles <= 0)
return rc;
@ -1080,7 +1079,7 @@ void m68k_pulse_reset(void)
CPU_RUN_MODE = RUN_MODE_NORMAL;
m68ki_reset_cycles = CYC_EXCEPTION[EXCEPTION_RESET];
RESET_CYCLES = CYC_EXCEPTION[EXCEPTION_RESET];
}
/* Pulse the HALT line on the CPU */

3
m68kcpu.h
View file

@ -369,6 +369,7 @@ extern "C" {
#define CYC_SHIFT m68ki_cpu.cyc_shift
#define CYC_RESET m68ki_cpu.cyc_reset
#define HAS_PMMU m68ki_cpu.has_pmmu
#define RESET_CYCLES m68ki_cpu.reset_cycles
#define CALLBACK_INT_ACK m68ki_cpu.int_ack_callback
@ -944,6 +945,7 @@ typedef struct
uint instr_mode; /* Stores whether we are in instruction mode or group 0/1 exception mode */
uint run_mode; /* Stores whether we are processing a reset, bus error, address error, or something else */
int has_pmmu; /* Indicates if a PMMU available (yes on 030, 040, no on EC030) */
uint reset_cycles;
/* Clocks required for instructions / exceptions */
uint cyc_bcc_notake_b;
@ -980,7 +982,6 @@ typedef struct
extern m68ki_cpu_core m68ki_cpu;
extern sint m68ki_remaining_cycles;
extern uint m68ki_reset_cycles;
extern uint m68ki_tracing;
extern const uint8 m68ki_shift_8_table[];
extern const uint16 m68ki_shift_16_table[];