Commit 2b3ea3154d38920238fff4a67f477f989d9d8d24
1 parent
a45db6c6
clean build: Fix arm build warnings
Fix remaining arm warnings - except for the mess in the NetWinder FP emulator. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6766 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
4 changed files
with
2 additions
and
64 deletions
arm-dis.c
@@ -1554,32 +1554,6 @@ enum map_type last_type; | @@ -1554,32 +1554,6 @@ enum map_type last_type; | ||
1554 | int last_mapping_sym = -1; | 1554 | int last_mapping_sym = -1; |
1555 | bfd_vma last_mapping_addr = 0; | 1555 | bfd_vma last_mapping_addr = 0; |
1556 | 1556 | ||
1557 | - | ||
1558 | -/* Functions. */ | ||
1559 | -int | ||
1560 | -get_arm_regname_num_options (void) | ||
1561 | -{ | ||
1562 | - return NUM_ARM_REGNAMES; | ||
1563 | -} | ||
1564 | - | ||
1565 | -int | ||
1566 | -set_arm_regname_option (int option) | ||
1567 | -{ | ||
1568 | - int old = regname_selected; | ||
1569 | - regname_selected = option; | ||
1570 | - return old; | ||
1571 | -} | ||
1572 | - | ||
1573 | -int | ||
1574 | -get_arm_regnames (int option, const char **setname, const char **setdescription, | ||
1575 | - const char *const **register_names) | ||
1576 | -{ | ||
1577 | - *setname = regnames[option].name; | ||
1578 | - *setdescription = regnames[option].description; | ||
1579 | - *register_names = regnames[option].reg_names; | ||
1580 | - return 16; | ||
1581 | -} | ||
1582 | - | ||
1583 | /* Decode a bitfield of the form matching regexp (N(-N)?,)*N(-N)?. | 1557 | /* Decode a bitfield of the form matching regexp (N(-N)?,)*N(-N)?. |
1584 | Returns pointer to following character of the format string and | 1558 | Returns pointer to following character of the format string and |
1585 | fills in *VALUEP and *WIDTHP with the extracted value and number of | 1559 | 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) | @@ -4144,22 +4118,3 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info) | ||
4144 | } | 4118 | } |
4145 | return size; | 4119 | return size; |
4146 | } | 4120 | } |
4147 | - | ||
4148 | -void | ||
4149 | -print_arm_disassembler_options (FILE *stream) | ||
4150 | -{ | ||
4151 | - int i; | ||
4152 | - | ||
4153 | - fprintf (stream, _("\n\ | ||
4154 | -The following ARM specific disassembler options are supported for use with\n\ | ||
4155 | -the -M switch:\n")); | ||
4156 | - | ||
4157 | - for (i = NUM_ARM_REGNAMES; i--;) | ||
4158 | - fprintf (stream, " reg-names-%s %*c%s\n", | ||
4159 | - regnames[i].name, | ||
4160 | - (int)(14 - strlen (regnames[i].name)), ' ', | ||
4161 | - regnames[i].description); | ||
4162 | - | ||
4163 | - fprintf (stream, " force-thumb Assume all insns are Thumb insns\n"); | ||
4164 | - fprintf (stream, " no-force-thumb Examine preceeding label to determine an insn's type\n\n"); | ||
4165 | -} |
hw/arm_boot.c
@@ -107,7 +107,7 @@ static void set_kernel_args_old(struct arm_boot_info *info, | @@ -107,7 +107,7 @@ static void set_kernel_args_old(struct arm_boot_info *info, | ||
107 | int initrd_size, void *base) | 107 | int initrd_size, void *base) |
108 | { | 108 | { |
109 | uint32_t *p; | 109 | uint32_t *p; |
110 | - unsigned char *s; | 110 | + char *s; |
111 | 111 | ||
112 | /* see linux/include/asm-arm/setup.h */ | 112 | /* see linux/include/asm-arm/setup.h */ |
113 | p = (uint32_t *)(base + KERNEL_ARGS_ADDR); | 113 | p = (uint32_t *)(base + KERNEL_ARGS_ADDR); |
hw/omap_clk.c
@@ -1098,23 +1098,6 @@ void omap_clk_adduser(struct clk *clk, qemu_irq user) | @@ -1098,23 +1098,6 @@ void omap_clk_adduser(struct clk *clk, qemu_irq user) | ||
1098 | *i = user; | 1098 | *i = user; |
1099 | } | 1099 | } |
1100 | 1100 | ||
1101 | -/* If a clock is allowed to idle, it is disabled automatically when | ||
1102 | - * all of clock domains using it are disabled. */ | ||
1103 | -static int omap_clk_is_idle(struct clk *clk) | ||
1104 | -{ | ||
1105 | - struct clk *chld; | ||
1106 | - | ||
1107 | - if (!clk->enabled && (!clk->usecount || !(clk->flags && ALWAYS_ENABLED))) | ||
1108 | - return 1; | ||
1109 | - if (clk->usecount) | ||
1110 | - return 0; | ||
1111 | - | ||
1112 | - for (chld = clk->child1; chld; chld = chld->sibling) | ||
1113 | - if (!omap_clk_is_idle(chld)) | ||
1114 | - return 0; | ||
1115 | - return 1; | ||
1116 | -} | ||
1117 | - | ||
1118 | struct clk *omap_findclk(struct omap_mpu_state_s *mpu, const char *name) | 1101 | struct clk *omap_findclk(struct omap_mpu_state_s *mpu, const char *name) |
1119 | { | 1102 | { |
1120 | struct clk *i; | 1103 | struct clk *i; |
target-arm/helper.c
@@ -690,7 +690,7 @@ static void do_v7m_exception_exit(CPUARMState *env) | @@ -690,7 +690,7 @@ static void do_v7m_exception_exit(CPUARMState *env) | ||
690 | pointer. */ | 690 | pointer. */ |
691 | } | 691 | } |
692 | 692 | ||
693 | -void do_interrupt_v7m(CPUARMState *env) | 693 | +static void do_interrupt_v7m(CPUARMState *env) |
694 | { | 694 | { |
695 | uint32_t xpsr = xpsr_read(env); | 695 | uint32_t xpsr = xpsr_read(env); |
696 | uint32_t lr; | 696 | uint32_t lr; |