From 55a3e3538863b8f44050d1b6cc2b551a5525b76e Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sun, 7 Feb 2021 23:53:57 -0800 Subject: [PATCH] cpu,mem: Add or remove parenthesis to make the compiler happy. Remove extraneous parenthesis in an if condition, and add some parenthesis where an assignment was being used as a condition in a while loop. Change-Id: Ie12c74ac681ef042138e3b41f257ea1bb2ce4267 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40956 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- src/cpu/o3/inst_queue_impl.hh | 4 ++-- src/cpu/pred/tage_base.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cpu/o3/inst_queue_impl.hh b/src/cpu/o3/inst_queue_impl.hh index 84725978af..0f8716bbce 100644 --- a/src/cpu/o3/inst_queue_impl.hh +++ b/src/cpu/o3/inst_queue_impl.hh @@ -773,12 +773,12 @@ InstructionQueue::scheduleReadyInsts() IssueStruct *i2e_info = issueToExecuteQueue->access(0); DynInstPtr mem_inst; - while (mem_inst = std::move(getDeferredMemInstToExecute())) { + while ((mem_inst = std::move(getDeferredMemInstToExecute()))) { addReadyMemInst(mem_inst); } // See if any cache blocked instructions are able to be executed - while (mem_inst = std::move(getBlockedMemInstToExecute())) { + while ((mem_inst = std::move(getBlockedMemInstToExecute()))) { addReadyMemInst(mem_inst); } diff --git a/src/cpu/pred/tage_base.cc b/src/cpu/pred/tage_base.cc index 108f6a2bb5..791f5d43ce 100644 --- a/src/cpu/pred/tage_base.cc +++ b/src/cpu/pred/tage_base.cc @@ -467,7 +467,7 @@ TAGEBase::handleAllocAndUReset(bool alloc, bool taken, BranchInfo* bi, //Allocate entries unsigned numAllocated = 0; for (int i = X; i <= nHistoryTables; i++) { - if ((gtable[i][bi->tableIndices[i]].u == 0)) { + if (gtable[i][bi->tableIndices[i]].u == 0) { gtable[i][bi->tableIndices[i]].tag = bi->tableTags[i]; gtable[i][bi->tableIndices[i]].ctr = (taken) ? 0 : -1; ++numAllocated;