X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Fwires%2FCoreWire.java;h=13f54a0188bbb4d62f763e8f6181c4b4569aceba;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=f130cd4c50be01fabb3dca477346c61311d86a24;hpb=52db0db90ba1361e96c0313b6e51817ef4891c49;p=Mograsim.git
diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/CoreWire.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/CoreWire.java
index f130cd4c..13f54a01 100644
--- a/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/CoreWire.java
+++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/CoreWire.java
@@ -129,67 +129,6 @@ public class CoreWire
notifyObservers();
}
- /**
- * The {@link CoreWire} is interpreted as an unsigned integer with n bits.
- *
- * @return true
if all bits are either Bit.ONE
or Bit.ZERO
(they do not all have to have the same
- * value), not Bit.U
, Bit.X
or Bit.Z
. false
is returned otherwise.
- *
- * @author Fabian Stemmler
- */
- public boolean hasNumericValue()
- {
- return getValues().isBinary();
- }
-
- /**
- * The {@link CoreWire} is interpreted as an unsigned integer with n bits.
- *
- * @return The unsigned value of the {@link CoreWire}'s bits, where value 0 corresponds with 2^0, value 1 is 2^1 and so on.
- *
- * @author Fabian Stemmler
- */
- public long getUnsignedValue()
- {
- long val = 0;
- long mask = 1;
- for (Bit bit : getValues())
- {
- switch (bit)
- {
- default:
- case Z:
- case X:
- return 0; // TODO: Proper handling for getUnsignedValue(), if not all bits are 1 or 0;
- case ONE:
- val |= mask;
- break;
- case ZERO:
- }
- mask = mask << 1;
- }
- return val;
- }
-
- /**
- * The {@link CoreWire} is interpreted as a signed integer with n bits.
- *
- * @return The signed value of the {@link CoreWire}'s bits, where value 0 corresponds with 2^0, value 1 is 2^1 and so on.
- *
- * @author Fabian Stemmler
- */
- public long getSignedValue()
- {
- long val = getUnsignedValue();
- long mask = 1 << (width - 1);
- if ((mask & val) != 0)
- {
- int shifts = 64 - width;
- return (val << shifts) >> shifts;
- }
- return val;
- }
-
/**
* Returns the least significant bit (LSB)
*/
@@ -326,43 +265,6 @@ public class CoreWire
return CoreWire.this.getValues(start, end);
}
- /**
- * The {@link CoreWire} is interpreted as an unsigned integer with n bits.
- *
- * @return true
if all bits are either Bit.ONE
or Bit.ZERO
(they do not all have to have the
- * same value), not Bit.X
or Bit.Z
. false
is returned otherwise.
- *
- * @author Fabian Stemmler
- */
- public boolean hasNumericValue()
- {
- return CoreWire.this.hasNumericValue();
- }
-
- /**
- * The {@link CoreWire} is interpreted as an unsigned integer with n bits.
- *
- * @return The unsigned value of the {@link CoreWire}'s bits, where value 0 corresponds with 2^0, value 1 is 2^1 and so on.
- *
- * @author Fabian Stemmler
- */
- public long getUnsignedValue()
- {
- return CoreWire.this.getUnsignedValue();
- }
-
- /**
- * The {@link CoreWire} is interpreted as a signed integer with n bits.
- *
- * @return The signed value of the {@link CoreWire}'s bits, where value 0 corresponds with 2^0, value 1 is 2^1 and so on.
- *
- * @author Fabian Stemmler
- */
- public long getSignedValue()
- {
- return CoreWire.this.getSignedValue();
- }
-
@Override
public String toString()
{