Removed deprecated function from hei_operator_register.hpp
The following functions were ported from Hostboot and are not needed for
the isolation code:
- default constructors
- Read()/Write()
- GetId()/SetId()
- operator>=()
- AccessBitString()
- SetBitString()
Change-Id: I2f8acd9ed65690d59ea729f6e2059fa0ba690610
Signed-off-by: Zane Shelley <zshelle@us.ibm.com>
diff --git a/src/register/hei_operator_register.hpp b/src/register/hei_operator_register.hpp
index 8e63783..7c6b4d5 100644
--- a/src/register/hei_operator_register.hpp
+++ b/src/register/hei_operator_register.hpp
@@ -1,22 +1,13 @@
#pragma once
-#include <prdrCommon.H>
-
#include <register/hei_register.hpp>
-#include <algorithm>
-
namespace libhei
{
class NotRegister : public Register
{
public:
- NotRegister() : Register(), iv_child(nullptr), iv_iBS(0)
- {
- iv_bs = &iv_iBS;
- }
-
NotRegister(Register& i_arg) :
Register(), iv_child(&i_arg), iv_iBS(i_arg.GetBitLength())
{
@@ -31,27 +22,12 @@
return *this;
}
- virtual uint32_t Read() const
- {
- return iv_child->Read();
- }
- virtual uint32_t Write()
- {
- return iv_child->Write();
- }
-
const BitString* getBitString(const Chip& i_chip) const
{
(*iv_bs) = ~(*iv_child->getBitString(i_chip));
return iv_bs;
}
- virtual uint16_t GetId() const
- {
- return iv_child->GetId();
- }
- virtual void SetId(uint16_t i_id) {}
-
bool operator==(const NotRegister& r) const
{
return r.iv_child == iv_child;
@@ -62,18 +38,6 @@
return iv_child < r.iv_child;
}
- bool operator>=(const NotRegister& r) const
- {
- return iv_child >= r.iv_child;
- }
-
- protected:
- BitString& AccessBitString(void)
- {
- return iv_iBS;
- }
- void SetBitString(const BitString*) {}
-
private:
Register* iv_child;
@@ -84,11 +48,6 @@
class LeftShiftRegister : public Register
{
public:
- LeftShiftRegister() : Register(), iv_child(nullptr), iv_amount(0), iv_iBS(0)
- {
- iv_bs = &iv_iBS;
- }
-
LeftShiftRegister(Register& i_arg, uint16_t i_amount) :
Register(), iv_child(&i_arg), iv_amount(i_amount),
iv_iBS(i_arg.GetBitLength())
@@ -105,27 +64,12 @@
return *this;
}
- virtual uint32_t Read() const
- {
- return iv_child->Read();
- }
- virtual uint32_t Write()
- {
- return iv_child->Write();
- }
-
const BitString* getBitString(const Chip& i_chip) const
{
(*iv_bs) = (*iv_child->getBitString(i_chip)) << iv_amount;
return iv_bs;
}
- virtual uint16_t GetId() const
- {
- return iv_child->GetId();
- }
- virtual void SetId(uint16_t i_id) {}
-
bool operator==(const LeftShiftRegister& r) const
{
return (r.iv_child == iv_child) && (r.iv_amount == iv_amount);
@@ -138,20 +82,6 @@
return iv_child < r.iv_child;
}
- bool operator>=(const LeftShiftRegister& r) const
- {
- if (iv_child == r.iv_child)
- return iv_amount >= r.iv_amount;
- return iv_child >= r.iv_child;
- }
-
- protected:
- BitString& AccessBitString(void)
- {
- return iv_iBS;
- }
- void SetBitString(const BitString*) {}
-
private:
Register* iv_child;
uint16_t iv_amount;
@@ -163,12 +93,6 @@
class RightShiftRegister : public Register
{
public:
- RightShiftRegister() :
- Register(), iv_child(nullptr), iv_amount(0), iv_iBS(0)
- {
- iv_bs = &iv_iBS;
- }
-
RightShiftRegister(Register& i_arg, uint16_t i_amount) :
Register(), iv_child(&i_arg), iv_amount(i_amount),
iv_iBS(i_arg.GetBitLength())
@@ -185,27 +109,12 @@
return *this;
}
- virtual uint32_t Read() const
- {
- return iv_child->Read();
- }
- virtual uint32_t Write()
- {
- return iv_child->Write();
- }
-
const BitString* getBitString(const Chip& i_chip) const
{
(*iv_bs) = (*iv_child->getBitString(i_chip)) >> iv_amount;
return iv_bs;
}
- virtual uint16_t GetId() const
- {
- return iv_child->GetId();
- }
- virtual void SetId(uint16_t i_id) {}
-
bool operator==(const RightShiftRegister& r) const
{
return (r.iv_child == iv_child) && (r.iv_amount == iv_amount);
@@ -218,20 +127,6 @@
return iv_child < r.iv_child;
}
- bool operator>=(const RightShiftRegister& r) const
- {
- if (iv_child == r.iv_child)
- return iv_amount >= r.iv_amount;
- return iv_child >= r.iv_child;
- }
-
- protected:
- BitString& AccessBitString(void)
- {
- return iv_iBS;
- }
- void SetBitString(const BitString*) {}
-
private:
Register* iv_child;
uint16_t iv_amount;
@@ -243,11 +138,6 @@
class AndRegister : public Register
{
public:
- AndRegister() : Register(), iv_left(nullptr), iv_right(nullptr), iv_iBS(0)
- {
- iv_bs = &iv_iBS;
- }
-
AndRegister(Register& i_left, Register& i_right) :
Register(), iv_left(&i_left), iv_right(&i_right),
iv_iBS(std::min(i_left.GetBitLength(), i_right.GetBitLength()))
@@ -264,15 +154,6 @@
return *this;
}
- virtual uint32_t Read() const
- {
- return iv_left->Read() | iv_right->Read();
- }
- virtual uint32_t Write()
- {
- return iv_left->Write() | iv_right->Write();
- }
-
const BitString* getBitString(const Chip& i_chip) const
{
(*iv_bs) = *iv_left->getBitString(i_chip);
@@ -280,14 +161,6 @@
return iv_bs;
}
- virtual uint16_t GetId() const
- {
- return Prdr::SignatureOp::combineSig(iv_left->GetId(),
- iv_right->GetId());
- }
-
- virtual void SetId(uint16_t i_id) {}
-
bool operator==(const AndRegister& r) const
{
return (r.iv_left == iv_left) && (r.iv_right == iv_right);
@@ -300,20 +173,6 @@
return iv_left < r.iv_left;
}
- bool operator>=(const AndRegister& r) const
- {
- if (iv_left == r.iv_left)
- return iv_right >= r.iv_right;
- return iv_left >= r.iv_left;
- }
-
- protected:
- BitString& AccessBitString(void)
- {
- return iv_iBS;
- }
- void SetBitString(const BitString*) {}
-
private:
Register* iv_left;
Register* iv_right;
@@ -325,11 +184,6 @@
class OrRegister : public Register
{
public:
- OrRegister() : Register(), iv_left(nullptr), iv_right(nullptr), iv_iBS(0)
- {
- iv_bs = &iv_iBS;
- }
-
OrRegister(Register& i_left, Register& i_right) :
Register(), iv_left(&i_left), iv_right(&i_right),
iv_iBS(std::min(i_left.GetBitLength(), i_right.GetBitLength()))
@@ -346,16 +200,6 @@
return *this;
}
- virtual uint32_t Read() const
- {
- return iv_left->Read() | iv_right->Read();
- }
-
- virtual uint32_t Write()
- {
- return iv_left->Write() | iv_right->Write();
- }
-
const BitString* getBitString(const Chip& i_chip) const
{
(*iv_bs) = *iv_left->getBitString(i_chip);
@@ -363,14 +207,6 @@
return iv_bs;
}
- virtual uint16_t GetId() const
- {
- return Prdr::SignatureOp::combineSig(iv_left->GetId(),
- iv_right->GetId());
- }
-
- virtual void SetId(uint16_t i_id) {}
-
bool operator==(const OrRegister& r) const
{
return (r.iv_left == iv_left) && (r.iv_right == iv_right);
@@ -383,20 +219,6 @@
return iv_left < r.iv_left;
}
- bool operator>=(const OrRegister& r) const
- {
- if (iv_left == r.iv_left)
- return iv_right >= r.iv_right;
- return iv_left >= r.iv_left;
- }
-
- protected:
- BitString& AccessBitString(void)
- {
- return iv_iBS;
- }
- void SetBitString(const BitString*) {}
-
private:
Register* iv_left;
Register* iv_right;
@@ -405,54 +227,9 @@
BitStringBuffer iv_iBS;
};
-class NullRegister : public Register
-{
- public:
- NullRegister(int size) : Register(), iv_iBS(size) {}
-
- NullRegister& operator=(const NullRegister& r)
- {
- iv_iBS = r.iv_iBS;
- return *this;
- }
-
- virtual uint32_t Read() const
- {
- return 0;
- }
- virtual uint32_t Write()
- {
- return 0;
- }
-
- const BitString* getBitString(const Chip& i_chip) const
- {
- return &iv_iBS;
- }
-
- protected:
- BitString& AccessBitString(void)
- {
- return iv_iBS;
- }
- void SetBitString(const BitString*) {}
-
- private:
- BitStringBuffer iv_iBS;
-
- virtual uint16_t GetId() const
- {
- return Prdr::SignatureOp::DEFAULT_SIGNATURE;
- }
-
- virtual void SetId(uint16_t i_id) {}
-};
-
class ConstantRegister : public Register
{
public:
- ConstantRegister() : Register(), iv_iBS(0) {}
-
ConstantRegister(const BitStringBuffer& i_arg) : Register(), iv_iBS(i_arg)
{}
@@ -462,39 +239,16 @@
return *this;
}
- virtual uint32_t Read() const
- {
- return SUCCESS;
- }
- virtual uint32_t Write()
- {
- return SUCCESS;
- }
-
const BitString* getBitString(const Chip& i_chip) const
{
return &iv_iBS;
}
- virtual uint16_t GetId() const
- {
- return Prdr::SignatureOp::DEFAULT_SIGNATURE;
- }
-
- virtual void SetId(uint16_t i_id) {}
-
bool operator==(const ConstantRegister& r) const
{
return r.iv_iBS == iv_iBS;
}
- protected:
- BitString& AccessBitString(void)
- {
- return iv_iBS;
- }
- void SetBitString(const BitString*) {}
-
private:
BitStringBuffer iv_iBS;
};