Deleted Added
sdiff udiff text old ( 7600:eff7f79f7dfd ) new ( 7616:1a0ab2308bbe )
full compact
1/*
2 * Copyright (c) 2010 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

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

474 while (load_idx != loadTail) {
475 // Really only need to check loads that have actually executed
476
477 // @todo: For now this is extra conservative, detecting a
478 // violation if the addresses match assuming all accesses
479 // are quad word accesses.
480
481 // @todo: Fix this, magic number being used here
482 if (loadQueue[load_idx]->effAddrValid &&
483 (loadQueue[load_idx]->effAddr >> 8) ==
484 (inst->effAddr >> 8)) {
485 // A load incorrectly passed this load. Squash and refetch.
486 // For now return a fault to show that it was unsuccessful.
487 DynInstPtr violator = loadQueue[load_idx];
488 if (!memDepViolator ||
489 (violator->seqNum < memDepViolator->seqNum)) {
490 memDepViolator = violator;
491 } else {
492 break;

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

548 // It's safe to check all loads because effAddr is set to
549 // InvalAddr when the dyn inst is created.
550
551 // @todo: For now this is extra conservative, detecting a
552 // violation if the addresses match assuming all accesses
553 // are quad word accesses.
554
555 // @todo: Fix this, magic number being used here
556 if (loadQueue[load_idx]->effAddrValid &&
557 (loadQueue[load_idx]->effAddr >> 8) ==
558 (store_inst->effAddr >> 8)) {
559 // A load incorrectly passed this store. Squash and refetch.
560 // For now return a fault to show that it was unsuccessful.
561 DynInstPtr violator = loadQueue[load_idx];
562 if (!memDepViolator ||
563 (violator->seqNum < memDepViolator->seqNum)) {
564 memDepViolator = violator;
565 } else {
566 break;

--- 600 unchanged lines hidden ---