481a482,485
>
> // @todo: Uncachable load is not executed until it reaches
> // the head of the ROB. Once this if checks only the executed
> // loads(as noted above), this check can be removed
483,484c487,489
< (loadQueue[load_idx]->effAddr >> 8) ==
< (inst->effAddr >> 8)) {
---
> ((loadQueue[load_idx]->effAddr >> 8)
> == (inst->effAddr >> 8)) &&
> !loadQueue[load_idx]->uncacheable()) {
555a561,564
>
> // @todo: Uncachable load is not executed until it reaches
> // the head of the ROB. Once this if checks only the executed
> // loads(as noted above), this check can be removed
557,558c566,568
< (loadQueue[load_idx]->effAddr >> 8) ==
< (store_inst->effAddr >> 8)) {
---
> ((loadQueue[load_idx]->effAddr >> 8)
> == (store_inst->effAddr >> 8)) &&
> !loadQueue[load_idx]->uncacheable()) {