aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Fertser <fercerpav@gmail.com>2018-04-09 23:00:10 +0300
committerPaul Fertser <fercerpav@gmail.com>2019-04-04 21:26:40 +0100
commit92c50fda2bbe0061d26a420332ba625bc780cdc4 (patch)
tree9d7beb8363c1151fffd0d70d939f87e33c175c50
parent5202d82a954627c6706529a82447aad4c63aefcc (diff)
downloadriscv-openocd-92c50fda2bbe0061d26a420332ba625bc780cdc4.zip
riscv-openocd-92c50fda2bbe0061d26a420332ba625bc780cdc4.tar.gz
riscv-openocd-92c50fda2bbe0061d26a420332ba625bc780cdc4.tar.bz2
contrib: rpc_examples: python: fix memory retrieval
mem2array returns a Tcl (associative) array and so the order of elements is not guaranteed. Treat it as such. Change-Id: Ie4d1219faac1e60247ca13bc2eedf22041a9a9e9 Signed-off-by: Paul Fertser <fercerpav@gmail.com> Reviewed-on: http://openocd.zylin.com/4487 Tested-by: jenkins Reviewed-by: Christopher Head <chead@zaber.com>
-rwxr-xr-xcontrib/rpc_examples/ocd_rpc_example.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/rpc_examples/ocd_rpc_example.py b/contrib/rpc_examples/ocd_rpc_example.py
index 6c8529c..b585aaa 100755
--- a/contrib/rpc_examples/ocd_rpc_example.py
+++ b/contrib/rpc_examples/ocd_rpc_example.py
@@ -92,9 +92,10 @@ class OpenOcd:
self.send("array unset output") # better to clear the array before
self.send("mem2array output %d 0x%x %d" % (wordLen, address, n))
- output = self.send("ocd_echo $output").split(" ")
+ output = [*map(int, self.send("ocd_echo $output").split(" "))]
+ d = dict([tuple(output[i:i + 2]) for i in range(0, len(output), 2)])
- return [int(output[2*i+1]) for i in range(len(output)//2)]
+ return [d[k] for k in sorted(d.keys())]
def writeVariable(self, address, value):
assert value is not None