occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

wrpll: clean up sign extension

This commit is contained in:
Sebastien Bourdeauducq 2020-10-08 15:28:16 +08:00
parent 87911810d6
commit 3fa5d0b963
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
artiq/gateware/drtio/wrpll/core.py
View File

@ -8,13 +8,6 @@ from artiq.gateware.drtio.wrpll.ddmtd import DDMTD, Collector
from artiq.gateware.drtio.wrpll import thls, filters from artiq.gateware.drtio.wrpll import thls, filters
def _eq_sign_extend(t, s):
"""Assign target signal `t` from source `s`, sign-extending `s` to the
full width.
"""
return t.eq(Cat(s, Replicate(s[-1], len(t) - len(s))))
class FrequencyCounter(Module, AutoCSR): class FrequencyCounter(Module, AutoCSR):
def __init__(self, timer_width=23, counter_width=23, domains=["helper", "rtio", "rtio_rx0"]): def __init__(self, timer_width=23, counter_width=23, domains=["helper", "rtio", "rtio_rx0"]):
for domain in domains: for domain in domains:
@ -68,6 +61,13 @@ class WRPLL(Module, AutoCSR):
self.ref_tag = CSRStatus(N) self.ref_tag = CSRStatus(N)
self.main_tag = CSRStatus(N) self.main_tag = CSRStatus(N)
main_diff_tag_32 = Signal((32, True))
helper_diff_tag_32 = Signal((32, True))
self.comb += [
self.main_diff_tag.status.eq(main_diff_tag_32),
self.helper_diff_tag.status.eq(helper_diff_tag_32)
]
self.clock_domains.cd_helper = ClockDomain() self.clock_domains.cd_helper = ClockDomain()
self.clock_domains.cd_filter = ClockDomain() self.clock_domains.cd_filter = ClockDomain()
self.helper_reset.storage.attr.add("no_retiming") self.helper_reset.storage.attr.add("no_retiming")
@ -126,8 +126,8 @@ class WRPLL(Module, AutoCSR):
If(collector_stb_sys, If(collector_stb_sys,
self.tag_arm.w.eq(0), self.tag_arm.w.eq(0),
If(self.tag_arm.w, If(self.tag_arm.w,
_eq_sign_extend(self.main_diff_tag.status, main_diff_tag_sys), main_diff_tag_32.eq(main_diff_tag_sys),
_eq_sign_extend(self.helper_diff_tag.status, helper_diff_tag_sys), helper_diff_tag_32.eq(helper_diff_tag_sys),
self.ref_tag.status.eq(ref_tag_sys), self.ref_tag.status.eq(ref_tag_sys),
self.main_tag.status.eq(main_tag_sys) self.main_tag.status.eq(main_tag_sys)
) )