M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

language/core: fix interpreter implementations of time/cycle conversions

This commit is contained in:
Sebastien Bourdeauducq 2015-02-25 21:15:46 -07:00
parent 1b5944257e
commit d51493fb5d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artiq/language/core.py
View File

@ -6,8 +6,6 @@ Core ARTIQ extensions to the Python language.
from collections import namedtuple as _namedtuple from collections import namedtuple as _namedtuple
from functools import wraps as _wraps from functools import wraps as _wraps
from artiq.language import units as _units
class int64(int): class int64(int):
"""64-bit integers for static compilation. """64-bit integers for static compilation.
@ -236,7 +234,7 @@ def time_to_cycles(time, core=None):
""" """
if core is None: if core is None:
raise ValueError("Core device must be specified for time conversion") raise ValueError("Core device must be specified for time conversion")
return round64(time.amount//core.runtime_env.ref_period) return round64(time.amount//core.ref_period)
def cycles_to_time(cycles, core=None): def cycles_to_time(cycles, core=None):
@ -249,7 +247,7 @@ def cycles_to_time(cycles, core=None):
""" """
if core is None: if core is None:
raise ValueError("Core device must be specified for time conversion") raise ValueError("Core device must be specified for time conversion")
return cycles*core.runtime_env.ref_period*_units.s return cycles*core.ref_period
def syscall(*args): def syscall(*args):