From: Andrew Burgess <andrew.burgess@embecosm.com>
Date: Thu, 7 Oct 2021 16:48:28 +0000 (+0100)
Subject: s12z/disassembler: call memory_error_func when appropriate
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ba7c18a48457;p=binutils-gdb.git

s12z/disassembler: call memory_error_func when appropriate

If a call to the read_memory_func fails then we should call the
memory_error_func to notify the user of the disassembler of the
address that was a problem.

Without this GDB will report all memory errors as being at address
0x0.

opcodes/ChangeLog:

	* s12z-disc.c (abstract_read_memory): Call memory_error_func if
	the read_memory_func call fails.
---

diff --git a/opcodes/s12z-dis.c b/opcodes/s12z-dis.c
index ec8f4f70883..24125574b78 100644
--- a/opcodes/s12z-dis.c
+++ b/opcodes/s12z-dis.c
@@ -61,6 +61,9 @@ abstract_read_memory (struct mem_read_abstraction_base *b,
 
   int status = (*mra->info->read_memory_func) (mra->memaddr + offset,
 					       bytes, n, mra->info);
+  if (status != 0)
+    (*mra->info->memory_error_func) (status, mra->memaddr + offset,
+                                     mra->info);
   return status != 0 ? -1 : 0;
 }