Macintosh-SW/mpw
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw.git synced 2025-02-02 14:30:40 +00:00
Code Issues Projects Releases Wiki Activity

SANE comparisons and status register updates

Browse Source
This commit is contained in:
Kelvin Sherlock 2013-03-31 23:50:37 -04:00
parent cbbab65d2c
commit af3af77433
2 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
toolbox/sane.cpp
View File

@ -207,7 +207,7 @@ namespace SANE
return 0; return 0;
} }
#endif #endif
uint16_t fx2dec() uint16_t fx2dec()
{ {
// extended (80-bit fp) to decimal // extended (80-bit fp) to decimal
@ -383,7 +383,58 @@ namespace SANE
return 0; return 0;
} }
extern "C" void cpuSetFlagsShift(BOOLE z, BOOLE n, BOOLE c, BOOLE v);
template<class SrcType, class DestType = extended>
uint16_t fcmp(const char *name)
{
uint16_t op;
uint32_t dest;
uint32_t src;
// TODO op & 0x0f == 0x08 vs 0x0a
// for signaling unordered & NaN
StackFrame<10>(src, dest, op);
Log(" %s(%08x, %08x, %04x)\n", name, src, dest, op);
SrcType s = readnum<SrcType>(src);
DestType d = readnum<DestType>(dest);
if (ToolBox::Trace)
{
std::string tmp1 = std::to_string(d);
std::string tmp2 = std::to_string(s);
Log(" %s <> %s\n", tmp1.c_str(), tmp2.c_str());
}
//
// check if ordered...
if (d > s)
{
cpuSetFlagsShift(false, false, false, false);
return 0;
}
if (d < s)
{
cpuSetFlagsShift(false, true, true, false);
return 0;
}
if (d == s)
{
cpuSetFlagsShift(true, false, false, false);
return 0;
}
// unorderable?
// signal?
cpuSetFlagsShift(false, false, false, true);
return 0;
}
extern "C" void cpuSetFlagsAbs(UWO f);
uint16_t fp68k(uint16_t trap) uint16_t fp68k(uint16_t trap)
{ {
uint16_t op; uint16_t op;
@ -394,6 +445,8 @@ namespace SANE
Log("%04x FP68K(%04x)\n", op); Log("%04x FP68K(%04x)\n", op);
cpuSetFlagsAbs(0x4);
if (op == 0x000b) return fx2dec(); if (op == 0x000b) return fx2dec();
switch(op) switch(op)
@ -430,7 +483,20 @@ namespace SANE
case 0x2006: return fdiv<int16_t>("FDIVI"); case 0x2006: return fdiv<int16_t>("FDIVI");
case 0x2806: return fdiv<int32_t>("FDIVL"); case 0x2806: return fdiv<int32_t>("FDIVL");
// comparison
case 0x0008: return fcmp<extended>("FCMPX");
case 0x0808: return fcmp<double>("FCMPD");
case 0x1008: return fcmp<float>("FCMPS");
//case 0x3008: return fcmp<complex>("FCMPC");
case 0x2008: return fcmp<int16_t>("FCMPI");
case 0x2808: return fcmp<int32_t>("FCMPL");
case 0x000a: return fcmp<extended>("FCPXX");
case 0x080a: return fcmp<double>("FCPXD");
case 0x100a: return fcmp<float>("FCPXS");
//case 0x300a: return fcmp<complex>("FCPXC");
case 0x200a: return fcmp<int16_t>("FCPXI");
case 0x280a: return fcmp<int32_t>("FCPXL");
// conversion // conversion
@ -470,6 +536,7 @@ namespace SANE
return fconvert<int32_t, extended>("FL2X"); return fconvert<int32_t, extended>("FL2X");
break; break;
} }

2
toolbox/toolbox.cpp
View File

@ -291,6 +291,8 @@ namespace ToolBox {
// sane // sane
case 0xa9Eb: case 0xa9Eb:
d0 = SANE::fp68k(trap); d0 = SANE::fp68k(trap);
cpuSetDReg(0, d0);
return; // SANE sets the flags.
break; break;
case 0x0a9ee: case 0x0a9ee: