Removed temporary code for sample simulator test case
Also partially disabled the sample test case temporarily.
Change-Id: I521aea2f961a10e0db64788c439a199dc23e003c
Signed-off-by: Zane Shelley <zshelle@us.ibm.com>
diff --git a/src/isolator/hei_isolator.cpp b/src/isolator/hei_isolator.cpp
index 7e3a032..327da54 100644
--- a/src/isolator/hei_isolator.cpp
+++ b/src/isolator/hei_isolator.cpp
@@ -15,33 +15,7 @@
void Isolator::initialize(void* i_buffer, size_t i_bufferSize)
{
- // BEGIN temporary code
- HEI_INF("Isolator::initialize(%p,%" PRIu64 ")", i_buffer,
- (uint64_t)i_bufferSize);
-
- auto& scom_fw = Flyweight<ScomRegister>::getSingleton();
- auto& idScom_fw = Flyweight<IdScomRegister>::getSingleton();
- auto& isoNode_fw = Flyweight<IsolationNode>::getSingleton();
-
- auto& idScom0 = idScom_fw.get(IdScomRegister{
- static_cast<ChipType_t>(0xdeadbeef), static_cast<RegisterId_t>(0x1111),
- REG_INST_DEFAULT, REG_ACCESS_RW, 0x80000000FF000000});
-
- auto& scom0 = scom_fw.get(ScomRegister{
- static_cast<ChipType_t>(0xdeadbeef), static_cast<RegisterId_t>(0x2222),
- REG_INST_DEFAULT, REG_ACCESS_RW, 0x00FF0000});
-
- auto& node0 = isoNode_fw.get(IsolationNode{idScom0});
- auto& node1 = isoNode_fw.get(IsolationNode{scom0});
-
- node0.addRule(ATTN_TYPE_CHECKSTOP, &idScom0);
- node0.addChild(48, &node1);
-
- node1.addRule(ATTN_TYPE_CHECKSTOP, &scom0);
-
- iv_isoStart[static_cast<ChipType_t>(0xdeadbeef)].push_back(
- {&node0, ATTN_TYPE_CHECKSTOP});
- // END temporary code
+ // TODO
}
void Isolator::uninitialize()
@@ -71,26 +45,8 @@
// Analyze active error on each chip.
for (const auto& chip : i_chipList)
{
- // BEGIN temporary code
+ // TODO
HEI_INF("Isolator::isolate(%p,%u)", chip.getChip(), chip.getType());
-
- // Isolation objects for this chip's type must exist.
- const auto& chip_itr = iv_isoStart.find(chip.getType());
- HEI_ASSERT(iv_isoStart.end() != chip_itr);
-
- for (const auto& pair : chip_itr->second)
- {
- if (pair.first->analyze(chip, pair.second, o_isoData))
- {
- for (const auto& sig : o_isoData.getSignatureList())
- {
- HEI_INF("Signature(%p,0x%x,0x%x,0x%x,0x%x)",
- sig.getChip().getChip(), sig.getId(),
- sig.getInstance(), sig.getBit(), sig.getAttnType());
- }
- }
- }
- // END temporary code
}
}
diff --git a/src/isolator/hei_isolator.hpp b/src/isolator/hei_isolator.hpp
index fddcedd..f185007 100644
--- a/src/isolator/hei_isolator.hpp
+++ b/src/isolator/hei_isolator.hpp
@@ -69,17 +69,6 @@
void isolate(const std::vector<Chip>& i_chipList,
IsolationData& o_isoData) const;
- private:
- // BEGIN temporary code
- /**
- * Provides a list of isolation tree nodes used to start analysis based on
- * the chip type and attention type.
- */
- std::map<ChipType_t,
- std::vector<std::pair<const IsolationNode*, AttentionType_t>>>
- iv_isoStart;
- // END temporary code
-
}; // end class Isolator
} // end namespace libhei
diff --git a/test/simulator/sample_test_case.cpp b/test/simulator/sample_test_case.cpp
index 662720b..071cd87 100644
--- a/test/simulator/sample_test_case.cpp
+++ b/test/simulator/sample_test_case.cpp
@@ -67,14 +67,8 @@
REG_SCOM(proc0, 0x0000f206, 0x0000000000000000) // LFIR2_ACT0 inst 0
REG_SCOM(proc0, 0x0000f207, 0x0000000000000000) // LFIR2_ACT1 inst 0
-// start temp test case
-REG_IDSCOM(proc0, 0x80000000FF000000, 0x8000) // parent FIR bit 48
-
-REG_SCOM(proc0, 0x00FF0000, 0x8800000000000000) // child FIR bits 0 and 4
-
-EXP_SIG(proc0, 0x2222, 0, 0, CHECKSTOP)
-EXP_SIG(proc0, 0x2222, 0, 4, CHECKSTOP)
-// end temp test case
+// TODO
+// EXP_SIG(proc0, 0x2222, 0, 0, CHECKSTOP)
END_ITERATION
diff --git a/test/simulator/user_interface.cpp b/test/simulator/user_interface.cpp
index 0b8b6ef..9f841bb 100644
--- a/test/simulator/user_interface.cpp
+++ b/test/simulator/user_interface.cpp
@@ -47,7 +47,6 @@
memcpy(o_buffer, ®Value, io_bufSize);
break;
}
- // END temporary code
default:
rc = RC_REG_ACCESS_FAILURE;
HEI_ERR("registerRead(%p,%p,%" PRIu64 ",%" PRIx64 ",%" PRIx64 ")",