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

coredevice: use new nac3 binary shift typing rules

This commit is contained in:
Sebastien Bourdeauducq 2023-11-11 11:08:52 +08:00
parent 42a9cc725b
commit 5bbac04bef
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artiq/coredevice/ad9910.py
View File

@ -332,7 +332,7 @@ class AD9910:
self.bus.write(0) self.bus.write(0)
hi = self.bus.read() hi = self.bus.read()
lo = self.bus.read() lo = self.bus.read()
return (int64(hi) << int64(32)) | int64(lo) return (int64(hi) << 32) | int64(lo)
@kernel @kernel
def write64(self, addr: int32, data_high: int32, data_low: int32): def write64(self, addr: int32, data_high: int32, data_low: int32):
@ -633,8 +633,8 @@ class AD9910:
data = int64(self.read64(_AD9910_REG_PROFILE0 + profile)) data = int64(self.read64(_AD9910_REG_PROFILE0 + profile))
# Extract and return fields # Extract and return fields
ftw = int32(data) ftw = int32(data)
pow_ = int32(data >> int64(32)) & 0xffff pow_ = int32(data >> 32) & 0xffff
asf = int32(data >> int64(48)) & 0x3fff asf = int32(data >> 48) & 0x3fff
return ftw, pow_, asf return ftw, pow_, asf
@kernel @kernel

6
artiq/coredevice/ad9912.py
View File

@ -189,7 +189,7 @@ class AD9912:
self.bus.write((AD9912_POW1 << 16) | (3 << 29)) self.bus.write((AD9912_POW1 << 16) | (3 << 29))
self.bus.set_config_mu(SPI_CONFIG, 32, self.bus.set_config_mu(SPI_CONFIG, 32,
SPIT_DDS_WR, self.chip_select) SPIT_DDS_WR, self.chip_select)
self.bus.write((pow_ << 16) | (int32(ftw >> int64(32)) & 0xffff)) self.bus.write((pow_ << 16) | (int32(ftw >> 32) & 0xffff))
self.bus.set_config_mu(SPI_CONFIG | SPI_END, 32, self.bus.set_config_mu(SPI_CONFIG | SPI_END, 32,
SPIT_DDS_WR, self.chip_select) SPIT_DDS_WR, self.chip_select)
self.bus.write(int32(ftw)) self.bus.write(int32(ftw))
@ -209,7 +209,7 @@ class AD9912:
self.core.break_realtime() # Regain slack to perform second read self.core.break_realtime() # Regain slack to perform second read
low = self.read(AD9912_FTW3, 4) low = self.read(AD9912_FTW3, 4)
# Extract and return fields # Extract and return fields
ftw = (int64(high & 0xffff) << int64(32)) | (int64(low) & int64(0xffffffff)) ftw = (int64(high & 0xffff) << 32) | (int64(low) & int64(0xffffffff))
pow_ = (high >> 16) & 0x3fff pow_ = (high >> 16) & 0x3fff
return ftw, pow_ return ftw, pow_
@ -219,7 +219,7 @@ class AD9912:
frequency. frequency.
""" """
return round64(self.ftw_per_hz * frequency) & ( return round64(self.ftw_per_hz * frequency) & (
(int64(1) << int64(48)) - int64(1)) (int64(1) << 48) - int64(1))
@portable @portable
def ftw_to_frequency(self, ftw: int64) -> float: def ftw_to_frequency(self, ftw: int64) -> float:

8
artiq/coredevice/adf5356.py
View File

@ -201,7 +201,7 @@ class ADF5356:
# select minimal output divider # select minimal output divider
rf_div_sel = 0 rf_div_sel = 0
while freq < ADF5356_MIN_VCO_FREQ: while freq < ADF5356_MIN_VCO_FREQ:
freq <<= int64(1) freq <<= 1
rf_div_sel += 1 rf_div_sel += 1
if (1 << rf_div_sel) > 64: if (1 << rf_div_sel) > 64:
@ -274,7 +274,7 @@ class ADF5356:
# calculate PLL at f_pfd/2 # calculate PLL at f_pfd/2
n, frac1, (frac2_msb, frac2_lsb), (mod2_msb, mod2_lsb) = calculate_pll( n, frac1, (frac2_msb, frac2_lsb), (mod2_msb, mod2_lsb) = calculate_pll(
self.f_vco(), f_pfd >> int64(1) self.f_vco(), f_pfd >> 1
) )
self.core.delay(200. * us) # Slack self.core.delay(200. * us) # Slack
@ -596,8 +596,8 @@ def calculate_pll(f_vco: int64, f_pfd: int64) -> tuple[int32, int32, tuple[int32
mod2 = f_pfd mod2 = f_pfd
while mod2 > int64(ADF5356_MAX_MODULUS2): while mod2 > int64(ADF5356_MAX_MODULUS2):
mod2 >>= int64(1) mod2 >>= 1
frac2 >>= int64(1) frac2 >>= 1
gcd_div = gcd(frac2, mod2) gcd_div = gcd(frac2, mod2)
mod2 //= gcd_div mod2 //= gcd_div

16
artiq/coredevice/shuttler.py
View File

@ -176,11 +176,11 @@ class DCBias:
a1, a1,
a1 >> 16, a1 >> 16,
int32(a2 & int64(0xFFFF)), int32(a2 & int64(0xFFFF)),
int32((a2 >> int64(16)) & int64(0xFFFF)), int32((a2 >> 16) & int64(0xFFFF)),
int32((a2 >> int64(32)) & int64(0xFFFF)), int32((a2 >> 32) & int64(0xFFFF)),
int32(a3 & int64(0xFFFF)), int32(a3 & int64(0xFFFF)),
int32((a3 >> int64(16)) & int64(0xFFFF)), int32((a3 >> 16) & int64(0xFFFF)),
int32((a3 >> int64(32)) & int64(0xFFFF)), int32((a3 >> 32) & int64(0xFFFF)),
] ]
for i in range(len(coef_words)): for i in range(len(coef_words)):
@ -269,11 +269,11 @@ class DDS:
b1, b1,
b1 >> 16, b1 >> 16,
int32(b2 & int64(0xFFFF)), int32(b2 & int64(0xFFFF)),
int32((b2 >> int64(16)) & int64(0xFFFF)), int32((b2 >> 16) & int64(0xFFFF)),
int32((b2 >> int64(32)) & int64(0xFFFF)), int32((b2 >> 32) & int64(0xFFFF)),
int32(b3 & int64(0xFFFF)), int32(b3 & int64(0xFFFF)),
int32((b3 >> int64(16)) & int64(0xFFFF)), int32((b3 >> 16) & int64(0xFFFF)),
int32((b3 >> int64(32)) & int64(0xFFFF)), int32((b3 >> 32) & int64(0xFFFF)),
c0, c0,
c1, c1,
c1 >> 16, c1 >> 16,