projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NS32K arg_bufs uninitialised
[deliverable/binutils-gdb.git]
/
opcodes
/
rl78-dis.c
diff --git
a/opcodes/rl78-dis.c
b/opcodes/rl78-dis.c
index a23999dc3a1c0119fdb4afb337232aea437e5c89..ef7d9490169e23d3673f5af99714014048488c43 100644
(file)
--- a/
opcodes/rl78-dis.c
+++ b/
opcodes/rl78-dis.c
@@
-1,5
+1,5
@@
/* Disassembler code for Renesas RL78.
/* Disassembler code for Renesas RL78.
- Copyright (C) 2011-20
16
Free Software Foundation, Inc.
+ Copyright (C) 2011-20
20
Free Software Foundation, Inc.
Contributed by Red Hat.
Written by DJ Delorie.
Contributed by Red Hat.
Written by DJ Delorie.
@@
-25,10
+25,12
@@
#include "bfd.h"
#include "elf-bfd.h"
#include "bfd.h"
#include "elf-bfd.h"
-#include "dis
-asm
.h"
+#include "dis
assemble
.h"
#include "opcode/rl78.h"
#include "elf/rl78.h"
#include "opcode/rl78.h"
#include "elf/rl78.h"
+#include <setjmp.h>
+
#define DEBUG_SEMANTICS 0
typedef struct
#define DEBUG_SEMANTICS 0
typedef struct
@@
-37,16
+39,30
@@
typedef struct
disassemble_info * dis;
} RL78_Data;
disassemble_info * dis;
} RL78_Data;
+struct private
+{
+ OPCODES_SIGJMP_BUF bailout;
+};
+
static int
rl78_get_byte (void * vdata)
{
bfd_byte buf[1];
RL78_Data *rl78_data = (RL78_Data *) vdata;
static int
rl78_get_byte (void * vdata)
{
bfd_byte buf[1];
RL78_Data *rl78_data = (RL78_Data *) vdata;
+ int status;
+
+ status = rl78_data->dis->read_memory_func (rl78_data->pc,
+ buf,
+ 1,
+ rl78_data->dis);
+ if (status != 0)
+ {
+ struct private *priv = (struct private *) rl78_data->dis->private_data;
-
rl78_data->dis->read_memory_func (
rl78_data->pc,
- buf,
- 1,
- rl78_data->dis);
+
rl78_data->dis->memory_error_func (status,
rl78_data->pc,
+ rl78_data->dis);
+ OPCODES_SIGLONGJMP (priv->bailout, 1);
+ }
rl78_data->pc ++;
return buf[0];
rl78_data->pc ++;
return buf[0];
@@
-92,10
+108,18
@@
print_insn_rl78_common (bfd_vma addr, disassemble_info * dis, RL78_Dis_Isa isa)
#if DEBUG_SEMANTICS
static char buf[200];
#endif
#if DEBUG_SEMANTICS
static char buf[200];
#endif
+ struct private priv;
+ dis->private_data = (PTR) &priv;
rl78_data.pc = addr;
rl78_data.dis = dis;
rl78_data.pc = addr;
rl78_data.dis = dis;
+ if (OPCODES_SIGSETJMP (priv.bailout) != 0)
+ {
+ /* Error return. */
+ return -1;
+ }
+
rv = rl78_decode_opcode (addr, &opcode, rl78_get_byte, &rl78_data, isa);
dis->bytes_per_line = 10;
rv = rl78_decode_opcode (addr, &opcode, rl78_get_byte, &rl78_data, isa);
dis->bytes_per_line = 10;
@@
-382,7
+406,11
@@
print_insn_rl78_g14 (bfd_vma addr, disassemble_info * dis)
disassembler_ftype
rl78_get_disassembler (bfd *abfd)
{
disassembler_ftype
rl78_get_disassembler (bfd *abfd)
{
- int cpu = abfd->tdata.elf_obj_data->elf_header->e_flags & E_FLAG_RL78_CPU_MASK;
+ int cpu = E_FLAG_RL78_ANY_CPU;
+
+ if (abfd != NULL)
+ cpu = abfd->tdata.elf_obj_data->elf_header->e_flags & E_FLAG_RL78_CPU_MASK;
+
switch (cpu)
{
case E_FLAG_RL78_G10:
switch (cpu)
{
case E_FLAG_RL78_G10:
This page took
0.026983 seconds
and
4
git commands to generate.