Sequencer.cc (10012:ec5a5bfb941d) Sequencer.cc (10089:bc3126a05a7f)
1/*
2 * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 539 unchanged lines hidden (view full) ---

548 DPRINTF(MemoryAccess,
549 "WARNING. Data not transfered from Ruby to M5 for type %s\n",
550 RubyRequestType_to_string(type));
551 }
552
553 // If using the RubyTester, update the RubyTester sender state's
554 // subBlock with the recieved data. The tester will later access
555 // this state.
1/*
2 * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 539 unchanged lines hidden (view full) ---

548 DPRINTF(MemoryAccess,
549 "WARNING. Data not transfered from Ruby to M5 for type %s\n",
550 RubyRequestType_to_string(type));
551 }
552
553 // If using the RubyTester, update the RubyTester sender state's
554 // subBlock with the recieved data. The tester will later access
555 // this state.
556 // Note: RubyPort will access it's sender state before the
557 // RubyTester.
558 if (m_usingRubyTester) {
556 if (m_usingRubyTester) {
559 RubyPort::SenderState *reqSenderState =
560 safe_cast<RubyPort::SenderState*>(pkt->senderState);
561 // @todo This is a dangerous assumption on nothing else
562 // modifying the senderState
563 RubyTester::SenderState* testerSenderState =
557 RubyTester::SenderState* testerSenderState =
564 safe_cast<RubyTester::SenderState*>(reqSenderState->predecessor);
558 pkt->findNextSenderState<RubyTester::SenderState>();
559 assert(testerSenderState);
565 testerSenderState->subBlock.mergeFrom(data);
566 }
567
568 delete srequest;
569
570 if (g_system_ptr->m_warmup_enabled) {
571 assert(pkt->req);
572 delete pkt->req;

--- 262 unchanged lines hidden --- 		560 testerSenderState->subBlock.mergeFrom(data);
561 }
562
563 delete srequest;
564
565 if (g_system_ptr->m_warmup_enabled) {
566 assert(pkt->req);
567 delete pkt->req;

--- 262 unchanged lines hidden ---