more fp fixes
fix unaligned accesses in mmaped disk device
src/arch/sparc/isa/decoder.isa:
get (ld|st)fsr ops working right. In reality the fp enable check needs to go higher up in the emitted code
src/arch/sparc/isa/formats/basic.isa:
move the cexec into the aexec field
src/cpu/exetrace.cc:
copy the exception state from legion when we get it wrong. We aren't going to get it right without an fp emulation layer
src/dev/sparc/mm_disk.cc:
src/dev/sparc/mm_disk.hh:
fix unaligned accesses in the memory mapped disk device
--HG--
extra : convert_revision : aaa33096b08cf0563fe291d984a87493a117e528
This commit is contained in:
Ali Saidi
parent
ecef27f172
commit
ebb6972dd3
|
|
@ -807,14 +807,12 @@ decode OP default Unknown::unknown()
|
|||
float t = Frds.sw;
|
||||
if (t != Frs2s.sf)
|
||||
Fsr = insertBits(Fsr, 4,0, 0x01);
|
||||
Fsr |= Fsr<4:0> << 5;
|
||||
}});
|
||||
0xD2: fdtoi({{
|
||||
Frds.sw = static_cast<int32_t>(Frs2.df);
|
||||
double t = Frds.sw;
|
||||
if (t != Frs2.df)
|
||||
Fsr = insertBits(Fsr, 4,0, 0x01);
|
||||
Fsr |= Fsr<4:0> << 5;
|
||||
}});
|
||||
0xD3: FpUnimpl::fqtoi();
|
||||
default: FailUnimpl::fpop1();
|
||||
|
|
@ -1245,18 +1243,30 @@ decode OP default Unknown::unknown()
|
|||
format Trap {
|
||||
0x20: Load::ldf({{Frds.uw = Mem.uw;}});
|
||||
0x21: decode RD {
|
||||
0x0: Load::ldfsr({{Fsr = Mem.uw | Fsr<63:32>;}});
|
||||
0x1: Load::ldxfsr({{Fsr = Mem.udw;}});
|
||||
0x0: Load::ldfsr({{fault = checkFpEnableFault(xc);
|
||||
if (fault)
|
||||
return fault;
|
||||
Fsr = Mem.uw | Fsr<63:32>;}});
|
||||
0x1: Load::ldxfsr({{fault = checkFpEnableFault(xc);
|
||||
if (fault)
|
||||
return fault;
|
||||
Fsr = Mem.udw;}});
|
||||
default: FailUnimpl::ldfsrOther();
|
||||
}
|
||||
0x22: ldqf({{fault = new FpDisabled;}});
|
||||
0x23: Load::lddf({{Frd.udw = Mem.udw;}});
|
||||
0x24: Store::stf({{Mem.uw = Frds.uw;}});
|
||||
0x25: decode RD {
|
||||
0x0: Store::stfsr({{Mem.uw = Fsr<31:0>;
|
||||
Fsr = insertBits(Fsr,16,14,0);}});
|
||||
0x1: Store::stxfsr({{Mem.udw = Fsr;
|
||||
0x0: Store::stfsr({{fault = checkFpEnableFault(xc);
|
||||
if (fault)
|
||||
return fault;
|
||||
Mem.uw = Fsr<31:0>;
|
||||
Fsr = insertBits(Fsr,16,14,0);}});
|
||||
0x1: Store::stxfsr({{fault = checkFpEnableFault(xc);
|
||||
if (fault)
|
||||
return fault;
|
||||
Mem.udw = Fsr;
|
||||
Fsr = insertBits(Fsr,16,14,0);}});
|
||||
default: FailUnimpl::stfsrOther();
|
||||
}
|
||||
0x26: stqf({{fault = new FpDisabled;}});
|
||||
|
|
|
|||
|
|
@ -106,6 +106,7 @@ def format BasicOperate(code, *flags) {{
|
|||
|
||||
def format FpBasic(code, *flags) {{
|
||||
fp_code = """
|
||||
Fsr |= bits(Fsr,4,0) << 5;
|
||||
Fsr = insertBits(Fsr,4,0,0);
|
||||
#if defined(__sun) || defined (__OpenBSD__)
|
||||
fp_rnd newrnd = FP_RN;
|
||||
|
|
@ -128,7 +129,10 @@ def format FpBasic(code, *flags) {{
|
|||
fesetround(newrnd);
|
||||
#endif
|
||||
"""
|
||||
|
||||
fp_code += code
|
||||
|
||||
|
||||
fp_code += """
|
||||
#if defined(__sun) || defined (__OpenBSD__)
|
||||
fpsetround(oldrnd);
|
||||
|
|
|
|||
|
|
@ -411,8 +411,14 @@ Trace::InstRecord::dump(ostream &outs)
|
|||
if(shared_data->y !=
|
||||
thread->readIntReg(NumIntArchRegs + 1))
|
||||
diffY = true;
|
||||
if(shared_data->fsr != thread->readMiscReg(MISCREG_FSR))
|
||||
if(shared_data->fsr != thread->readMiscReg(MISCREG_FSR)) {
|
||||
diffFsr = true;
|
||||
if (mbits(shared_data->fsr, 63,10) ==
|
||||
mbits(thread->readMiscReg(MISCREG_FSR), 63,10)) {
|
||||
thread->setMiscReg(MISCREG_FSR, shared_data->fsr);
|
||||
diffFsr = false;
|
||||
}
|
||||
}
|
||||
//if(shared_data->ccr != thread->readMiscReg(MISCREG_CCR))
|
||||
if(shared_data->ccr !=
|
||||
thread->readIntReg(NumIntArchRegs + 2))
|
||||
|
|
@ -664,7 +670,7 @@ Trace::InstRecord::dump(ostream &outs)
|
|||
}
|
||||
|
||||
diffcount++;
|
||||
if (diffcount > 2)
|
||||
if (diffcount > 3)
|
||||
fatal("Differences found between Legion and M5\n");
|
||||
} else
|
||||
diffcount = 0;
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
MmDisk::MmDisk(Params *p)
|
||||
: BasicPioDevice(p), image(p->image), curSector((uint64_t)-1), dirty(false)
|
||||
{
|
||||
std::memset(&bytes, 0, SectorSize);
|
||||
std::memset(&diskData, 0, SectorSize);
|
||||
pioSize = image->size() * SectorSize;
|
||||
}
|
||||
|
||||
|
|
@ -57,9 +57,9 @@ MmDisk::read(PacketPtr pkt)
|
|||
Addr accessAddr;
|
||||
off_t sector;
|
||||
off_t bytes_read;
|
||||
uint16_t *d16;
|
||||
uint32_t *d32;
|
||||
uint64_t *d64;
|
||||
uint16_t d16;
|
||||
uint32_t d32;
|
||||
uint64_t d64;
|
||||
|
||||
assert(pkt->result == Packet::Unknown);
|
||||
assert(pkt->getAddr() >= pioAddr && pkt->getAddr() < pioAddr + pioSize);
|
||||
|
|
@ -68,26 +68,34 @@ MmDisk::read(PacketPtr pkt)
|
|||
sector = accessAddr / SectorSize;
|
||||
|
||||
if (sector != curSector) {
|
||||
if (dirty)
|
||||
bytes_read = image->write(bytes, curSector);
|
||||
bytes_read = image->read(bytes, sector);
|
||||
if (dirty) {
|
||||
bytes_read = image->write(diskData, curSector);
|
||||
assert(bytes_read == SectorSize);
|
||||
}
|
||||
bytes_read = image->read(diskData, sector);
|
||||
assert(bytes_read == SectorSize);
|
||||
curSector = sector;
|
||||
}
|
||||
switch (pkt->getSize()) {
|
||||
case sizeof(uint8_t):
|
||||
pkt->set(bytes[accessAddr % SectorSize]);
|
||||
pkt->set(diskData[accessAddr % SectorSize]);
|
||||
DPRINTF(IdeDisk, "reading byte %#x value= %#x\n", accessAddr, diskData[accessAddr %
|
||||
SectorSize]);
|
||||
break;
|
||||
case sizeof(uint16_t):
|
||||
d16 = (uint16_t*)bytes + (accessAddr % SectorSize)/2;
|
||||
pkt->set(htobe(*d16));
|
||||
memcpy(&d16, diskData + (accessAddr % SectorSize), 2);
|
||||
pkt->set(htobe(d32));
|
||||
DPRINTF(IdeDisk, "reading word %#x value= %#x\n", accessAddr, d16);
|
||||
break;
|
||||
case sizeof(uint32_t):
|
||||
d32 = (uint32_t*)bytes + (accessAddr % SectorSize)/4;
|
||||
pkt->set(htobe(*d32));
|
||||
memcpy(&d32, diskData + (accessAddr % SectorSize), 4);
|
||||
pkt->set(htobe(d32));
|
||||
DPRINTF(IdeDisk, "reading dword %#x value= %#x\n", accessAddr, d32);
|
||||
break;
|
||||
case sizeof(uint64_t):
|
||||
d64 = (uint64_t*)bytes + (accessAddr % SectorSize)/8;
|
||||
pkt->set(htobe(*d64));
|
||||
memcpy(&d64, diskData + (accessAddr % SectorSize), 8);
|
||||
pkt->set(htobe(d64));
|
||||
DPRINTF(IdeDisk, "reading qword %#x value= %#x\n", accessAddr, d64);
|
||||
break;
|
||||
default:
|
||||
panic("Invalid access size\n");
|
||||
|
|
@ -100,10 +108,73 @@ MmDisk::read(PacketPtr pkt)
|
|||
Tick
|
||||
MmDisk::write(PacketPtr pkt)
|
||||
{
|
||||
panic("need to implement\n");
|
||||
M5_DUMMY_RETURN
|
||||
Addr accessAddr;
|
||||
off_t sector;
|
||||
off_t bytes_read;
|
||||
uint16_t d16;
|
||||
uint32_t d32;
|
||||
uint64_t d64;
|
||||
|
||||
assert(pkt->result == Packet::Unknown);
|
||||
assert(pkt->getAddr() >= pioAddr && pkt->getAddr() < pioAddr + pioSize);
|
||||
accessAddr = pkt->getAddr() - pioAddr;
|
||||
|
||||
sector = accessAddr / SectorSize;
|
||||
|
||||
if (sector != curSector) {
|
||||
if (dirty) {
|
||||
bytes_read = image->write(diskData, curSector);
|
||||
assert(bytes_read == SectorSize);
|
||||
}
|
||||
bytes_read = image->read(diskData, sector);
|
||||
assert(bytes_read == SectorSize);
|
||||
curSector = sector;
|
||||
}
|
||||
dirty = true;
|
||||
|
||||
switch (pkt->getSize()) {
|
||||
case sizeof(uint8_t):
|
||||
diskData[accessAddr % SectorSize] = htobe(pkt->get<uint8_t>());
|
||||
DPRINTF(IdeDisk, "writing byte %#x value= %#x\n", accessAddr, diskData[accessAddr %
|
||||
SectorSize]);
|
||||
break;
|
||||
case sizeof(uint16_t):
|
||||
d16 = htobe(pkt->get<uint16_t>());
|
||||
memcpy(diskData + (accessAddr % SectorSize), &d16, 2);
|
||||
DPRINTF(IdeDisk, "writing word %#x value= %#x\n", accessAddr, d16);
|
||||
break;
|
||||
case sizeof(uint32_t):
|
||||
d32 = htobe(pkt->get<uint32_t>());
|
||||
memcpy(diskData + (accessAddr % SectorSize), &d32, 4);
|
||||
DPRINTF(IdeDisk, "writing dword %#x value= %#x\n", accessAddr, d32);
|
||||
break;
|
||||
case sizeof(uint64_t):
|
||||
d64 = htobe(pkt->get<uint64_t>());
|
||||
memcpy(diskData + (accessAddr % SectorSize), &d64, 8);
|
||||
DPRINTF(IdeDisk, "writing qword %#x value= %#x\n", accessAddr, d64);
|
||||
break;
|
||||
default:
|
||||
panic("Invalid access size\n");
|
||||
}
|
||||
|
||||
pkt->result = Packet::Success;
|
||||
return pioDelay;
|
||||
}
|
||||
|
||||
void
|
||||
MmDisk::serialize(std::ostream &os)
|
||||
{
|
||||
// just write any dirty changes to the cow layer it will take care of
|
||||
// serialization
|
||||
int bytes_read;
|
||||
if (dirty) {
|
||||
bytes_read = image->write(diskData, curSector);
|
||||
assert(bytes_read == SectorSize);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
BEGIN_DECLARE_SIM_OBJECT_PARAMS(MmDisk)
|
||||
Param<Addr> pio_addr;
|
||||
|
|
|
|||
|
|
@ -46,10 +46,7 @@ class MmDisk : public BasicPioDevice
|
|||
DiskImage *image;
|
||||
off_t curSector;
|
||||
bool dirty;
|
||||
union {
|
||||
uint8_t bytes[SectorSize];
|
||||
uint32_t words[SectorSize/4];
|
||||
};
|
||||
uint8_t diskData[SectorSize];
|
||||
|
||||
public:
|
||||
struct Params : public BasicPioDevice::Params
|
||||
|
|
@ -64,6 +61,8 @@ class MmDisk : public BasicPioDevice
|
|||
|
||||
virtual Tick read(PacketPtr pkt);
|
||||
virtual Tick write(PacketPtr pkt);
|
||||
|
||||
virtual void serialize(std::ostream &os);
|
||||
};
|
||||
|
||||
#endif //__DEV_SPARC_MM_DISK_HH__
|
||||
|
|
|
|||
Loading…
Reference in a new issue