diff options
Diffstat (limited to 'debug/testlib.py')
| -rw-r--r-- | debug/testlib.py | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/debug/testlib.py b/debug/testlib.py index caf2140..7698980 100644 --- a/debug/testlib.py +++ b/debug/testlib.py @@ -104,8 +104,11 @@ class VcsSim(object): line = listenfile.readline() if not line: time.sleep(1) - if "Listening on port 5555" in line: + match = re.match(r"^Listening on port (\d+)$", line) + if match: done = True + self.port = int(match.group(1)) + print "Using port %d for JTAG VPI" % self.port def __del__(self): try: @@ -126,13 +129,22 @@ class Openocd(object): cmd += ["-f", find_file(config)] if debug: cmd.append("-d") + + # Assign port + self.port = unused_port() + print "Using port %d for gdb server" % self.port + # This command needs to come before any config scripts on the command + # line, since they are executed in order. + cmd[1:1] = ["--command", "gdb_port %d" % self.port] + + env = os.environ.copy() + env['JTAG_VPI_PORT'] = str(otherProcess.port) + logfile = open(Openocd.logname, "w") logfile.write("+ %s\n" % " ".join(cmd)) logfile.flush() self.process = subprocess.Popen(cmd, stdin=subprocess.PIPE, - stdout=logfile, stderr=logfile) - # TODO: Pick a random port - self.port = 3333 + stdout=logfile, stderr=logfile, env=env) # Wait for OpenOCD to have made it through riscv_examine(). When using # OpenOCD to communicate with a simulator this may take a long time, |