From: Megan Wachs <megan@sifive.com>
Date: Mon, 14 Aug 2017 20:33:31 +0000 (-0700)
Subject: Merge pull request #66 from riscv/debug_user_niceness
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=489838cc68e8c332ed49d189be13212c46716445;hp=572ccda6a47f051db4f28f9ed87cbbf8491a517c;p=riscv-tests.git

Merge pull request #66 from riscv/debug_user_niceness

Debug: Usability Features
---

diff --git a/debug/gdbserver.py b/debug/gdbserver.py
index dea9990..ed881e4 100755
--- a/debug/gdbserver.py
+++ b/debug/gdbserver.py
@@ -124,13 +124,12 @@ class SimpleMemoryTest(GdbTest):
         assertEqual(self.gdb.p("sizeof(%s)" % data_type), size)
         a = 0x86753095555aaaa & ((1<<(size*8))-1)
         b = 0xdeadbeef12345678 & ((1<<(size*8))-1)
-        self.gdb.p("*((%s*)0x%x) = 0x%x" % (data_type, self.target.ram, a))
-        self.gdb.p("*((%s*)0x%x) = 0x%x" % (data_type, self.target.ram + size,
-            b))
-        assertEqual(self.gdb.p("*((%s*)0x%x)" % (data_type, self.target.ram)),
-                a)
-        assertEqual(self.gdb.p("*((%s*)0x%x)" % (
-            data_type, self.target.ram + size)), b)
+        addrA = self.target.ram
+        addrB = self.target.ram + self.target.ram_size - size
+        self.gdb.p("*((%s*)0x%x) = 0x%x" % (data_type, addrA, a))
+        self.gdb.p("*((%s*)0x%x) = 0x%x" % (data_type, addrB, b))
+        assertEqual(self.gdb.p("*((%s*)0x%x)" % (data_type, addrA)), a)
+        assertEqual(self.gdb.p("*((%s*)0x%x)" % (data_type, addrB)), b)
 
 class MemTest8(SimpleMemoryTest):
     def test(self):