Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added initial attempt at instruction timings for 8087/287/387.

Browse source 
Also added 287XL using 387 timings.
This commit is contained in:
SarahW 2020-01-24 20:33:35 +00:00
commit 4875f24b53
7 changed files with 153 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

90
src/x87_ops_misc.h
View file

@ -4,7 +4,7 @@ static int opFSTSW_AX(uint32_t fetchdat)
cpu_state.pc++;
if (fplog) pclog("FSTSW\n");
AX = cpu_state.npxs;
CLOCK_CYCLES(3);
CLOCK_CYCLES(x87_timings.fstcw_sw);
return 0;
}
@ -14,7 +14,7 @@ static int opFNOP(uint32_t fetchdat)
{
FP_ENTER();
cpu_state.pc++;
CLOCK_CYCLES(4);
CLOCK_CYCLES(x87_timings.fnop);
return 0;
}
@ -23,7 +23,7 @@ static int opFCLEX(uint32_t fetchdat)
FP_ENTER();
cpu_state.pc++;
cpu_state.npxs &= 0xff00;
CLOCK_CYCLES(4);
CLOCK_CYCLES(x87_timings.fclex);
return 0;
}
@ -37,7 +37,7 @@ static int opFINIT(uint32_t fetchdat)
*(uint64_t *)cpu_state.tag = 0;
cpu_state.TOP = 0;
cpu_state.ismmx = 0;
CLOCK_CYCLES(17);
CLOCK_CYCLES(x87_timings.finit);
CPU_BLOCK_END();
return 0;
}
@ -49,7 +49,7 @@ static int opFFREE(uint32_t fetchdat)
cpu_state.pc++;
if (fplog) pclog("FFREE\n");
cpu_state.tag[(cpu_state.TOP + fetchdat) & 7] = TAG_EMPTY;
CLOCK_CYCLES(3);
CLOCK_CYCLES(x87_timings.ffree);
return 0;
}
@ -60,7 +60,7 @@ static int opFST(uint32_t fetchdat)
if (fplog) pclog("FST\n");
ST(fetchdat & 7) = ST(0);
cpu_state.tag[(cpu_state.TOP + fetchdat) & 7] = cpu_state.tag[cpu_state.TOP & 7];
CLOCK_CYCLES(3);
CLOCK_CYCLES(x87_timings.fst);
return 0;
}
@ -72,7 +72,7 @@ static int opFSTP(uint32_t fetchdat)
ST(fetchdat & 7) = ST(0);
cpu_state.tag[(cpu_state.TOP + fetchdat) & 7] = cpu_state.tag[cpu_state.TOP & 7];
x87_pop();
CLOCK_CYCLES(3);
CLOCK_CYCLES(x87_timings.fst);
return 0;
}
@ -120,7 +120,7 @@ static int FSTOR()
!cpu_state.TOP && (*(uint64_t *)cpu_state.tag == 0x0101010101010101ull))
cpu_state.ismmx = 1;
CLOCK_CYCLES((cr0 & 1) ? 34 : 44);
CLOCK_CYCLES(x87_timings.frstor);
if (fplog) pclog("FRSTOR %08X:%08X %i %i %04X\n", easeg, cpu_state.eaaddr, cpu_state.ismmx, cpu_state.TOP, x87_gettag());
return cpu_state.abrt;
}
@ -283,7 +283,7 @@ static int FSAVE()
cpu_state.TOP = 0;
cpu_state.ismmx = 0;
CLOCK_CYCLES((cr0 & 1) ? 56 : 67);
CLOCK_CYCLES(x87_timings.fsave);
return cpu_state.abrt;
}
static int opFSAVE_a16(uint32_t fetchdat)
@ -310,7 +310,7 @@ static int opFSTSW_a16(uint32_t fetchdat)
SEG_CHECK_WRITE(cpu_state.ea_seg);
if (fplog) pclog("FSTSW %08X:%08X\n", easeg, cpu_state.eaaddr);
seteaw((cpu_state.npxs & 0xC7FF) | ((cpu_state.TOP & 7) << 11));
CLOCK_CYCLES(3);
CLOCK_CYCLES(x87_timings.fstcw_sw);
return cpu_state.abrt;
}
static int opFSTSW_a32(uint32_t fetchdat)
@ -320,7 +320,7 @@ static int opFSTSW_a32(uint32_t fetchdat)
SEG_CHECK_WRITE(cpu_state.ea_seg);
if (fplog) pclog("FSTSW %08X:%08X\n", easeg, cpu_state.eaaddr);
seteaw((cpu_state.npxs & 0xC7FF) | ((cpu_state.TOP & 7) << 11));
CLOCK_CYCLES(3);
CLOCK_CYCLES(x87_timings.fstcw_sw);
return cpu_state.abrt;
}
@ -338,7 +338,7 @@ static int opFLD(uint32_t fetchdat)
x87_push(ST(fetchdat&7));
cpu_state.tag[cpu_state.TOP&7] = old_tag;
cpu_state.MM[cpu_state.TOP&7].q = old_i64;
CLOCK_CYCLES(4);
CLOCK_CYCLES(x87_timings.fld);
return 0;
}
@ -360,7 +360,7 @@ static int opFXCH(uint32_t fetchdat)
cpu_state.MM[cpu_state.TOP&7].q = cpu_state.MM[(cpu_state.TOP + fetchdat) & 7].q;
cpu_state.MM[(cpu_state.TOP + fetchdat) & 7].q = old_i64;
CLOCK_CYCLES(4);
CLOCK_CYCLES(x87_timings.fxch);
return 0;
}
@ -371,7 +371,7 @@ static int opFCHS(uint32_t fetchdat)
if (fplog) pclog("FCHS\n");
ST(0) = -ST(0);
cpu_state.tag[cpu_state.TOP&7] = TAG_VALID;
CLOCK_CYCLES(6);
CLOCK_CYCLES(x87_timings.fchs);
return 0;
}
@ -382,7 +382,7 @@ static int opFABS(uint32_t fetchdat)
if (fplog) pclog("FABS %f\n", ST(0));
ST(0) = fabs(ST(0));
cpu_state.tag[cpu_state.TOP&7] = TAG_VALID;
CLOCK_CYCLES(3);
CLOCK_CYCLES(x87_timings.fabs);
return 0;
}
@ -394,7 +394,7 @@ static int opFTST(uint32_t fetchdat)
cpu_state.npxs &= ~(C0|C2|C3);
if (ST(0) == 0.0) cpu_state.npxs |= C3;
else if (ST(0) < 0.0) cpu_state.npxs |= C0;
CLOCK_CYCLES(4);
CLOCK_CYCLES(x87_timings.ftst);
return 0;
}
@ -408,7 +408,7 @@ static int opFXAM(uint32_t fetchdat)
else if (ST(0) == 0.0) cpu_state.npxs |= C3;
else cpu_state.npxs |= C2;
if (ST(0) < 0.0) cpu_state.npxs |= C1;
CLOCK_CYCLES(8);
CLOCK_CYCLES(x87_timings.fxam);
return 0;
}
@ -418,7 +418,7 @@ static int opFLD1(uint32_t fetchdat)
cpu_state.pc++;
if (fplog) pclog("FLD1\n");
x87_push(1.0);
CLOCK_CYCLES(4);
CLOCK_CYCLES(x87_timings.fld_z1);
return 0;
}
@ -428,7 +428,7 @@ static int opFLDL2T(uint32_t fetchdat)
cpu_state.pc++;
if (fplog) pclog("FLDL2T\n");
x87_push(3.3219280948873623);
CLOCK_CYCLES(8);
CLOCK_CYCLES(x87_timings.fld_const);
return 0;
}
@ -438,7 +438,7 @@ static int opFLDL2E(uint32_t fetchdat)
cpu_state.pc++;
if (fplog) pclog("FLDL2E\n");
x87_push(1.4426950408889634);
CLOCK_CYCLES(8);
CLOCK_CYCLES(x87_timings.fld_const);
return 0;
}
@ -448,7 +448,7 @@ static int opFLDPI(uint32_t fetchdat)
cpu_state.pc++;
if (fplog) pclog("FLDPI\n");
x87_push(3.141592653589793);
CLOCK_CYCLES(8);
CLOCK_CYCLES(x87_timings.fld_const);
return 0;
}
@ -458,7 +458,7 @@ static int opFLDEG2(uint32_t fetchdat)
cpu_state.pc++;
if (fplog) pclog("FLDEG2\n");
x87_push(0.3010299956639812);
CLOCK_CYCLES(8);
CLOCK_CYCLES(x87_timings.fld_const);
return 0;
}
@ -468,7 +468,7 @@ static int opFLDLN2(uint32_t fetchdat)
cpu_state.pc++;
if (fplog) pclog("FLDLN2\n");
x87_push_u64(0x3fe62e42fefa39f0ull);
CLOCK_CYCLES(8);
CLOCK_CYCLES(x87_timings.fld_const);
return 0;
}
@ -479,7 +479,7 @@ static int opFLDZ(uint32_t fetchdat)
if (fplog) pclog("FLDZ\n");
x87_push(0.0);
cpu_state.tag[cpu_state.TOP&7] = TAG_VALID;
CLOCK_CYCLES(4);
CLOCK_CYCLES(x87_timings.fld_z1);
return 0;
}
@ -490,7 +490,7 @@ static int opF2XM1(uint32_t fetchdat)
if (fplog) pclog("F2XM1\n");
ST(0) = pow(2.0, ST(0)) - 1.0;
cpu_state.tag[cpu_state.TOP&7] = TAG_VALID;
CLOCK_CYCLES(200);
CLOCK_CYCLES(x87_timings.f2xm1);
return 0;
}
@ -502,7 +502,7 @@ static int opFYL2X(uint32_t fetchdat)
ST(1) = ST(1) * (log(ST(0)) / log(2.0));
cpu_state.tag[(cpu_state.TOP + 1) & 7] = TAG_VALID;
x87_pop();
CLOCK_CYCLES(250);
CLOCK_CYCLES(x87_timings.fyl2x);
return 0;
}
@ -514,7 +514,7 @@ static int opFYL2XP1(uint32_t fetchdat)
ST(1) = ST(1) * (log(ST(0)+1.0) / log(2.0));
cpu_state.tag[(cpu_state.TOP + 1) & 7] = TAG_VALID;
x87_pop();
CLOCK_CYCLES(250);
CLOCK_CYCLES(x87_timings.fyl2xp1);
return 0;
}
@ -527,7 +527,7 @@ static int opFPTAN(uint32_t fetchdat)
cpu_state.tag[cpu_state.TOP&7] = TAG_VALID;
x87_push(1.0);
cpu_state.npxs &= ~C2;
CLOCK_CYCLES(235);
CLOCK_CYCLES(x87_timings.fptan);
return 0;
}
@ -539,7 +539,7 @@ static int opFPATAN(uint32_t fetchdat)
ST(1) = atan2(ST(1), ST(0));
cpu_state.tag[(cpu_state.TOP + 1) & 7] = TAG_VALID;
x87_pop();
CLOCK_CYCLES(250);
CLOCK_CYCLES(x87_timings.fpatan);
return 0;
}
@ -549,7 +549,7 @@ static int opFDECSTP(uint32_t fetchdat)
cpu_state.pc++;
if (fplog) pclog("FDECSTP\n");
cpu_state.TOP--;
CLOCK_CYCLES(4);
CLOCK_CYCLES(x87_timings.fincdecstp);
return 0;
}
@ -559,7 +559,7 @@ static int opFINCSTP(uint32_t fetchdat)
cpu_state.pc++;
if (fplog) pclog("FDECSTP\n");
cpu_state.TOP++;
CLOCK_CYCLES(4);
CLOCK_CYCLES(x87_timings.fincdecstp);
return 0;
}
@ -577,7 +577,7 @@ static int opFPREM(uint32_t fetchdat)
if (temp64 & 4) cpu_state.npxs|=C0;
if (temp64 & 2) cpu_state.npxs|=C3;
if (temp64 & 1) cpu_state.npxs|=C1;
CLOCK_CYCLES(100);
CLOCK_CYCLES(x87_timings.fprem);
return 0;
}
static int opFPREM1(uint32_t fetchdat)
@ -594,7 +594,7 @@ static int opFPREM1(uint32_t fetchdat)
if (temp64 & 4) cpu_state.npxs|=C0;
if (temp64 & 2) cpu_state.npxs|=C3;
if (temp64 & 1) cpu_state.npxs|=C1;
CLOCK_CYCLES(100);
CLOCK_CYCLES(x87_timings.fprem1);
return 0;
}
@ -605,7 +605,7 @@ static int opFSQRT(uint32_t fetchdat)
if (fplog) pclog("FSQRT\n");
ST(0) = sqrt(ST(0));
cpu_state.tag[cpu_state.TOP&7] = TAG_VALID;
CLOCK_CYCLES(83);
CLOCK_CYCLES(x87_timings.fsqrt);
return 0;
}
@ -620,7 +620,7 @@ static int opFSINCOS(uint32_t fetchdat)
cpu_state.tag[cpu_state.TOP&7] = TAG_VALID;
x87_push(cos(td));
cpu_state.npxs &= ~C2;
CLOCK_CYCLES(330);
CLOCK_CYCLES(x87_timings.fsincos);
return 0;
}
@ -632,7 +632,7 @@ static int opFRNDINT(uint32_t fetchdat)
ST(0) = (double)x87_fround(ST(0));
cpu_state.tag[cpu_state.TOP&7] = TAG_VALID;
if (fplog) pclog("%g\n", ST(0));
CLOCK_CYCLES(21);
CLOCK_CYCLES(x87_timings.frndint);
return 0;
}
@ -645,7 +645,7 @@ static int opFSCALE(uint32_t fetchdat)
temp64 = (int64_t)ST(1);
ST(0) = ST(0) * pow(2.0, (double)temp64);
cpu_state.tag[cpu_state.TOP&7] = TAG_VALID;
CLOCK_CYCLES(30);
CLOCK_CYCLES(x87_timings.fscale);
return 0;
}
@ -657,7 +657,7 @@ static int opFSIN(uint32_t fetchdat)
ST(0) = sin(ST(0));
cpu_state.tag[cpu_state.TOP&7] = TAG_VALID;
cpu_state.npxs &= ~C2;
CLOCK_CYCLES(300);
CLOCK_CYCLES(x87_timings.fsin_cos);
return 0;
}
@ -669,7 +669,7 @@ static int opFCOS(uint32_t fetchdat)
ST(0) = cos(ST(0));
cpu_state.tag[cpu_state.TOP&7] = TAG_VALID;
cpu_state.npxs &= ~C2;
CLOCK_CYCLES(300);
CLOCK_CYCLES(x87_timings.fsin_cos);
return 0;
}
@ -697,7 +697,7 @@ static int FLDENV()
cpu_state.TOP = (cpu_state.npxs >> 11) & 7;
break;
}
CLOCK_CYCLES((cr0 & 1) ? 34 : 44);
CLOCK_CYCLES(x87_timings.fldenv);
return cpu_state.abrt;
}
@ -729,7 +729,7 @@ static int opFLDCW_a16(uint32_t fetchdat)
if (cpu_state.abrt) return 1;
cpu_state.npxc = tempw;
codegen_set_rounding_mode((cpu_state.npxc >> 10) & 3);
CLOCK_CYCLES(4);
CLOCK_CYCLES(x87_timings.fldcw);
return 0;
}
static int opFLDCW_a32(uint32_t fetchdat)
@ -743,7 +743,7 @@ static int opFLDCW_a32(uint32_t fetchdat)
if (cpu_state.abrt) return 1;
cpu_state.npxc = tempw;
codegen_set_rounding_mode((cpu_state.npxc >> 10) & 3);
CLOCK_CYCLES(4);
CLOCK_CYCLES(x87_timings.fldcw);
return 0;
}
@ -787,7 +787,7 @@ static int FSTENV()
writememl(easeg,cpu_state.eaaddr+24,x87_op_seg);
break;
}
CLOCK_CYCLES((cr0 & 1) ? 56 : 67);
CLOCK_CYCLES(x87_timings.fstenv);
return cpu_state.abrt;
}
@ -815,7 +815,7 @@ static int opFSTCW_a16(uint32_t fetchdat)
SEG_CHECK_WRITE(cpu_state.ea_seg);
if (fplog) pclog("FSTCW %08X:%08X\n", easeg, cpu_state.eaaddr);
seteaw(cpu_state.npxc);
CLOCK_CYCLES(3);
CLOCK_CYCLES(x87_timings.fstcw_sw);
return cpu_state.abrt;
}
static int opFSTCW_a32(uint32_t fetchdat)
@ -825,7 +825,7 @@ static int opFSTCW_a32(uint32_t fetchdat)
SEG_CHECK_WRITE(cpu_state.ea_seg);
if (fplog) pclog("FSTCW %08X:%08X\n", easeg, cpu_state.eaaddr);
seteaw(cpu_state.npxc);
CLOCK_CYCLES(3);
CLOCK_CYCLES(x87_timings.fstcw_sw);
return cpu_state.abrt;
}