timing.cc (5744:342cbc20a188) timing.cc (5890:bdef71accd68)
1/*
2 * Copyright (c) 2002-2005 The Regents of The University of Michigan
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;

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

270 RequestPtr req1, req2;
271 assert(!req->isLocked() && !req->isSwap());
272 req->splitOnVaddr(split_addr, req1, req2);
273
274 pkt1 = pkt2 = NULL;
275 if ((fault = buildPacket(pkt1, req1, read)) != NoFault ||
276 (fault = buildPacket(pkt2, req2, read)) != NoFault) {
277 delete req;
1/*
2 * Copyright (c) 2002-2005 The Regents of The University of Michigan
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;

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

270 RequestPtr req1, req2;
271 assert(!req->isLocked() && !req->isSwap());
272 req->splitOnVaddr(split_addr, req1, req2);
273
274 pkt1 = pkt2 = NULL;
275 if ((fault = buildPacket(pkt1, req1, read)) != NoFault ||
276 (fault = buildPacket(pkt2, req2, read)) != NoFault) {
277 delete req;
278 delete req1;
278 delete pkt1;
279 req = NULL;
280 pkt1 = NULL;
281 return fault;
282 }
283
284 assert(!req1->isMmapedIpr() && !req2->isMmapedIpr());
285
286 req->setPhys(req1->getPaddr(), req->getSize(), req1->getFlags());
287 PacketPtr pkt = new Packet(req, pkt1->cmd.responseCommand(),
288 Packet::Broadcast);
279 delete pkt1;
280 req = NULL;
281 pkt1 = NULL;
282 return fault;
283 }
284
285 assert(!req1->isMmapedIpr() && !req2->isMmapedIpr());
286
287 req->setPhys(req1->getPaddr(), req->getSize(), req1->getFlags());
288 PacketPtr pkt = new Packet(req, pkt1->cmd.responseCommand(),
289 Packet::Broadcast);
290 if (req->getFlags().isSet(Request::NO_ACCESS)) {
291 delete req1;
292 delete pkt1;
293 delete req2;
294 delete pkt2;
295 pkt1 = pkt;
296 pkt2 = NULL;
297 return NoFault;
298 }
289
290 pkt->dataDynamic<uint8_t>(data);
291 pkt1->dataStatic<uint8_t>(data);
292 pkt2->dataStatic<uint8_t>(data + req1->getSize());
293
294 SplitMainSenderState * main_send_state = new SplitMainSenderState;
295 pkt->senderState = main_send_state;
296 main_send_state->fragments[0] = pkt1;
297 main_send_state->fragments[1] = pkt2;
298 main_send_state->outstanding = 2;
299 pkt1->senderState = new SplitFragmentSenderState(pkt, 0);
300 pkt2->senderState = new SplitFragmentSenderState(pkt, 1);
301 return fault;
302}
303
304Fault
305TimingSimpleCPU::buildPacket(PacketPtr &pkt, RequestPtr &req, bool read)
306{
299
300 pkt->dataDynamic<uint8_t>(data);
301 pkt1->dataStatic<uint8_t>(data);
302 pkt2->dataStatic<uint8_t>(data + req1->getSize());
303
304 SplitMainSenderState * main_send_state = new SplitMainSenderState;
305 pkt->senderState = main_send_state;
306 main_send_state->fragments[0] = pkt1;
307 main_send_state->fragments[1] = pkt2;
308 main_send_state->outstanding = 2;
309 pkt1->senderState = new SplitFragmentSenderState(pkt, 0);
310 pkt2->senderState = new SplitFragmentSenderState(pkt, 1);
311 return fault;
312}
313
314Fault
315TimingSimpleCPU::buildPacket(PacketPtr &pkt, RequestPtr &req, bool read)
316{
307 Fault fault = read ? thread->translateDataReadReq(req) :
308 thread->translateDataWriteReq(req);
317 Fault fault = thread->dtb->translate(req, tc, !read);
309 MemCmd cmd;
310 if (fault != NoFault) {
311 delete req;
312 req = NULL;
313 pkt = NULL;
314 return fault;
315 } else if (read) {
316 cmd = MemCmd::ReadReq;

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

343 RequestPtr req = new Request(asid, addr, data_size,
344 flags, pc, _cpuId, thread_id);
345
346 Addr split_addr = roundDown(addr + data_size - 1, block_size);
347 assert(split_addr <= addr || split_addr - addr < block_size);
348
349 if (split_addr > addr) {
350 PacketPtr pkt1, pkt2;
318 MemCmd cmd;
319 if (fault != NoFault) {
320 delete req;
321 req = NULL;
322 pkt = NULL;
323 return fault;
324 } else if (read) {
325 cmd = MemCmd::ReadReq;

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

352 RequestPtr req = new Request(asid, addr, data_size,
353 flags, pc, _cpuId, thread_id);
354
355 Addr split_addr = roundDown(addr + data_size - 1, block_size);
356 assert(split_addr <= addr || split_addr - addr < block_size);
357
358 if (split_addr > addr) {
359 PacketPtr pkt1, pkt2;
351 this->buildSplitPacket(pkt1, pkt2, req,
360 Fault fault = this->buildSplitPacket(pkt1, pkt2, req,
352 split_addr, (uint8_t *)(new T), true);
361 split_addr, (uint8_t *)(new T), true);
353 if (handleReadPacket(pkt1)) {
362 if (fault != NoFault)
363 return fault;
364 if (req->getFlags().isSet(Request::NO_ACCESS)) {
365 dcache_pkt = pkt1;
366 } else if (handleReadPacket(pkt1)) {
354 SplitFragmentSenderState * send_state =
355 dynamic_cast<SplitFragmentSenderState *>(pkt1->senderState);
356 send_state->clearFromParent();
357 if (handleReadPacket(pkt2)) {
358 send_state =
359 dynamic_cast<SplitFragmentSenderState *>(pkt1->senderState);
360 send_state->clearFromParent();
361 }
362 }
363 } else {
364 Fault fault = buildPacket(pkt, req, true);
365 if (fault != NoFault) {
366 return fault;
367 }
367 SplitFragmentSenderState * send_state =
368 dynamic_cast<SplitFragmentSenderState *>(pkt1->senderState);
369 send_state->clearFromParent();
370 if (handleReadPacket(pkt2)) {
371 send_state =
372 dynamic_cast<SplitFragmentSenderState *>(pkt1->senderState);
373 send_state->clearFromParent();
374 }
375 }
376 } else {
377 Fault fault = buildPacket(pkt, req, true);
378 if (fault != NoFault) {
379 return fault;
380 }
368 pkt->dataDynamic<T>(new T);
369
370 handleReadPacket(pkt);
381 if (req->getFlags().isSet(Request::NO_ACCESS)) {
382 dcache_pkt = pkt;
383 } else {
384 pkt->dataDynamic<T>(new T);
385 handleReadPacket(pkt);
386 }
371 }
372
373 if (traceData) {
374 traceData->setData(data);
375 traceData->setAddr(addr);
376 }
377
378 // This will need a new way to tell if it has a dcache attached.
379 if (req->isUncacheable())
380 recordEvent("Uncached Read");
381
382 return NoFault;
383}
384
387 }
388
389 if (traceData) {
390 traceData->setData(data);
391 traceData->setAddr(addr);
392 }
393
394 // This will need a new way to tell if it has a dcache attached.
395 if (req->isUncacheable())
396 recordEvent("Uncached Read");
397
398 return NoFault;
399}
400
385Fault
386TimingSimpleCPU::translateDataReadAddr(Addr vaddr, Addr &paddr,
387 int size, unsigned flags)
388{
389 Request *req =
390 new Request(0, vaddr, size, flags, thread->readPC(), _cpuId, 0);
391
392 if (traceData) {
393 traceData->setAddr(vaddr);
394 }
395
396 Fault fault = thread->translateDataWriteReq(req);
397
398 if (fault == NoFault)
399 paddr = req->getPaddr();
400
401 delete req;
402 return fault;
403}
404
405#ifndef DOXYGEN_SHOULD_SKIP_THIS
406
407template
408Fault
409TimingSimpleCPU::read(Addr addr, Twin64_t &data, unsigned flags);
410
411template
412Fault

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

492 PacketPtr pkt1, pkt2;
493 T *dataP = new T;
494 *dataP = data;
495 Fault fault = this->buildSplitPacket(pkt1, pkt2, req, split_addr,
496 (uint8_t *)dataP, false);
497 if (fault != NoFault)
498 return fault;
499 dcache_pkt = pkt1;
401#ifndef DOXYGEN_SHOULD_SKIP_THIS
402
403template
404Fault
405TimingSimpleCPU::read(Addr addr, Twin64_t &data, unsigned flags);
406
407template
408Fault

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

488 PacketPtr pkt1, pkt2;
489 T *dataP = new T;
490 *dataP = data;
491 Fault fault = this->buildSplitPacket(pkt1, pkt2, req, split_addr,
492 (uint8_t *)dataP, false);
493 if (fault != NoFault)
494 return fault;
495 dcache_pkt = pkt1;
500 if (handleWritePacket()) {
501 SplitFragmentSenderState * send_state =
502 dynamic_cast<SplitFragmentSenderState *>(pkt1->senderState);
503 send_state->clearFromParent();
504 dcache_pkt = pkt2;
505 if (handleReadPacket(pkt2)) {
506 send_state =
507 dynamic_cast<SplitFragmentSenderState *>(pkt1->senderState);
496 if (!req->getFlags().isSet(Request::NO_ACCESS)) {
497 if (handleWritePacket()) {
498 SplitFragmentSenderState * send_state =
499 dynamic_cast<SplitFragmentSenderState *>(
500 pkt1->senderState);
508 send_state->clearFromParent();
501 send_state->clearFromParent();
502 dcache_pkt = pkt2;
503 if (handleReadPacket(pkt2)) {
504 send_state =
505 dynamic_cast<SplitFragmentSenderState *>(
506 pkt1->senderState);
507 send_state->clearFromParent();
508 }
509 }
510 }
511 } else {
512 bool do_access = true; // flag to suppress cache access
513
514 Fault fault = buildPacket(dcache_pkt, req, false);
515 if (fault != NoFault)
516 return fault;
517
509 }
510 }
511 } else {
512 bool do_access = true; // flag to suppress cache access
513
514 Fault fault = buildPacket(dcache_pkt, req, false);
515 if (fault != NoFault)
516 return fault;
517
518 if (req->isLocked()) {
519 do_access = TheISA::handleLockedWrite(thread, req);
520 } else if (req->isCondSwap()) {
521 assert(res);
522 req->setExtraData(*res);
523 }
518 if (!req->getFlags().isSet(Request::NO_ACCESS)) {
519 if (req->isLocked()) {
520 do_access = TheISA::handleLockedWrite(thread, req);
521 } else if (req->isCondSwap()) {
522 assert(res);
523 req->setExtraData(*res);
524 }
524
525
525 dcache_pkt->allocate();
526 if (req->isMmapedIpr())
527 dcache_pkt->set(htog(data));
528 else
529 dcache_pkt->set(data);
526 dcache_pkt->allocate();
527 if (req->isMmapedIpr())
528 dcache_pkt->set(htog(data));
529 else
530 dcache_pkt->set(data);
530
531
531 if (do_access)
532 handleWritePacket();
532 if (do_access)
533 handleWritePacket();
534 }
533 }
534
535 if (traceData) {
536 traceData->setAddr(req->getVaddr());
537 traceData->setData(data);
538 }
539
540 // This will need a new way to tell if it's hooked up to a cache or not.
541 if (req->isUncacheable())
542 recordEvent("Uncached Write");
543
544 // If the write needs to have a fault on the access, consider calling
545 // changeStatus() and changing it to "bad addr write" or something.
546 return NoFault;
547}
548
535 }
536
537 if (traceData) {
538 traceData->setAddr(req->getVaddr());
539 traceData->setData(data);
540 }
541
542 // This will need a new way to tell if it's hooked up to a cache or not.
543 if (req->isUncacheable())
544 recordEvent("Uncached Write");
545
546 // If the write needs to have a fault on the access, consider calling
547 // changeStatus() and changing it to "bad addr write" or something.
548 return NoFault;
549}
550
549Fault
550TimingSimpleCPU::translateDataWriteAddr(Addr vaddr, Addr &paddr,
551 int size, unsigned flags)
552{
553 Request *req =
554 new Request(0, vaddr, size, flags, thread->readPC(), _cpuId, 0);
555
551
556 if (traceData) {
557 traceData->setAddr(vaddr);
558 }
559
560 Fault fault = thread->translateDataWriteReq(req);
561
562 if (fault == NoFault)
563 paddr = req->getPaddr();
564
565 delete req;
566 return fault;
567}
568
569
570#ifndef DOXYGEN_SHOULD_SKIP_THIS
571template
572Fault
573TimingSimpleCPU::write(Twin32_t data, Addr addr,
574 unsigned flags, uint64_t *res);
575
576template
577Fault

--- 460 unchanged lines hidden --- 		552#ifndef DOXYGEN_SHOULD_SKIP_THIS
553template
554Fault
555TimingSimpleCPU::write(Twin32_t data, Addr addr,
556 unsigned flags, uint64_t *res);
557
558template
559Fault

--- 460 unchanged lines hidden ---