From 5d8f37ad78fc66901af50c762029a501561f3b23 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Mon, 14 Sep 2009 14:32:27 -0700 Subject: Merge upstream QEMU 10.0.50 into the Android source tree. This change integrates many changes from the upstream QEMU sources. Its main purpose is to enable correct ARMv6 and ARMv7 support to the Android emulator. Due to the nature of the upstream code base, this unfortunately also required changes to many other parts of the source. Note that to ensure easier integrations in the future, some source files and directories that have heavy Android-specific customization have been renamed with an -android suffix. The original files are still there for easier integration tracking, but *never* compiled. For example: net.c net-android.c qemu-char.c qemu-char-android.c slirp/ slirp-android/ etc... Tested on linux-x86, darwin-x86 and windows host machines. --- arm-dis.c | 45 --------------------------------------------- 1 file changed, 45 deletions(-) (limited to 'arm-dis.c') diff --git a/arm-dis.c b/arm-dis.c index ee44292..cc42576 100644 --- a/arm-dis.c +++ b/arm-dis.c @@ -1554,32 +1554,6 @@ enum map_type last_type; int last_mapping_sym = -1; bfd_vma last_mapping_addr = 0; - -/* Functions. */ -int -get_arm_regname_num_options (void) -{ - return NUM_ARM_REGNAMES; -} - -int -set_arm_regname_option (int option) -{ - int old = regname_selected; - regname_selected = option; - return old; -} - -int -get_arm_regnames (int option, const char **setname, const char **setdescription, - const char *const **register_names) -{ - *setname = regnames[option].name; - *setdescription = regnames[option].description; - *register_names = regnames[option].reg_names; - return 16; -} - /* Decode a bitfield of the form matching regexp (N(-N)?,)*N(-N)?. Returns pointer to following character of the format string and fills in *VALUEP and *WIDTHP with the extracted value and number of @@ -4144,22 +4118,3 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info) } return size; } - -void -print_arm_disassembler_options (FILE *stream) -{ - int i; - - fprintf (stream, _("\n\ -The following ARM specific disassembler options are supported for use with\n\ -the -M switch:\n")); - - for (i = NUM_ARM_REGNAMES; i--;) - fprintf (stream, " reg-names-%s %*c%s\n", - regnames[i].name, - (int)(14 - strlen (regnames[i].name)), ' ', - regnames[i].description); - - fprintf (stream, " force-thumb Assume all insns are Thumb insns\n"); - fprintf (stream, " no-force-thumb Examine preceeding label to determine an insn's type\n\n"); -} -- cgit v1.1