Remove unused code

riscv-software-src · Nov 3, 2023 · 5494b72 · 5494b72
1 parent bd24775
commit 5494b72
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 57 deletions.
diff --git a/core/LSU.hpp b/core/LSU.hpp
@@ -85,14 +85,10 @@ namespace olympia
         using FlushCriteria = FlushManager::FlushingCriteria;
 
         using LoadStoreInstIterator = sparta::Buffer<LoadStoreInstInfoPtr>::const_iterator;
-        // Forward declaration of the Pair Definition class is must as we are friending it.
-        class LoadStoreInstInfoPairDef;
         // Keep record of instruction issue information
         class LoadStoreInstInfo
         {
         public:
-            // The modeler needs to alias a type called "SpartaPairDefinitionType" to the Pair Definition class  of itself
-            using SpartaPairDefinitionType = LoadStoreInstInfoPairDef;
             enum class IssuePriority : std::uint16_t
             {
                 HIGHEST = 0,
@@ -201,25 +197,6 @@ namespace olympia
 
         using LoadStoreInstInfoAllocator = sparta::SpartaSharedPointerAllocator<LoadStoreInstInfo>;
 
-        /*!
-        * \class LoadStoreInstInfoPairDef
-        * \brief Pair Definition class of the load store instruction that flows through the example/CoreModel
-        */
-        // This is the definition of the PairDefinition class of LoadStoreInstInfo.
-        // This PairDefinition class could be named anything but it needs to inherit
-        // publicly from sparta::PairDefinition templatized on the actual class LoadStoreInstInfo.
-        class LoadStoreInstInfoPairDef : public sparta::PairDefinition<LoadStoreInstInfo>{
-        public:
-
-            // The SPARTA_ADDPAIRs APIs must be called during the construction of the PairDefinition class
-            LoadStoreInstInfoPairDef() : PairDefinition<LoadStoreInstInfo>(){
-                SPARTA_INVOKE_PAIRS(LoadStoreInstInfo);
-            }
-            SPARTA_REGISTER_PAIRS(SPARTA_ADDPAIR("DID",   &LoadStoreInstInfo::getInstUniqueID),
-                                  SPARTA_ADDPAIR("rank",  &LoadStoreInstInfo::getPriority),
-                                  SPARTA_ADDPAIR("state", &LoadStoreInstInfo::getState),
-                                  SPARTA_FLATTEN(         &LoadStoreInstInfo::getMemoryAccessInfoPtr))
-        };
     private:
 
         using ScoreboardViews = std::array<std::unique_ptr<sparta::ScoreboardView>, core_types::N_REGFILES>;

diff --git a/core/MemoryAccessInfo.hpp b/core/MemoryAccessInfo.hpp
@@ -11,16 +11,9 @@
 
 namespace olympia {
 
-    class MemoryAccessInfoPairDef;
-
     class MemoryAccessInfo {
     public:
 
-        // The modeler needs to alias a type called
-        // "SpartaPairDefinitionType" to the Pair Definition class of
-        // itself
-        using SpartaPairDefinitionType = MemoryAccessInfoPairDef;
-
         enum class MMUState : std::uint32_t {
             NO_ACCESS = 0,
             __FIRST = NO_ACCESS,
@@ -110,35 +103,8 @@ namespace olympia {
 
         bool cache_data_ready_;
 
-        // Scoreboards
-        using ScoreboardViews = std::array<std::unique_ptr<sparta::ScoreboardView>, core_types::N_REGFILES>;
-        ScoreboardViews scoreboard_views_;
-
-    };
-
-    /*!
-     * \class MemoryAccessInfoPairDef
-     * \brief Pair Definition class of the Memory Access Information that flows through the example/CoreModel
-     */
 
-    // This is the definition of the PairDefinition class of MemoryAccessInfo.
-    // This PairDefinition class could be named anything but it needs to inherit
-    // publicly from sparta::PairDefinition templatized on the actual class MemoryAcccessInfo.
-    class MemoryAccessInfoPairDef : public sparta::PairDefinition<MemoryAccessInfo> {
-    public:
-
-        // The SPARTA_ADDPAIRs APIs must be called during the construction of the PairDefinition class
-        MemoryAccessInfoPairDef() : PairDefinition<MemoryAccessInfo>() {
-            SPARTA_INVOKE_PAIRS(MemoryAccessInfo);
-        }
-
-        SPARTA_REGISTER_PAIRS(SPARTA_ADDPAIR("DID",   &MemoryAccessInfo::getInstUniqueID),
-                              SPARTA_ADDPAIR("valid", &MemoryAccessInfo::getPhyAddrStatus),
-                              SPARTA_ADDPAIR("mmu",   &MemoryAccessInfo::getMMUState),
-                              SPARTA_ADDPAIR("cache", &MemoryAccessInfo::getCacheState),
-                              SPARTA_FLATTEN(&MemoryAccessInfo::getInstPtr))
     };
-
     using MemoryAccessInfoPtr       = sparta::SpartaSharedPointer<MemoryAccessInfo>;
     using MemoryAccessInfoAllocator = sparta::SpartaSharedPointerAllocator<MemoryAccessInfo>;