Skip to content

Commit

Permalink
coredevice: deserialize int64(width=64) as int(width=64), not host_int.
Browse files Browse the repository at this point in the history
Fixes #402.
  • Loading branch information
whitequark committed Apr 21, 2016
1 parent 9a01d38 commit 5cccdca
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions artiq/coredevice/comm_generic.py
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
from fractions import Fraction

from artiq.coredevice import exceptions
from artiq.language.core import int as wrapping_int
from artiq import __version__ as software_version


@@ -316,9 +317,9 @@ def _receive_rpc_value(self, object_map):
elif tag == "b":
return bool(self._read_int8())
elif tag == "i":
return self._read_int32()
return wrapping_int(self._read_int32(), 32)
elif tag == "I":
return self._read_int64()
return wrapping_int(self._read_int64(), 64)
elif tag == "f":
return self._read_float64()
elif tag == "F":

0 comments on commit 5cccdca

Please sign in to comment.