From 1d13c8196e09c1b105bc8f2e6a2c5b4992f3bb1a Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Mon, 11 Oct 2021 10:40:01 +0200 Subject: [PATCH] fix wrong PGMASK usage --- gen_input/templates/interp/CORENAME.cpp.gtl | 2 +- src/vm/interp/vm_tgc_c.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/gen_input/templates/interp/CORENAME.cpp.gtl b/gen_input/templates/interp/CORENAME.cpp.gtl index c586317..e3654d6 100644 --- a/gen_input/templates/interp/CORENAME.cpp.gtl +++ b/gen_input/templates/interp/CORENAME.cpp.gtl @@ -243,7 +243,7 @@ private: return pc; } - static constexpr typename traits::addr_t upper_bits = ~traits::PGMASK; + //static constexpr typename traits::addr_t upper_bits = ~traits::PGMASK; iss::status fetch_ins(virt_addr_t pc, uint8_t * data){ auto phys_pc = this->core.v2p(pc); //if ((pc.val & upper_bits) != ((pc.val + 2) & upper_bits)) { // we may cross a page boundary diff --git a/src/vm/interp/vm_tgc_c.cpp b/src/vm/interp/vm_tgc_c.cpp index e0dc71d..1cbb859 100644 --- a/src/vm/interp/vm_tgc_c.cpp +++ b/src/vm/interp/vm_tgc_c.cpp @@ -4098,7 +4098,6 @@ private: return pc; } - static constexpr typename traits::addr_t upper_bits = ~traits::PGMASK; iss::status fetch_ins(virt_addr_t pc, uint8_t * data){ auto phys_pc = this->core.v2p(pc); //if ((pc.val & upper_bits) != ((pc.val + 2) & upper_bits)) { // we may cross a page boundary