Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 33 additions & 3 deletions lib/src/signals/logic.dart
Original file line number Diff line number Diff line change
Expand Up @@ -319,13 +319,43 @@ class Logic {
void operator <=(Logic other) => gets(other);

/// Logical bitwise NOT.
Logic operator ~() => NotGate(this).out;
Logic operator ~() => this is Const ? Const(~value) : NotGate(this).out;

/// Logical bitwise AND.
Logic operator &(Logic other) => And2Gate(this, other).out;
Logic operator &(Logic other) {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upon review, I realized that perhaps operators could be overridden on Const class instead of these special cases here.

For example:

if(other is Const) {
return other & this;
}

Then in Const you can just override @override Logic operator &(Logic other) to perform the const version of things.

if (this is Const &&
Comment thread
mjayasim9 marked this conversation as resolved.
Outdated
other is Const &&
value.isValid &&
other.value.isValid) {
if (value == LogicValue.of(0, width: width) ||
other.value == LogicValue.of(0, width: width)) {
return Const(LogicValue.of(0, width: width));
} else if (value == LogicValue.filled(width, LogicValue.one)) {
return other;
} else if (other.value == LogicValue.filled(width, LogicValue.one)) {
return this;
}
}
return And2Gate(this, other).out;
}

/// Logical bitwise OR.
Logic operator |(Logic other) => Or2Gate(this, other).out;
Logic operator |(Logic other) {
Comment thread
mjayasim9 marked this conversation as resolved.
if (this is Const &&
other is Const &&
value.isValid &&
other.value.isValid) {
if (value == LogicValue.filled(width, LogicValue.one) ||
other.value == LogicValue.filled(width, LogicValue.one)) {
return Const(LogicValue.filled(width, LogicValue.one));
} else if (value == LogicValue.of(LogicValue.zero, width: width)) {
return other;
} else if (other.value == LogicValue.of(LogicValue.zero, width: width)) {
return this;
}
}
return Or2Gate(this, other).out;
}

/// Logical bitwise XOR.
Logic operator ^(Logic other) => Xor2Gate(this, other).out;
Expand Down
109 changes: 109 additions & 0 deletions test/gate_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,115 @@ void main() {
});
});

group('Const input Gate test', () {
test('NotGate single bit Constant input', () async {
final a = Logic();
Comment thread
mjayasim9 marked this conversation as resolved.
Outdated
final b = Const(LogicValue.zero, width: 1);
final c = Const(LogicValue.x, width: 1);
final d = Const(LogicValue.one, width: 1);
a.put(LogicValue.one);

expect(~b, isA<Const>());
expect((~b).value, equals(LogicValue.one));

expect(~c, isA<Const>());
expect((~c).value, equals(LogicValue.x));

expect(~d, isA<Const>());
expect((~d).value, equals(LogicValue.zero));
});

test('NotGate Multi bit Constant input', () async {
final b = Const(bin('1111'), width: 4);
final c = Const(bin('0100'), width: 4);

expect(~b, isA<Const>());
expect((~b).value, equals(LogicValue.of(LogicValue.zero, width: 4)));

expect(~c, isA<Logic>());
expect((~c).value, equals(LogicValue.of(11, width: 4)));
});

test('And2Gate Single bit Constant input', () async {
final a = Logic();
final b = Const(LogicValue.zero, width: 1);
final c = Const(LogicValue.x, width: 1);
final d = Const(LogicValue.one, width: 1);
a.put(LogicValue.one);

expect(a & b, isA<Logic>());
Comment thread
mjayasim9 marked this conversation as resolved.
Outdated
expect((a & b).value, equals(LogicValue.zero));

expect(a & c, isA<Logic>());
expect((a & c).value, equals(LogicValue.x));

expect(b & c, isA<Logic>());
expect((b & c).value, equals(LogicValue.zero));

expect(a & d, isA<Logic>());
expect((a & d).value, equals(a.value));

expect(b & d, isA<Const>());
expect((b & d).value, equals(LogicValue.zero));
});

test('And2Gate Multi bit Constant input', () async {
final a = Const(LogicValue.of(LogicValue.zero, width: 4));
final b = Const('1111', width: 4);
final c = Const('0100', width: 4);
final d = Const(1, width: 32, fill: true);
final e = Const('10110', width: 32);
final z = Const('11111', width: 5);
final y = Const(LogicValue.of('11x01', width: 5));

expect(a & c, isA<Const>());
expect((a & c).value, equals(LogicValue.of(LogicValue.zero, width: 4)));

expect(b & c, isA<Logic>());
expect((b & c).value, equals(c.value));

expect(d & e, isA<Const>());
expect((d & e).value, equals(LogicValue.of('10110', width: 32)));

expect(y & z, isA<Logic>());
expect((y & z).value, equals(LogicValue.of('11x01', width: 5)));
});

test('OR2Gate Single bit Constant input', () async {
final a = Logic();
final b = Const(LogicValue.zero, width: 1);
final c = Const(LogicValue.x, width: 1);
final d = Const(LogicValue.one, width: 1);
final z = Const('11111', width: 5);
final y = Const(LogicValue.of('11x01', width: 5));
a.put(LogicValue.one);

expect(a | b, isA<Logic>());
expect((a | b).value, equals(a.value));

expect(a | c, isA<Logic>());
expect((a | c).value, equals(LogicValue.one));

expect(a | d, isA<Logic>());
expect((a | d).value, equals(LogicValue.one));
Comment thread
mjayasim9 marked this conversation as resolved.
Outdated

expect(y | z, isA<Logic>());
expect((y | z).value, equals(LogicValue.of('11111', width: 5)));
});

test('OR2Gate Multi bit Constant input', () async {
final a = Const(LogicValue.of(LogicValue.zero, width: 4));
final b = Const(bin('1111'), width: 4);
final c = Const(bin('0100'), width: 4);

expect(a | c, isA<Logic>());
expect((a | c).value, equals(c.value));

expect(b | c, isA<Const>());
expect((b | c).value, equals(LogicValue.filled(4, LogicValue.one)));
});
});

group('simcompare', () {
test('NotGate single bit', () async {
final gtm = GateTestModule(Logic(), Logic());
Expand Down