arch-riscv,tests: small update to make gem5.fast compile

This small change is meant to enable gem5.fast compilation
for riscv. Also, the riscv tests based on gem5.fast
work now and are removed from .testignore.

Change-Id: Id9c96d8e4682a74ec1d77a66eae53d6f9b64d302
Issue-On: https://gem5.atlassian.net/browse/GEM5-526
Issue-On: https://gem5.atlassian.net/browse/GEM5-527
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/28893
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/src/arch/riscv/pagetable_walker.cc b/src/arch/riscv/pagetable_walker.cc
index 6ec118d569634199135a9096743be538b6124b61..786cb8193ed623f6591338eb0eefc4b11d2e281f 100644 (file)
--- a/src/arch/riscv/pagetable_walker.cc
+++ b/src/arch/riscv/pagetable_walker.cc
@@ -386,10 +386,9 @@ Walker::WalkerState::stepWalk(PacketPtr &write)
             if (!functional)
                 walker->tlb->insert(entry.vaddr, entry);
             else {
-                Addr offset = entry.vaddr & mask(entry.logBytes);
-                Addr paddr = entry.paddr << PageShift | offset;
                 DPRINTF(PageTableWalker, "Translated %#x -> %#x\n",
-                        entry.vaddr, paddr);
+                        entry.vaddr, entry.paddr << PageShift |
+                        (entry.vaddr & mask(entry.logBytes)));
             }
         }
         endWalk();

diff --git a/tests/gem5/.testignore b/tests/gem5/.testignore
index cc61aa6133722f99a3ba2cfdd3a6ac1280b669ac..b8cfc7f50815640f94881392c57ff70da5c5b9d2 100644 (file)
--- a/tests/gem5/.testignore
+++ b/tests/gem5/.testignore
@@ -20,12 +20,7 @@ test-insttest-rv64i-linux-TimingSimpleCPU-RISCV-x86_64-debug
 test-insttest-rv64i-linux-DerivO3CPU-RISCV-x86_64-debug
 test-insttest-linux-AtomicSimpleCPU-SPARC-x86_64-debug
 test-insttest-linux-TimingSimpleCPU-SPARC-x86_64-debug
-test-insttest-rv64a-linux-MinorCPU-RISCV-x86_64-fast
-test-insttest-rv64c-linux-MinorCPU-RISCV-x86_64-fast
-test-insttest-rv64d-linux-MinorCPU-RISCV-x86_64-fast
-test-insttest-rv64f-linux-MinorCPU-RISCV-x86_64-fast
 test-insttest-rv64i-linux-MinorCPU-RISCV-x86_64-fast
-test-insttest-rv64m-linux-MinorCPU-RISCV-x86_64-fast
 test-insttest-rv64i-linux-AtomicSimpleCPU-RISCV-x86_64-fast
 test-insttest-rv64i-linux-TimingSimpleCPU-RISCV-x86_64-fast
 test-insttest-rv64i-linux-DerivO3CPU-RISCV-x86_64-fast