aboutsummaryrefslogtreecommitdiff
path: root/disas.c
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2003-10-27 21:13:58 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2003-10-27 21:13:58 +0000
commitc6105c0a042ba0ecb59038f9f2edab8aa4322baf (patch)
tree06ce84773a77666c8b6dd62a19973f75479fcbee /disas.c
parent93a40ea9264dfd5df63669e785fed1c9db0041f4 (diff)
added correct memory access code for system emulation
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@407 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'disas.c')
-rw-r--r--disas.c39
1 files changed, 33 insertions, 6 deletions
diff --git a/disas.c b/disas.c
index 81ba50a964..0c8cc2a8f4 100644
--- a/disas.c
+++ b/disas.c
@@ -5,6 +5,9 @@
#include "elf.h"
#include <errno.h>
+#include "cpu.h"
+#include "exec-all.h"
+
/* Filled in by elfload.c. Simplistic, but will do for now. */
unsigned int disas_num_syms;
void *disas_symtab;
@@ -19,14 +22,32 @@ buffer_read_memory (memaddr, myaddr, length, info)
int length;
struct disassemble_info *info;
{
- if (memaddr < info->buffer_vma
- || memaddr + length > info->buffer_vma + info->buffer_length)
- /* Out of bounds. Use EIO because GDB uses it. */
- return EIO;
- memcpy (myaddr, info->buffer + (memaddr - info->buffer_vma), length);
- return 0;
+ if (memaddr < info->buffer_vma
+ || memaddr + length > info->buffer_vma + info->buffer_length)
+ /* Out of bounds. Use EIO because GDB uses it. */
+ return EIO;
+ memcpy (myaddr, info->buffer + (memaddr - info->buffer_vma), length);
+ return 0;
}
+#if !defined(CONFIG_USER_ONLY)
+/* Get LENGTH bytes from info's buffer, at target address memaddr.
+ Transfer them to myaddr. */
+static int
+target_read_memory (memaddr, myaddr, length, info)
+ bfd_vma memaddr;
+ bfd_byte *myaddr;
+ int length;
+ struct disassemble_info *info;
+{
+ int i;
+ for(i = 0; i < length; i++) {
+ myaddr[i] = ldub_code((void *)((long)memaddr));
+ }
+ return 0;
+}
+#endif
+
/* Print an error message. We can assume that this is in response to
an error return from buffer_read_memory. */
void
@@ -103,6 +124,12 @@ void disas(FILE *out, void *code, unsigned long size, int is_host, int flags)
INIT_DISASSEMBLE_INFO(disasm_info, out, fprintf);
+#if !defined(CONFIG_USER_ONLY)
+ if (!is_host) {
+ disasm_info.read_memory_func = target_read_memory;
+ }
+#endif
+
disasm_info.buffer = code;
disasm_info.buffer_vma = (unsigned long)code;
disasm_info.buffer_length = size;