From ee9ea5f9787e846a9babef5586f7533df157a3f1 Mon Sep 17 00:00:00 2001 From: Jason Lowe-Power Date: Wed, 26 May 2021 15:57:23 -0700 Subject: [PATCH] cpu-o3: Fix parenthesis in condition The commit which removed the templates from fetch [1] made a mistake in removing parentheses in a condition to get a line under 80 characters. With this change, the O3 Arm tests pass again. [1] https://gem5-review.googlesource.com/c/public/gem5/+/42109 Change-Id: I3c224c59a05f08b0639aadb913401a719a82e26f Signed-off-by: Jason Lowe-Power Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/46039 Maintainer: Jason Lowe-Power Reviewed-by: Bobby R. Bruce Reviewed-by: Daniel Carvalho Reviewed-by: Gabe Black Reviewed-by: Matt Sinclair Reviewed-by: Hoa Nguyen Tested-by: kokoro --- src/cpu/o3/fetch.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpu/o3/fetch.cc b/src/cpu/o3/fetch.cc index 8b0febbbcf..65ed33fd47 100644 --- a/src/cpu/o3/fetch.cc +++ b/src/cpu/o3/fetch.cc @@ -1151,7 +1151,7 @@ Fetch::fetch(bool &status_change) else ++fetchStats.miscStallCycles; return; - } else if (checkInterrupt(thisPC.instAddr() && !delayedCommit[tid])) { + } else if (checkInterrupt(thisPC.instAddr()) && !delayedCommit[tid]) { // Stall CPU if an interrupt is posted and we're not issuing // an delayed commit micro-op currently (delayed commit // instructions are not interruptable by interrupts, only faults)