FPGA/myhdl
1
0
Fork 0
mirror of https://github.com/myhdl/myhdl.git synced 2024-12-14 07:44:38 +08:00
Code Issues Projects Releases Wiki Activity

make it work with 2.3 and 2.2

Browse Source
This commit is contained in:
jand 2003-06-17 19:04:13 +00:00
parent 19c6397087
commit febac06c8d
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
myhdl/Simulation.py
View File

@ -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

4
myhdl/intbv.py
View File

@ -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:

14
myhdl/test_intbv.py
View File

@ -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)