I combined Gabe's changes with the patch you sent and it appears to work now. I will cleanup the code and submit tonight.
Best, -Rick nathan binkert wrote: > After hearing from Rick some more, I don't believe that this patch is > sufficient. Rick? What about that patch I sent you? > > On Sun, Dec 14, 2008 at 3:24 AM, <[email protected]> wrote: > >> # HG changeset patch >> # User Richard Strong <[email protected]> >> # Date 1228847648 28800 >> # Node ID 436cb149e7563491491e8202f99d80945232fccc >> # Parent a7ce656e32a0253b3f0578c7e9fd0a097e1b905b >> IDE: Fix serialization for the IDE controller. >> >> diff --git a/src/dev/ide_ctrl.cc b/src/dev/ide_ctrl.cc >> --- a/src/dev/ide_ctrl.cc >> +++ b/src/dev/ide_ctrl.cc >> @@ -524,9 +524,11 @@ >> SERIALIZE_SCALAR(cmdSize); >> SERIALIZE_SCALAR(ctrlAddr); >> SERIALIZE_SCALAR(ctrlSize); >> - SERIALIZE_SCALAR((uint8_t)bmiRegs.command); >> + uint8_t command = bmiRegs.command; >> + SERIALIZE_SCALAR(command); >> SERIALIZE_SCALAR(bmiRegs.reserved0); >> - SERIALIZE_SCALAR((uint8_t)bmiRegs.status); >> + uint8_t status = bmiRegs.status; >> + SERIALIZE_SCALAR(status); >> SERIALIZE_SCALAR(bmiRegs.reserved1); >> SERIALIZE_SCALAR(bmiRegs.bmidtp); >> SERIALIZE_SCALAR(selectBit); >> @@ -559,16 +561,17 @@ >> IdeController::Channel::unserialize( >> Checkpoint *cp, const std::string §ion) >> { >> - uint8_t temp; >> UNSERIALIZE_SCALAR(cmdAddr); >> UNSERIALIZE_SCALAR(cmdSize); >> UNSERIALIZE_SCALAR(ctrlAddr); >> UNSERIALIZE_SCALAR(ctrlSize); >> - UNSERIALIZE_SCALAR(temp); >> - bmiRegs.command = temp; >> + uint8_t command; >> + UNSERIALIZE_SCALAR(command); >> + bmiRegs.command = command; >> UNSERIALIZE_SCALAR(bmiRegs.reserved0); >> - UNSERIALIZE_SCALAR(temp); >> - bmiRegs.status = temp; >> + uint8_t status; >> + UNSERIALIZE_SCALAR(status); >> + bmiRegs.status = status; >> UNSERIALIZE_SCALAR(bmiRegs.reserved1); >> UNSERIALIZE_SCALAR(bmiRegs.bmidtp); >> UNSERIALIZE_SCALAR(selectBit); >> _______________________________________________ >> m5-dev mailing list >> [email protected] >> http://m5sim.org/mailman/listinfo/m5-dev >> >> >> > _______________________________________________ > m5-dev mailing list > [email protected] > http://m5sim.org/mailman/listinfo/m5-dev > > _______________________________________________ m5-dev mailing list [email protected] http://m5sim.org/mailman/listinfo/m5-dev
