From 02353a60ee6ce831302067aae38bc31b739f14e5 Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Sun, 12 Aug 2007 19:43:54 -0400 Subject: MemorySystem: Fix the use of ?: to produce correct results. --HG-- extra : convert_revision : 31aad7170b35556a4c984f4ebc013137d55d85eb --- src/mem/bus.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/mem/bus.cc') diff --git a/src/mem/bus.cc b/src/mem/bus.cc index 42c4431bb..620e2ac60 100644 --- a/src/mem/bus.cc +++ b/src/mem/bus.cc @@ -148,10 +148,7 @@ void Bus::occupyBus(PacketPtr pkt) // The first word will be delivered after the current tick, the delivery // of the address if any, and one bus cycle to deliver the data - pkt->firstWordTime = - tickNextIdle + - pkt->isRequest() ? clock : 0 + - clock; + pkt->firstWordTime = tickNextIdle + (pkt->isRequest() ? clock : 0) + clock; //Advance it numCycles bus cycles. //XXX Should this use the repeated addition trick as well? -- cgit v1.2.3