diff options
| author | Paul Brook <paul@codesourcery.com> | 2011-04-08 11:42:19 +0000 |
|---|---|---|
| committer | Paul Brook <paul@codesourcery.com> | 2011-04-08 11:42:19 +0000 |
| commit | 1fbaefec00e08a2a0dd55e59dcd570d8f1e1b3b1 (patch) | |
| tree | 0b654556c4b9aa0d2d5b7a6d9e31a7c5e00f8581 /opcodes | |
| parent | 33b5443119cdb4fdf5101afcbd73bee489840062 (diff) | |
| download | fsf-binutils-gdb-1fbaefec00e08a2a0dd55e59dcd570d8f1e1b3b1.zip fsf-binutils-gdb-1fbaefec00e08a2a0dd55e59dcd570d8f1e1b3b1.tar.gz fsf-binutils-gdb-1fbaefec00e08a2a0dd55e59dcd570d8f1e1b3b1.tar.bz2 | |
2011-04-07 Paul Carroll<pcarroll@codesourcery.com>
opcodes/
* arm-dis.c (print_insn): init vars moved into private_data structure.
binutils/testsuite/
* binutils-all/arm/simple.s: Demo issue with objdump with
multiple input files
* binutils-all/arm/objdump.exp: added new ARM test case code
Diffstat (limited to 'opcodes')
| -rw-r--r-- | opcodes/ChangeLog | 4 | ||||
| -rw-r--r-- | opcodes/arm-dis.c | 41 |
2 files changed, 27 insertions, 18 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 734f824..7e56d0b 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +2011-04-07 Paul Carroll<pcarroll@codesourcery.com> + + * arm-dis.c (print_insn): init vars moved into private_data structure. + 2011-03-24 Mike Frysinger <vapier@gentoo.org> * bfin-dis.c (decode_dsp32mac_0): Move MM zeroing down to MAC0 logic. diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c index e8abbf5..f1b2104 100644 --- a/opcodes/arm-dis.c +++ b/opcodes/arm-dis.c @@ -45,6 +45,14 @@ #define NUM_ELEM(a) (sizeof (a) / sizeof (a)[0]) #endif +/* Cached mapping symbol state. */ +enum map_type +{ + MAP_ARM, + MAP_THUMB, + MAP_DATA +}; + struct arm_private_data { /* The features to use when disassembling optional instructions. */ @@ -53,6 +61,13 @@ struct arm_private_data /* Whether any mapping symbols are present in the provided symbol table. -1 if we do not know yet, otherwise 0 or 1. */ int has_mapping_symbols; + + /* Track the last type (although this doesn't seem to be useful) */ + enum map_type last_type; + + /* Tracking symbol table information */ + int last_mapping_sym; + bfd_vma last_mapping_addr; }; struct opcode32 @@ -1642,18 +1657,6 @@ static unsigned int ifthen_next_state; static bfd_vma ifthen_address; #define IFTHEN_COND ((ifthen_state >> 4) & 0xf) -/* Cached mapping symbol state. */ -enum map_type -{ - MAP_ARM, - MAP_THUMB, - MAP_DATA -}; - -enum map_type last_type; -int last_mapping_sym = -1; -bfd_vma last_mapping_addr = 0; - /* Functions. */ int @@ -4635,6 +4638,8 @@ print_insn (bfd_vma pc, struct disassemble_info *info, bfd_boolean little) select_arm_features (info->mach, & private.features); private.has_mapping_symbols = -1; + private.last_mapping_sym = -1; + private.last_mapping_addr = 0; info->private_data = & private; } @@ -4658,8 +4663,8 @@ print_insn (bfd_vma pc, struct disassemble_info *info, bfd_boolean little) /* Start scanning at the start of the function, or wherever we finished last time. */ start = info->symtab_pos + 1; - if (start < last_mapping_sym) - start = last_mapping_sym; + if (start < private_data->last_mapping_sym) + start = private_data->last_mapping_sym; found = FALSE; /* First, look for mapping symbols. */ @@ -4754,10 +4759,10 @@ print_insn (bfd_vma pc, struct disassemble_info *info, bfd_boolean little) } } - last_mapping_sym = last_sym; - last_type = type; - is_thumb = (last_type == MAP_THUMB); - is_data = (last_type == MAP_DATA); + private_data->last_mapping_sym = last_sym; + private_data->last_type = type; + is_thumb = (private_data->last_type == MAP_THUMB); + is_data = (private_data->last_type == MAP_DATA); /* Look a little bit ahead to see if we should print out two or four bytes of data. If there's a symbol, |