diff --git a/myhdl/Simulation.py b/myhdl/Simulation.py index 72707e3a..994261c7 100644 --- a/myhdl/Simulation.py +++ b/myhdl/Simulation.py @@ -37,10 +37,10 @@ from Cosimulation import Cosimulation from join import join from _Waiter import _Waiter from util import StopSimulation, SuspendSimulation -try: - import simrunc -except: - pass +## try: +## import simrunc +## except: +## pass schedule = _futureEvents.append diff --git a/myhdl/intbv.py b/myhdl/intbv.py index 37a528ff..3508135c 100644 --- a/myhdl/intbv.py +++ b/myhdl/intbv.py @@ -261,7 +261,9 @@ class intbv(object): self._val %= other return self - def __ipow__(self, other, modulo): # XXX why 3rd param required? + def __ipow__(self, other, modulo=None): + # XXX why 3rd param required? + # unused but needed in 2.2, not in 2.3 if type(other) is intbv: self._val **= other._val else: diff --git a/myhdl/test_intbv.py b/myhdl/test_intbv.py index f550364b..179bf637 100644 --- a/myhdl/test_intbv.py +++ b/myhdl/test_intbv.py @@ -261,11 +261,11 @@ class TestIntBvAsInt(TestCase): def binaryCheck(self, op, imin=0, imax=None, jmin=0, jmax=None): self.seqSetup(imin=imin, imax=imax, jmin=jmin, jmax=jmax) for i, j in zip(self.seqi, self.seqj): - bi = intbv(i) + bi = intbv(long(i)) bj = intbv(j) - ref = op(i, j) + ref = op(long(i), j) r1 = op(bi, j) - r2 = op(i, bj) + r2 = op(long(i), bj) r3 = op(bi, bj) self.assertEqual(type(r1), intbv) self.assertEqual(type(r2), intbv) @@ -278,13 +278,13 @@ class TestIntBvAsInt(TestCase): self.seqSetup(imin=imin, imax=imax, jmin=jmin, jmax=jmax) for i, j in zip(self.seqi, self.seqj): bj = intbv(j) - ref = i + ref = long(i) exec("ref %s j" % op) - r1 = bi1 = intbv(i) + r1 = bi1 = intbv(long(i)) exec("r1 %s j" % op) - r2 = i + r2 = long(i) exec("r2 %s bj" % op) - r3 = bi3 = intbv(i) + r3 = bi3 = intbv(long(i)) exec("r3 %s bj" % op) self.assertEqual(type(r1), intbv) self.assertEqual(type(r3), intbv)