From 054762da3dddec162c142c407e0f5b75a5b5a710 Mon Sep 17 00:00:00 2001
From: Dmitry Butyugin <dmbutyugin@google.com>
Date: Fri, 20 Mar 2020 18:55:21 +0100
Subject: [PATCH] avrsim: migrated to Python 3

Note that the latest simulavr 1.1.0 does not support Python 2 anymore.

Signed-off-by: Dmitry Butyugin <dmbutyugin@google.com>
---
 scripts/avrsim.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/avrsim.py b/scripts/avrsim.py
index bbf97e87..d2d9ef96 100755
--- a/scripts/avrsim.py
+++ b/scripts/avrsim.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Script to interact with simulavr by simulating a serial port.
 #
 # Copyright (C) 2015-2018  Kevin O'Connor <kevin@koconnor.net>
@@ -17,7 +17,7 @@ class SerialRxPin(pysimulavr.PySimulationMember, pysimulavr.Pin):
         pysimulavr.PySimulationMember.__init__(self)
         self.terminal = terminal
         self.sc = pysimulavr.SystemClock.Instance()
-        self.delay = SIMULAVR_FREQ / baud
+        self.delay = SIMULAVR_FREQ // baud
         self.current = 0
         self.pos = -1
     def SetInState(self, pin):
@@ -33,7 +33,7 @@ class SerialRxPin(pysimulavr.PySimulationMember, pysimulavr.Pin):
         if self.pos == 1:
             return int(self.delay * 1.5)
         if self.pos >= SERIALBITS:
-            data = chr((self.current >> 1) & 0xff)
+            data = bytearray(((self.current >> 1) & 0xff,))
             self.terminal.write(data)
             self.pos = -1
             self.current = 0
@@ -48,10 +48,10 @@ class SerialTxPin(pysimulavr.PySimulationMember, pysimulavr.Pin):
         self.terminal = terminal
         self.SetPin('H')
         self.sc = pysimulavr.SystemClock.Instance()
-        self.delay = SIMULAVR_FREQ / baud
+        self.delay = SIMULAVR_FREQ // baud
         self.current = 0
         self.pos = 0
-        self.queue = ""
+        self.queue = b""
         self.sc.Add(self)
     def DoStep(self, trueHwStep):
         if not self.pos:
@@ -60,7 +60,7 @@ class SerialTxPin(pysimulavr.PySimulationMember, pysimulavr.Pin):
                 if not data:
                     return self.delay * 100
                 self.queue += data
-            self.current = (ord(self.queue[0]) << 1) | 0x200
+            self.current = (self.queue[0] << 1) | 0x200
             self.queue = self.queue[1:]
         newstate = 'L'
         if self.current & (1 << self.pos):
@@ -109,7 +109,7 @@ class Pacing(pysimulavr.PySimulationMember):
         self.next_check_clock = 0
         self.rel_time = time.time()
         self.best_offset = 0.
-        self.delay = SIMULAVR_FREQ / 10000
+        self.delay = SIMULAVR_FREQ // 10000
         self.sc.Add(self)
     def DoStep(self, trueHwStep):
         curtime = time.time()
@@ -135,7 +135,7 @@ class TerminalIO:
     def read(self):
         try:
             return os.read(self.fd, 64)
-        except os.error, e:
+        except os.error as e:
             if e.errno not in (errno.EAGAIN, errno.EWOULDBLOCK):
                 pysimulavr.SystemClock.Instance().stop()
         return ""
@@ -198,7 +198,7 @@ def main():
     trace = Tracing(options.tracefile, options.trace)
     dev = pysimulavr.AvrFactory.instance().makeDevice(proc)
     dev.Load(elffile)
-    dev.SetClockFreq(SIMULAVR_FREQ / speed)
+    dev.SetClockFreq(SIMULAVR_FREQ // speed)
     sc.Add(dev)
     pysimulavr.cvar.sysConHandler.SetUseExit(False)
     trace.load_options()