Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/21085 )
Change subject: mem-ruby: Make bitSelect use bits<Addr>
......................................................................
mem-ruby: Make bitSelect use bits<Addr>
There is no need to replicate bits<Addr>' functionality.
As a side effect, ADDRESS_WIDTH is no longer used and was removed
Change-Id: Ia5679f3976c81f779665d82cb758850092f2a293
Signed-off-by: Daniel R. Carvalho <oda...@yahoo.com.br>
---
M src/mem/ruby/common/Address.cc
M src/mem/ruby/common/Address.hh
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/src/mem/ruby/common/Address.cc b/src/mem/ruby/common/Address.cc
index 5c89d31..40ce0fe 100644
--- a/src/mem/ruby/common/Address.cc
+++ b/src/mem/ruby/common/Address.cc
@@ -35,15 +35,7 @@
bitSelect(Addr addr, unsigned int small, unsigned int big)
{
assert(big >= small);
-
- if (big >= ADDRESS_WIDTH - 1) {
- return (addr >> small);
- } else {
- Addr mask = ~((Addr)~0 << (big + 1));
- // FIXME - this is slow to manipulate a 64-bit number using 32-bits
- Addr partial = (addr & mask);
- return (partial >> small);
- }
+ return bits<Addr>(addr, big, small);
}
Addr
diff --git a/src/mem/ruby/common/Address.hh b/src/mem/ruby/common/Address.hh
index 31f52e5..30682fa 100644
--- a/src/mem/ruby/common/Address.hh
+++ b/src/mem/ruby/common/Address.hh
@@ -35,8 +35,6 @@
#include "base/types.hh"
-const uint32_t ADDRESS_WIDTH = 64; // address width in bytes
-
// selects bits inclusive
Addr bitSelect(Addr addr, unsigned int small, unsigned int big);
Addr maskLowOrderBits(Addr addr, unsigned int number);
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/21085
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: Ia5679f3976c81f779665d82cb758850092f2a293
Gerrit-Change-Number: 21085
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
