Added prefetch timing approximation for 286/386 CPUs, with configurable memory timing.
This commit is contained in:
parent
c5889e311f
commit
1b73963997
33 changed files with 1139 additions and 261 deletions
|
|
@ -25,8 +25,11 @@
|
|||
cpu_state.pc += offset; \
|
||||
CLOCK_CYCLES_ALWAYS(timing_bt); \
|
||||
CPU_BLOCK_END(); \
|
||||
PREFETCH_RUN(timing_bt+timing_bnt, 2, -1, 0,0,0,0, 0); \
|
||||
PREFETCH_FLUSH(); \
|
||||
return 1; \
|
||||
} \
|
||||
PREFETCH_RUN(timing_bnt, 2, -1, 0,0,0,0, 0); \
|
||||
return 0; \
|
||||
} \
|
||||
\
|
||||
|
|
@ -39,8 +42,11 @@
|
|||
cpu_state.pc += offset; \
|
||||
CLOCK_CYCLES_ALWAYS(timing_bt); \
|
||||
CPU_BLOCK_END(); \
|
||||
PREFETCH_RUN(timing_bt+timing_bnt, 3, -1, 0,0,0,0, 0); \
|
||||
PREFETCH_FLUSH(); \
|
||||
return 1; \
|
||||
} \
|
||||
PREFETCH_RUN(timing_bnt, 3, -1, 0,0,0,0, 0); \
|
||||
return 0; \
|
||||
} \
|
||||
\
|
||||
|
|
@ -53,8 +59,11 @@
|
|||
cpu_state.pc += offset; \
|
||||
CLOCK_CYCLES_ALWAYS(timing_bt); \
|
||||
CPU_BLOCK_END(); \
|
||||
PREFETCH_RUN(timing_bt+timing_bnt, 5, -1, 0,0,0,0, 0); \
|
||||
PREFETCH_FLUSH(); \
|
||||
return 1; \
|
||||
} \
|
||||
PREFETCH_RUN(timing_bnt, 5, -1, 0,0,0,0, 0); \
|
||||
return 0; \
|
||||
} \
|
||||
|
||||
|
|
@ -82,10 +91,12 @@ static int opLOOPNE_w(uint32_t fetchdat)
|
|||
int8_t offset = (int8_t)getbytef();
|
||||
CX--;
|
||||
CLOCK_CYCLES((is486) ? 7 : 11);
|
||||
PREFETCH_RUN(11, 2, -1, 0,0,0,0, 0);
|
||||
if (CX && !ZF_SET())
|
||||
{
|
||||
cpu_state.pc += offset;
|
||||
CPU_BLOCK_END();
|
||||
PREFETCH_FLUSH();
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
|
|
@ -95,10 +106,12 @@ static int opLOOPNE_l(uint32_t fetchdat)
|
|||
int8_t offset = (int8_t)getbytef();
|
||||
ECX--;
|
||||
CLOCK_CYCLES((is486) ? 7 : 11);
|
||||
PREFETCH_RUN(11, 2, -1, 0,0,0,0, 0);
|
||||
if (ECX && !ZF_SET())
|
||||
{
|
||||
cpu_state.pc += offset;
|
||||
CPU_BLOCK_END();
|
||||
PREFETCH_FLUSH();
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
|
|
@ -109,10 +122,12 @@ static int opLOOPE_w(uint32_t fetchdat)
|
|||
int8_t offset = (int8_t)getbytef();
|
||||
CX--;
|
||||
CLOCK_CYCLES((is486) ? 7 : 11);
|
||||
PREFETCH_RUN(11, 2, -1, 0,0,0,0, 0);
|
||||
if (CX && ZF_SET())
|
||||
{
|
||||
cpu_state.pc += offset;
|
||||
CPU_BLOCK_END();
|
||||
PREFETCH_FLUSH();
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
|
|
@ -122,10 +137,12 @@ static int opLOOPE_l(uint32_t fetchdat)
|
|||
int8_t offset = (int8_t)getbytef();
|
||||
ECX--;
|
||||
CLOCK_CYCLES((is486) ? 7 : 11);
|
||||
PREFETCH_RUN(11, 2, -1, 0,0,0,0, 0);
|
||||
if (ECX && ZF_SET())
|
||||
{
|
||||
cpu_state.pc += offset;
|
||||
CPU_BLOCK_END();
|
||||
PREFETCH_FLUSH();
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
|
|
@ -136,10 +153,12 @@ static int opLOOP_w(uint32_t fetchdat)
|
|||
int8_t offset = (int8_t)getbytef();
|
||||
CX--;
|
||||
CLOCK_CYCLES((is486) ? 7 : 11);
|
||||
PREFETCH_RUN(11, 2, -1, 0,0,0,0, 0);
|
||||
if (CX)
|
||||
{
|
||||
cpu_state.pc += offset;
|
||||
CPU_BLOCK_END();
|
||||
PREFETCH_FLUSH();
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
|
|
@ -149,10 +168,12 @@ static int opLOOP_l(uint32_t fetchdat)
|
|||
int8_t offset = (int8_t)getbytef();
|
||||
ECX--;
|
||||
CLOCK_CYCLES((is486) ? 7 : 11);
|
||||
PREFETCH_RUN(11, 2, -1, 0,0,0,0, 0);
|
||||
if (ECX)
|
||||
{
|
||||
cpu_state.pc += offset;
|
||||
CPU_BLOCK_END();
|
||||
PREFETCH_FLUSH();
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
|
|
@ -167,8 +188,11 @@ static int opJCXZ(uint32_t fetchdat)
|
|||
cpu_state.pc += offset;
|
||||
CLOCK_CYCLES(4);
|
||||
CPU_BLOCK_END();
|
||||
PREFETCH_RUN(9, 2, -1, 0,0,0,0, 0);
|
||||
PREFETCH_FLUSH();
|
||||
return 1;
|
||||
}
|
||||
PREFETCH_RUN(5, 2, -1, 0,0,0,0, 0);
|
||||
return 0;
|
||||
}
|
||||
static int opJECXZ(uint32_t fetchdat)
|
||||
|
|
@ -180,8 +204,11 @@ static int opJECXZ(uint32_t fetchdat)
|
|||
cpu_state.pc += offset;
|
||||
CLOCK_CYCLES(4);
|
||||
CPU_BLOCK_END();
|
||||
PREFETCH_RUN(9, 2, -1, 0,0,0,0, 0);
|
||||
PREFETCH_FLUSH();
|
||||
return 1;
|
||||
}
|
||||
PREFETCH_RUN(5, 2, -1, 0,0,0,0, 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -192,6 +219,8 @@ static int opJMP_r8(uint32_t fetchdat)
|
|||
cpu_state.pc += offset;
|
||||
CPU_BLOCK_END();
|
||||
CLOCK_CYCLES((is486) ? 3 : 7);
|
||||
PREFETCH_RUN(7, 2, -1, 0,0,0,0, 0);
|
||||
PREFETCH_FLUSH();
|
||||
return 0;
|
||||
}
|
||||
static int opJMP_r16(uint32_t fetchdat)
|
||||
|
|
@ -200,6 +229,8 @@ static int opJMP_r16(uint32_t fetchdat)
|
|||
cpu_state.pc += offset;
|
||||
CPU_BLOCK_END();
|
||||
CLOCK_CYCLES((is486) ? 3 : 7);
|
||||
PREFETCH_RUN(7, 3, -1, 0,0,0,0, 0);
|
||||
PREFETCH_FLUSH();
|
||||
return 0;
|
||||
}
|
||||
static int opJMP_r32(uint32_t fetchdat)
|
||||
|
|
@ -208,6 +239,8 @@ static int opJMP_r32(uint32_t fetchdat)
|
|||
cpu_state.pc += offset;
|
||||
CPU_BLOCK_END();
|
||||
CLOCK_CYCLES((is486) ? 3 : 7);
|
||||
PREFETCH_RUN(7, 5, -1, 0,0,0,0, 0);
|
||||
PREFETCH_FLUSH();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -219,6 +252,8 @@ static int opJMP_far_a16(uint32_t fetchdat)
|
|||
cpu_state.pc = addr;
|
||||
loadcsjmp(seg, oxpc);
|
||||
CPU_BLOCK_END();
|
||||
PREFETCH_RUN(11, 5, -1, 0,0,0,0, 0);
|
||||
PREFETCH_FLUSH();
|
||||
return 0;
|
||||
}
|
||||
static int opJMP_far_a32(uint32_t fetchdat)
|
||||
|
|
@ -229,6 +264,8 @@ static int opJMP_far_a32(uint32_t fetchdat)
|
|||
cpu_state.pc = addr;
|
||||
loadcsjmp(seg, oxpc);
|
||||
CPU_BLOCK_END();
|
||||
PREFETCH_RUN(11, 7, -1, 0,0,0,0, 0);
|
||||
PREFETCH_FLUSH();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -239,6 +276,8 @@ static int opCALL_r16(uint32_t fetchdat)
|
|||
cpu_state.pc += addr;
|
||||
CPU_BLOCK_END();
|
||||
CLOCK_CYCLES((is486) ? 3 : 7);
|
||||
PREFETCH_RUN(7, 3, -1, 0,0,1,0, 0);
|
||||
PREFETCH_FLUSH();
|
||||
return 0;
|
||||
}
|
||||
static int opCALL_r32(uint32_t fetchdat)
|
||||
|
|
@ -248,6 +287,8 @@ static int opCALL_r32(uint32_t fetchdat)
|
|||
cpu_state.pc += addr;
|
||||
CPU_BLOCK_END();
|
||||
CLOCK_CYCLES((is486) ? 3 : 7);
|
||||
PREFETCH_RUN(7, 5, -1, 0,0,0,1, 0);
|
||||
PREFETCH_FLUSH();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -260,6 +301,8 @@ static int opRET_w(uint32_t fetchdat)
|
|||
CPU_BLOCK_END();
|
||||
|
||||
CLOCK_CYCLES((is486) ? 5 : 10);
|
||||
PREFETCH_RUN(10, 1, -1, 1,0,0,0, 0);
|
||||
PREFETCH_FLUSH();
|
||||
return 0;
|
||||
}
|
||||
static int opRET_l(uint32_t fetchdat)
|
||||
|
|
@ -271,6 +314,8 @@ static int opRET_l(uint32_t fetchdat)
|
|||
CPU_BLOCK_END();
|
||||
|
||||
CLOCK_CYCLES((is486) ? 5 : 10);
|
||||
PREFETCH_RUN(10, 1, -1, 0,1,0,0, 0);
|
||||
PREFETCH_FLUSH();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -286,6 +331,8 @@ static int opRET_w_imm(uint32_t fetchdat)
|
|||
CPU_BLOCK_END();
|
||||
|
||||
CLOCK_CYCLES((is486) ? 5 : 10);
|
||||
PREFETCH_RUN(10, 5, -1, 1,0,0,0, 0);
|
||||
PREFETCH_FLUSH();
|
||||
return 0;
|
||||
}
|
||||
static int opRET_l_imm(uint32_t fetchdat)
|
||||
|
|
@ -300,6 +347,8 @@ static int opRET_l_imm(uint32_t fetchdat)
|
|||
CPU_BLOCK_END();
|
||||
|
||||
CLOCK_CYCLES((is486) ? 5 : 10);
|
||||
PREFETCH_RUN(10, 5, -1, 0,1,0,0, 0);
|
||||
PREFETCH_FLUSH();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue