From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MqEdk-0008GT-FS for qemu-devel@nongnu.org; Tue, 22 Sep 2009 19:19:20 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MqEdd-0008CG-5Q for qemu-devel@nongnu.org; Tue, 22 Sep 2009 19:19:18 -0400 Received: from [199.232.76.173] (port=54126 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MqEdd-0008C4-1k for qemu-devel@nongnu.org; Tue, 22 Sep 2009 19:19:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12761) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MqEdc-0003UU-8o for qemu-devel@nongnu.org; Tue, 22 Sep 2009 19:19:12 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8MNJB2e013622 for ; Tue, 22 Sep 2009 19:19:11 -0400 From: Juan Quintela Date: Wed, 23 Sep 2009 01:19:01 +0200 Message-Id: <8957a77c251ecfebbdffeb3d89a5daa31265062f.1253661009.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 3/7] Bring two last users of K&R definitions to ANSI c89 List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Juan Quintela --- alpha-dis.c | 76 +++++++++++++--------------------------------------------- sh4-dis.c | 24 ++++-------------- 2 files changed, 23 insertions(+), 77 deletions(-) diff --git a/alpha-dis.c b/alpha-dis.c index 097f06b..2f67c76 100644 --- a/alpha-dis.c +++ b/alpha-dis.c @@ -434,18 +434,13 @@ const unsigned alpha_num_operands = sizeof(alpha_operands)/sizeof(*alpha_operand /*ARGSUSED*/ static unsigned -insert_rba(insn, value, errmsg) - unsigned insn; - int value ATTRIBUTE_UNUSED; - const char **errmsg ATTRIBUTE_UNUSED; +insert_rba(unsigned insn, int value ATTRIBUTE_UNUSED, const char **errmsg ATTRIBUTE_UNUSED) { return insn | (((insn >> 21) & 0x1f) << 16); } static int -extract_rba(insn, invalid) - unsigned insn; - int *invalid; +extract_rba(unsigned insn, int *invalid) { if (invalid != (int *) NULL && ((insn >> 21) & 0x1f) != ((insn >> 16) & 0x1f)) @@ -458,18 +453,13 @@ extract_rba(insn, invalid) /*ARGSUSED*/ static unsigned -insert_rca(insn, value, errmsg) - unsigned insn; - int value ATTRIBUTE_UNUSED; - const char **errmsg ATTRIBUTE_UNUSED; +insert_rca(unsigned insn, int value ATTRIBUTE_UNUSED, const char **errmsg ATTRIBUTE_UNUSED) { return insn | ((insn >> 21) & 0x1f); } static int -extract_rca(insn, invalid) - unsigned insn; - int *invalid; +extract_rca(unsigned insn, int *invalid) { if (invalid != (int *) NULL && ((insn >> 21) & 0x1f) != (insn & 0x1f)) @@ -482,18 +472,13 @@ extract_rca(insn, invalid) /*ARGSUSED*/ static unsigned -insert_za(insn, value, errmsg) - unsigned insn; - int value ATTRIBUTE_UNUSED; - const char **errmsg ATTRIBUTE_UNUSED; +insert_za(unsigned insn, int value ATTRIBUTE_UNUSED, const char **errmsg ATTRIBUTE_UNUSED) { return insn | (31 << 21); } static int -extract_za(insn, invalid) - unsigned insn; - int *invalid; +extract_za(unsigned insn, int *invalid) { if (invalid != (int *) NULL && ((insn >> 21) & 0x1f) != 31) *invalid = 1; @@ -502,18 +487,13 @@ extract_za(insn, invalid) /*ARGSUSED*/ static unsigned -insert_zb(insn, value, errmsg) - unsigned insn; - int value ATTRIBUTE_UNUSED; - const char **errmsg ATTRIBUTE_UNUSED; +insert_zb(unsigned insn, int value ATTRIBUTE_UNUSED, const char **errmsg ATTRIBUTE_UNUSED) { return insn | (31 << 16); } static int -extract_zb(insn, invalid) - unsigned insn; - int *invalid; +extract_zb(unsigned insn, int *invalid) { if (invalid != (int *) NULL && ((insn >> 16) & 0x1f) != 31) *invalid = 1; @@ -522,18 +502,13 @@ extract_zb(insn, invalid) /*ARGSUSED*/ static unsigned -insert_zc(insn, value, errmsg) - unsigned insn; - int value ATTRIBUTE_UNUSED; - const char **errmsg ATTRIBUTE_UNUSED; +insert_zc(unsigned insn, int value ATTRIBUTE_UNUSED, const char **errmsg ATTRIBUTE_UNUSED) { return insn | 31; } static int -extract_zc(insn, invalid) - unsigned insn; - int *invalid; +extract_zc(unsigned insn, int *invalid) { if (invalid != (int *) NULL && (insn & 0x1f) != 31) *invalid = 1; @@ -544,10 +519,7 @@ extract_zc(insn, invalid) /* The displacement field of a Branch format insn. */ static unsigned -insert_bdisp(insn, value, errmsg) - unsigned insn; - int value; - const char **errmsg; +insert_bdisp(unsigned insn, int value, const char **errmsg) { if (errmsg != (const char **)NULL && (value & 3)) *errmsg = _("branch operand unaligned"); @@ -556,9 +528,7 @@ insert_bdisp(insn, value, errmsg) /*ARGSUSED*/ static int -extract_bdisp(insn, invalid) - unsigned insn; - int *invalid ATTRIBUTE_UNUSED; +extract_bdisp(unsigned insn, int *invalid ATTRIBUTE_UNUSED) { return 4 * (((insn & 0x1FFFFF) ^ 0x100000) - 0x100000); } @@ -567,10 +537,7 @@ extract_bdisp(insn, invalid) /* The hint field of a JMP/JSR insn. */ static unsigned -insert_jhint(insn, value, errmsg) - unsigned insn; - int value; - const char **errmsg; +insert_jhint(unsigned insn, int value, const char **errmsg) { if (errmsg != (const char **)NULL && (value & 3)) *errmsg = _("jump hint unaligned"); @@ -579,9 +546,7 @@ insert_jhint(insn, value, errmsg) /*ARGSUSED*/ static int -extract_jhint(insn, invalid) - unsigned insn; - int *invalid ATTRIBUTE_UNUSED; +extract_jhint(unsigned insn, int *invalid ATTRIBUTE_UNUSED) { return 4 * (((insn & 0x3FFF) ^ 0x2000) - 0x2000); } @@ -589,10 +554,7 @@ extract_jhint(insn, invalid) /* The hint field of an EV6 HW_JMP/JSR insn. */ static unsigned -insert_ev6hwjhint(insn, value, errmsg) - unsigned insn; - int value; - const char **errmsg; +insert_ev6hwjhint(unsigned insn, int value, const char **errmsg) { if (errmsg != (const char **)NULL && (value & 3)) *errmsg = _("jump hint unaligned"); @@ -601,9 +563,7 @@ insert_ev6hwjhint(insn, value, errmsg) /*ARGSUSED*/ static int -extract_ev6hwjhint(insn, invalid) - unsigned insn; - int *invalid ATTRIBUTE_UNUSED; +extract_ev6hwjhint(unsigned insn, int *invalid ATTRIBUTE_UNUSED) { return 4 * (((insn & 0x1FFF) ^ 0x1000) - 0x1000); } @@ -1804,9 +1764,7 @@ static const char * const vms_regnames[64] = { /* Disassemble Alpha instructions. */ int -print_insn_alpha (memaddr, info) - bfd_vma memaddr; - struct disassemble_info *info; +print_insn_alpha (bfd_vma memaddr, struct disassemble_info *info) { static const struct alpha_opcode *opcode_index[AXP_NOPS+1]; const char * const * regnames; diff --git a/sh4-dis.c b/sh4-dis.c index d183176..a9ed5b2 100644 --- a/sh4-dis.c +++ b/sh4-dis.c @@ -1170,11 +1170,8 @@ static void print_dsp_reg PARAMS ((int, fprintf_ftype, void *)); static void print_insn_ppi PARAMS ((int, struct disassemble_info *)); static void -print_movxy (op, rn, rm, fprintf_fn, stream) - const sh_opcode_info *op; - int rn, rm; - fprintf_ftype fprintf_fn; - void *stream; +print_movxy (const sh_opcode_info *op, int rn, int rm, + fprintf_ftype fprintf_fn, void *stream) { int n; @@ -1248,9 +1245,7 @@ print_movxy (op, rn, rm, fprintf_fn, stream) Return nonzero if a field b of a parallel processing insns follows. */ static void -print_insn_ddt (insn, info) - int insn; - struct disassemble_info *info; +print_insn_ddt (int insn, struct disassemble_info *info) { fprintf_ftype fprintf_fn = info->fprintf_func; void *stream = info->stream; @@ -1337,10 +1332,7 @@ print_insn_ddt (insn, info) } static void -print_dsp_reg (rm, fprintf_fn, stream) - int rm; - fprintf_ftype fprintf_fn; - void *stream; +print_dsp_reg (int rm, fprintf_ftype fprintf_fn, void *stream) { switch (rm) { @@ -1381,9 +1373,7 @@ print_dsp_reg (rm, fprintf_fn, stream) } static void -print_insn_ppi (field_b, info) - int field_b; - struct disassemble_info *info; +print_insn_ppi (int field_b, struct disassemble_info *info) { static const char *sx_tab[] = { "x0", "x1", "a0", "a1" }; static const char *sy_tab[] = { "y0", "y1", "m0", "m1" }; @@ -1528,9 +1518,7 @@ print_insn_ppi (field_b, info) /* FIXME mvs: movx insns print as ".word 0x%03x", insn & 0xfff (ie. the upper nibble is missing). */ int -print_insn_sh (memaddr, info) - bfd_vma memaddr; - struct disassemble_info *info; +print_insn_sh (bfd_vma memaddr, struct disassemble_info *info) { fprintf_ftype fprintf_fn = info->fprintf_func; void *stream = info->stream; -- 1.6.2.5