projects
/
gem5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2a740aa
)
Mem: Fix incorrect logic in bus blocksize check
author
Andreas Hansson
<andreas.hansson@arm.com>
Mon, 15 Oct 2012 16:51:21 +0000
(12:51 -0400)
committer
Andreas Hansson
<andreas.hansson@arm.com>
Mon, 15 Oct 2012 16:51:21 +0000
(12:51 -0400)
This patch fixes the logic in the blocksize check such that the
warning is printed if the size is not 16, 32, 64 or 128.
src/mem/bus.cc
patch
|
blob
|
history
diff --git
a/src/mem/bus.cc
b/src/mem/bus.cc
index 274b8c258c3d7ad39fe344090aec57d8033a38ea..a0db6e52a227c87b8d154d93e583c5fdf55fa86c 100644
(file)
--- a/
src/mem/bus.cc
+++ b/
src/mem/bus.cc
@@
-100,8
+100,8
@@
BaseBus::init()
blockSize = peer_block_size;
// check if the block size is a value known to work
- if (
blockSize != 16 || blockSize != 32 || blockSize !
= 64 ||
-
blockSize != 128
)
+ if (
!(blockSize == 16 || blockSize == 32 || blockSize =
= 64 ||
+
blockSize == 128)
)
warn_once("Block size is neither 16, 32, 64 or 128 bytes.\n");
}