Menu
▾
▴
[LV-tools-commit] toolchain/experimental_toolchain vax-linux-binutils.patch,1.2,1.3
|
From: Jan-Benedict G. <jb...@us...> - 2004-07-05 14:48:02
|
Update of /cvsroot/linux-vax/toolchain/experimental_toolchain In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv764 Modified Files: vax-linux-binutils.patch Log Message: - Fix typos, so make it compile again. Index: vax-linux-binutils.patch =================================================================== RCS file: /cvsroot/linux-vax/toolchain/experimental_toolchain/vax-linux-binutils.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- vax-linux-binutils.patch 30 Jun 2004 20:35:24 -0000 1.2 +++ vax-linux-binutils.patch 5 Jul 2004 14:47:51 -0000 1.3 @@ -420,272 +420,466 @@ { char *name; int c; -241c241 -< void float_cons PARAMS ((int)); ---- -> void float_cons (int); -265,272c265,271 -< int flonum_gen2vax PARAMS ((char format_letter, FLONUM_TYPE * f, -< LITTLENUM_TYPE * words)); -< static const char *vip_begin PARAMS ((int, const char *, const char *, -< const char *)); -< static void vip_op_1 PARAMS ((int, const char *)); -< static void vip_op_defaults PARAMS ((const char *, const char *, const char *)); -< static void vip_op PARAMS ((char *, struct vop *)); -< static void vip PARAMS ((struct vit *, char *)); ---- -> int flonum_gen2vax (char format_letter, FLONUM_TYPE * f, -> LITTLENUM_TYPE * words); -> static const char *vip_begin (int, const char *, const char *, const char *); -> static void vip_op_1 (int, const char *); -> static void vip_op_defaults (const char *, const char *, const char *); -> static void vip_op (char *, struct vop *); -> static void vip (struct vit *, char *); -274c273 -< static int vax_reg_parse PARAMS ((char, char, char, char)); ---- -> static int vax_reg_parse (char, char, char, char); -298,301c297 -< md_number_to_chars (con, value, nbytes) -< char con[]; -< valueT value; -< int nbytes; ---- -> md_number_to_chars (char con[], valueT value, intnbytes) -310,313c306 -< md_apply_fix3 (fixP, valueP, seg) -< fixS *fixP; -< valueT *valueP; -< segT seg ATTRIBUTE_UNUSED; ---- -> md_apply_fix3 (fixS *fixP, valueT *valueP, segT seg ATTRIBUTE_UNUSED) -328a322,323 -> /* con: Low order bytes first! -> nbytes: number of bytes in input */ -330,332c325 -< md_chars_to_number (con, nbytes) -< unsigned char con[]; /* Low order byte 1st. */ -< int nbytes; /* Number of bytes in the input. */ ---- -> md_chars_to_number (unsigned char con[], int nbytes) -346,347c339 -< md_assemble (instruction_string) -< char *instruction_string; /* A string: assemble 1 instruction. */ ---- -> md_assemble (char *instruction_string) -1226,1228c1218 -< md_estimate_size_before_relax (fragP, segment) -< fragS *fragP; -< segT segment; ---- -> md_estimate_size_before_relax (fragS *fragP, segT segment) -1384,1387c1374,1375 -< md_convert_frag (headers, seg, fragP) -< bfd *headers ATTRIBUTE_UNUSED; -< segT seg ATTRIBUTE_UNUSED; -< fragS *fragP; ---- -> md_convert_frag (bfd *headers ATTRIBUTE_UNUSED, segT seg ATTRIBUTE_UNUSED, -> fragS *fragP) -1390,1393c1378,1379 -< md_convert_frag (headers, seg, fragP) -< object_headers *headers ATTRIBUTE_UNUSED; -< segT seg ATTRIBUTE_UNUSED; -< fragS *fragP; ---- -> md_convert_frag (object_headers *headers ATTRIBUTE_UNUSED, -> segT seg ATTRIBUTE_UNUSED, fragS *fragP) -1543,1545c1529 -< md_ri_to_chars (the_bytes, ri) -< char *the_bytes; -< struct reloc_info_generic ri; ---- -> md_ri_to_chars (char *the_bytes, struct reloc_info_generic ri) -1562,1565c1546,1547 -< tc_aout_fix_to_chars (where, fixP, segment_address_in_file) -< char *where; -< fixS *fixP; -< relax_addressT segment_address_in_file; ---- -> tc_aout_fix_to_chars (char *where, fixS *fixP, -> relax_addressT segment_address_in_file) -1739,1740c1721,1722 -< You have just broken the encoding below, which assumes the sign bit -< means 'I am an imaginary instruction'. ---- -> # error "You have just broken the encoding below, which assumes the sign bit" -> # error "means 'I am an imaginary instruction'." -1744,1745c1726,1727 -< You have just broken the encoding below, which assumes the 0x40 M bit means -< 'I am not to be "optimised" the way normal branches are'. ---- -> # error "You have just broken the encoding below, which assumes the 0x40 M bit" -> # error "means 'I am not to be "optimised" the way normal branches are'." -1808,1809c1790,1792 -< * If you want, I will include the 'synthetic' jXXX instructions in the -< * instruction table. ---- -> * If you want (synthetic_too == 1), I will include the 'synthetic' -> * jXXX instructions in the instruction table -> * -1814,1816c1797,1798 -< vip_begin (synthetic_too, immediate, indirect, displen) -< int synthetic_too; /* 1 means include jXXX op-codes. */ -< const char *immediate, *indirect, *displen; ---- -> vip_begin (int synthetic_too, const char *immediate, const char *indirect, -> const char *displen) -1862,1864c1844 -< vip (vitP, instring) -< struct vit *vitP; /* We build an exploded instruction here. */ -< char *instring; /* Text of a vax instruction: we modify. */ ---- -> vip (struct vit *vitP, char *instring) -2106a2087 -> /* -2108,2109c2089 -< vax_reg_parse (c1, c2, c3, c4) /* 3 chars of register name */ -< char c1, c2, c3, c4; /* c3 == 0 if 2-character reg name */ ---- -> vax_reg_parse (char c1, char c2, char c3, char c4) /* 3 chars of register name */ -2329,2331c2309 -< vip_op_1 (bit, syms) -< int bit; -< const char *syms; ---- -> vip_op_1 (int bit, const char *syms) -2341,2344c2319,2320 -< vip_op_defaults (immediate, indirect, displen) -< const char *immediate; -< const char *indirect; -< const char *displen; ---- -> vip_op_defaults (const char *immediate, const char *indirect, -> const char *displen) -2409a2386,2391 -> * -> * optext: input string, e.g.: "@B^foo@bar(AP)[FP]:" -> * vopP: Input fields: vop_access, vop_width. -> * Output fields: _ndx, _reg, _mode, _short, _warn, -> * _error _expr_begin, _expr_end, _nbytes, -> * -2413,2420c2395 -< vip_op (optext, vopP) -< /* user's input string e.g.: "@B^foo@bar(AP)[FP]:" */ -< char *optext; -< /* Input fields: vop_access, vop_width. -< Output fields: _ndx, _reg, _mode, _short, _warn, -< _error _expr_begin, _expr_end, _nbytes. -< vop_nbytes : number of bytes in a datum. */ -< struct vop *vopP; ---- -> vip_op (char *optext, struct vop *vopP) -3201,3203c3176 -< mumble (text, value) -< char *text; -< int value; ---- -> mumble (char *text, int value) -3222,3227c3195,3198 -< md_create_short_jump (ptr, from_addr, to_addr, frag, to_symbol) -< char *ptr; -< addressT from_addr; -< addressT to_addr ATTRIBUTE_UNUSED; -< fragS *frag ATTRIBUTE_UNUSED; -< symbolS *to_symbol ATTRIBUTE_UNUSED; ---- -> md_create_short_jump (char *ptr, addressT from_addr, -> addressT to_addrATTRIBUTE_UNUSED, -> fragS *frag ATTRIBUTE_UNUSED, -> symbolS *to_symbol ATTRIBUTE_UNUSED) -3241,3246c3212,3213 -< md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol) -< char *ptr; -< addressT from_addr ATTRIBUTE_UNUSED; -< addressT to_addr; -< fragS *frag; -< symbolS *to_symbol; ---- -> md_create_long_jump (char *ptr, addressT from_addr ATTRIBUTE_UNUSED, -> addressT to_addr, fragS *frag, symbolS *to_symbol) -3274,3276c3241 -< md_parse_option (c, arg) -< int c; -< char *arg; ---- -> md_parse_option (int c, char *arg) -3351,3352c3316 -< md_show_usage (stream) -< FILE *stream; ---- -> md_show_usage (FILE *stream) -3377,3378c3341 -< md_undefined_symbol (name) -< char *name ATTRIBUTE_UNUSED; ---- -> md_undefined_symbol (char *name ATTRIBUTE_UNUSED) -3385,3387c3348 -< md_section_align (segment, size) -< segT segment ATTRIBUTE_UNUSED; -< valueT size; ---- -> md_section_align (segT segment ATTRIBUTE_UNUSED, valueT size) -3396,3397c3357 -< md_pcrel_from (fixP) -< fixS *fixP; ---- -> md_pcrel_from (fixS *fixP) -3405,3406c3365 -< tc_headers_hook(headers) -< object_headers *headers; ---- -> tc_headers_hook (object_headers *headers) -3418,3420c3377 -< tc_gen_reloc (section, fixp) -< asection *section ATTRIBUTE_UNUSED; -< fixS *fixp; ---- -> tc_gen_reloc (asection *section ATTRIBUTE_UNUSED, fixS *fixp) -24c24 -< static int fetch_data PARAMS ((struct disassemble_info *, bfd_byte *)); ---- -> static int fetch_data (struct disassemble_info *, bfd_byte *); -26c26 -< PARAMS ((const char *, unsigned char *, bfd_vma, disassemble_info *)); ---- -> (const char *, unsigned char *, bfd_vma, disassemble_info *); -28c28 -< PARAMS ((const char *, int, unsigned char *, bfd_vma, disassemble_info *)); ---- -> (const char *, int, unsigned char *, bfd_vma, disassemble_info *); -83,85c83 -< fetch_data (info, addr) -< struct disassemble_info *info; -< bfd_byte *addr; ---- -> fetch_data (struct disassemble_info *info, bfd_byte *addr) -110,112c108 -< print_insn_vax (memaddr, info) -< bfd_vma memaddr; -< disassemble_info *info; ---- -> print_insn_vax (bfd_vma memaddr, disassemble_info *info) -190,194c186,187 -< print_insn_arg (d, p0, addr, info) -< const char *d; -< unsigned char *p0; -< bfd_vma addr; /* PC for this arg to be relative to */ -< disassemble_info *info; ---- -> print_insn_arg (const char *d, unsigned char *p0, bfd_vma addr, -> disassemble_info *info) -230,235c223,224 -< print_insn_mode (d, size, p0, addr, info) -< const char *d; -< int size; -< unsigned char *p0; -< bfd_vma addr; /* PC for this arg to be relative to */ -< disassemble_info *info; ---- -> print_insn_mode (const char *d, int size, unsigned char *p0, bfd_vma addr, -> disassemble_info *info) +--- binutils-HEAD/gas/config/tc-vax.c~ 2004-06-30 21:13:02.000000000 +0200 ++++ binutils-HEAD/gas/config/tc-vax.c 2004-06-30 21:35:43.000000000 +0200 +@@ -238,7 +238,7 @@ + #undef WF + #undef WB + +-void float_cons PARAMS ((int)); ++void float_cons (int); + + const pseudo_typeS md_pseudo_table[] = + { +@@ -262,16 +262,15 @@ + + #define min(a, b) ((a) < (b) ? (a) : (b)) + +-int flonum_gen2vax PARAMS ((char format_letter, FLONUM_TYPE * f, +- LITTLENUM_TYPE * words)); +-static const char *vip_begin PARAMS ((int, const char *, const char *, +- const char *)); +-static void vip_op_1 PARAMS ((int, const char *)); +-static void vip_op_defaults PARAMS ((const char *, const char *, const char *)); +-static void vip_op PARAMS ((char *, struct vop *)); +-static void vip PARAMS ((struct vit *, char *)); ++int flonum_gen2vax (char format_letter, FLONUM_TYPE * f, ++ LITTLENUM_TYPE * words); ++static const char *vip_begin (int, const char *, const char *, const char *); ++static void vip_op_1 (int, const char *); ++static void vip_op_defaults (const char *, const char *, const char *); ++static void vip_op (char *, struct vop *); ++static void vip (struct vit *, char *); + +-static int vax_reg_parse PARAMS ((char, char, char, char)); ++static int vax_reg_parse (char, char, char, char); + + void + md_begin () +@@ -295,10 +294,7 @@ + } + + void +-md_number_to_chars (con, value, nbytes) +- char con[]; +- valueT value; +- int nbytes; ++md_number_to_chars (char con[], valueT value, intnbytes) + { + number_to_chars_littleendian (con, value, nbytes); + } +@@ -307,10 +303,7 @@ + that they reference. */ + + void /* Knows about order of bytes in address. */ +-md_apply_fix3 (fixP, valueP, seg) +- fixS *fixP; +- valueT *valueP; +- segT seg ATTRIBUTE_UNUSED; ++md_apply_fix3 (fixS *fixP, valueT *valueP, segT seg ATTRIBUTE_UNUSED) + { + valueT value = * valueP; + #ifdef BFD_ASSEMBLER +@@ -326,10 +319,10 @@ + fixP->fx_done = 1; + } + ++/* con: Low order bytes first! ++ nbytes: number of bytes in input */ + long +-md_chars_to_number (con, nbytes) +- unsigned char con[]; /* Low order byte 1st. */ +- int nbytes; /* Number of bytes in the input. */ ++md_chars_to_number (unsigned char con[], int nbytes) + { + long retval; + for (retval = 0, con += nbytes - 1; nbytes--; con--) +@@ -343,8 +336,7 @@ + /* vax:md_assemble() emit frags for 1 instruction */ + + void +-md_assemble (instruction_string) +- char *instruction_string; /* A string: assemble 1 instruction. */ ++md_assemble (char *instruction_string) + { + /* Non-zero if operand expression's segment is not known yet. */ + int is_undefined; +@@ -1223,9 +1215,7 @@ + Return the correct fr_subtype in the frag and the growth beyond + fr_fix. */ + int +-md_estimate_size_before_relax (fragP, segment) +- fragS *fragP; +- segT segment; ++md_estimate_size_before_relax (fragS *fragP, segT segment) + { + if (RELAX_LENGTH (fragP->fr_subtype) == STATE_UNDF) + { +@@ -1381,16 +1371,12 @@ + */ + #ifdef BFD_ASSEMBLER + void +-md_convert_frag (headers, seg, fragP) +- bfd *headers ATTRIBUTE_UNUSED; +- segT seg ATTRIBUTE_UNUSED; +- fragS *fragP; ++md_convert_frag (bfd *headers ATTRIBUTE_UNUSED, segT seg ATTRIBUTE_UNUSED, ++ fragS *fragP) + #else + void +-md_convert_frag (headers, seg, fragP) +- object_headers *headers ATTRIBUTE_UNUSED; +- segT seg ATTRIBUTE_UNUSED; +- fragS *fragP; ++md_convert_frag (object_headers *headers ATTRIBUTE_UNUSED, ++ segT seg ATTRIBUTE_UNUSED, fragS *fragP) + #endif + { + char *addressP; /* -> _var to change. */ +@@ -1540,9 +1526,7 @@ + bit 0 as pcrel. */ + #ifdef comment + void +-md_ri_to_chars (the_bytes, ri) +- char *the_bytes; +- struct reloc_info_generic ri; ++md_ri_to_chars (char *the_bytes, struct reloc_info_generic ri) + { + /* this is easy */ + md_number_to_chars (the_bytes, ri.r_address, sizeof (ri.r_address)); +@@ -1559,10 +1543,8 @@ + #ifdef OBJ_AOUT + #ifndef BFD_ASSEMBLER + void +-tc_aout_fix_to_chars (where, fixP, segment_address_in_file) +- char *where; +- fixS *fixP; +- relax_addressT segment_address_in_file; ++tc_aout_fix_to_chars (char *where, fixS *fixP, ++ relax_addressT segment_address_in_file) + { + /* + * In: length of relocation (or of address) in chars: 1, 2 or 4. +@@ -1736,13 +1718,13 @@ + * + */ + #if (VIT_OPCODE_SYNTHETIC != 0x80000000) +-You have just broken the encoding below, which assumes the sign bit +- means 'I am an imaginary instruction'. ++# error "You have just broken the encoding below, which assumes the sign bit" ++# error "means 'I am an imaginary instruction'." + #endif + + #if (VIT_OPCODE_SPECIAL != 0x40000000) +- You have just broken the encoding below, which assumes the 0x40 M bit means +- 'I am not to be "optimised" the way normal branches are'. ++# error "You have just broken the encoding below, which assumes the 0x40 M bit" ++# error "means 'I am not to be "optimised" the way normal branches are'." + #endif + + static const struct vot +@@ -1805,15 +1787,15 @@ + * Call me once before you decode any lines. + * I decode votstrs into a hash table at op_hash (which I create). + * I return an error text or null. +- * If you want, I will include the 'synthetic' jXXX instructions in the +- * instruction table. ++ * If you want (synthetic_too == 1), I will include the 'synthetic' ++ * jXXX instructions in the instruction table ++ * + * You must nominate metacharacters for eg DEC's "#", "@", "^". + */ + + static const char * +-vip_begin (synthetic_too, immediate, indirect, displen) +- int synthetic_too; /* 1 means include jXXX op-codes. */ +- const char *immediate, *indirect, *displen; ++vip_begin (int synthetic_too, const char *immediate, const char *indirect, ++ const char *displen) + { + const struct vot *vP; /* scan votstrs */ + const char *retval = 0; /* error text */ +@@ -1859,9 +1841,7 @@ + */ + + static void +-vip (vitP, instring) +- struct vit *vitP; /* We build an exploded instruction here. */ +- char *instring; /* Text of a vax instruction: we modify. */ ++vip (struct vit *vitP, char *instring) + { + /* How to bit-encode this opcode. */ + struct vot_wot *vwP; +@@ -2104,9 +2084,9 @@ + #define SP (14) + #define PC (15) + ++/* + int /* return -1 or 0:15 */ +-vax_reg_parse (c1, c2, c3, c4) /* 3 chars of register name */ +- char c1, c2, c3, c4; /* c3 == 0 if 2-character reg name */ ++vax_reg_parse (char c1, char c2, char c3, char c4) /* 3 chars of register name */ + { + int retval; /* return -1:15 */ + +@@ -2326,9 +2306,7 @@ + static char vip_metacharacters[256]; + + static void +-vip_op_1 (bit, syms) +- int bit; +- const char *syms; ++vip_op_1 (int bit, const char *syms) + { + unsigned char t; + +@@ -2338,10 +2316,8 @@ + + /* Can be called any time. More arguments may appear in future. */ + static void +-vip_op_defaults (immediate, indirect, displen) +- const char *immediate; +- const char *indirect; +- const char *displen; ++vip_op_defaults (const char *immediate, const char *indirect, ++ const char *displen) + { + vip_op_1 (VIP_IMMEDIATE, immediate); + vip_op_1 (VIP_INDIRECT, indirect); +@@ -2407,17 +2383,16 @@ + * ndx index register number 0:15 -1 means absent + * + * Again, I dare not explain it: just trace ALL the code! ++ * ++ * optext: input string, e.g.: "@B^foo@bar(AP)[FP]:" ++ * vopP: Input fields: vop_access, vop_width. ++ * Output fields: _ndx, _reg, _mode, _short, _warn, ++ * _error _expr_begin, _expr_end, _nbytes, ++ * + */ + + static void +-vip_op (optext, vopP) +- /* user's input string e.g.: "@B^foo@bar(AP)[FP]:" */ +- char *optext; +- /* Input fields: vop_access, vop_width. +- Output fields: _ndx, _reg, _mode, _short, _warn, +- _error _expr_begin, _expr_end, _nbytes. +- vop_nbytes : number of bytes in a datum. */ +- struct vop *vopP; ++vip_op (char *optext, struct vop *vopP) + { + /* track operand text forward */ + char *p; +@@ -3198,9 +3173,7 @@ + } + } + +-mumble (text, value) +- char *text; +- int value; ++mumble (char *text, int value) + { + printf ("%s:", text); + if (value >= 0) +@@ -3219,12 +3192,10 @@ + const int md_reloc_size = 8; /* Size of relocation record */ + + void +-md_create_short_jump (ptr, from_addr, to_addr, frag, to_symbol) +- char *ptr; +- addressT from_addr; +- addressT to_addr ATTRIBUTE_UNUSED; +- fragS *frag ATTRIBUTE_UNUSED; +- symbolS *to_symbol ATTRIBUTE_UNUSED; ++md_create_short_jump (char *ptr, addressT from_addr, ++ addressT to_addrATTRIBUTE_UNUSED, ++ fragS *frag ATTRIBUTE_UNUSED, ++ symbolS *to_symbol ATTRIBUTE_UNUSED) + { + valueT offset; + +@@ -3238,12 +3209,8 @@ + } + + void +-md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol) +- char *ptr; +- addressT from_addr ATTRIBUTE_UNUSED; +- addressT to_addr; +- fragS *frag; +- symbolS *to_symbol; ++md_create_long_jump (char *ptr, addressT from_addr ATTRIBUTE_UNUSED, ++ addressT to_addr, fragS *frag, symbolS *to_symbol) + { + valueT offset; + +@@ -3271,9 +3238,7 @@ + size_t md_longopts_size = sizeof (md_longopts); + + int +-md_parse_option (c, arg) +- int c; +- char *arg; ++md_parse_option (int c, char *arg) + { + switch (c) + { +@@ -3348,8 +3313,7 @@ + } + + void +-md_show_usage (stream) +- FILE *stream; ++md_show_usage (FILE *stream) + { + fprintf (stream, _("\ + VAX options:\n\ +@@ -3374,17 +3338,14 @@ + /* We have no need to default values of symbols. */ + + symbolS * +-md_undefined_symbol (name) +- char *name ATTRIBUTE_UNUSED; ++md_undefined_symbol (char *name ATTRIBUTE_UNUSED) + { + return 0; + } + + /* Round up a section size to the appropriate boundary. */ + valueT +-md_section_align (segment, size) +- segT segment ATTRIBUTE_UNUSED; +- valueT size; ++md_section_align (segT segment ATTRIBUTE_UNUSED, valueT size) + { + return size; /* Byte alignment is fine */ + } +@@ -3393,8 +3354,7 @@ + On the vax, they're relative to the address of the offset, plus + its size. */ + long +-md_pcrel_from (fixP) +- fixS *fixP; ++md_pcrel_from (fixS *fixP) + { + return fixP->fx_size + fixP->fx_where + fixP->fx_frag->fr_address; + } +@@ -3402,8 +3362,7 @@ + #ifdef OBJ_AOUT + #ifndef BFD_ASSEMBLER + void +-tc_headers_hook(headers) +- object_headers *headers; ++tc_headers_hook (object_headers *headers) + { + #ifdef TE_NetBSD + N_SET_INFO(headers->header, OMAGIC, M_VAX4K_NETBSD, 0); +@@ -3415,9 +3374,7 @@ + + #ifdef BFD_ASSEMBLER + arelent * +-tc_gen_reloc (section, fixp) +- asection *section ATTRIBUTE_UNUSED; +- fixS *fixp; ++tc_gen_reloc (asection *section ATTRIBUTE_UNUSED, fixS *fixp) + { + arelent *reloc; + bfd_reloc_code_real_type code; +--- binutils-HEAD/opcodes/vax-dis.c~ 2004-06-30 21:39:17.000000000 +0200 ++++ binutils-HEAD/opcodes/vax-dis.c 2004-06-30 21:42:17.000000000 +0200 +@@ -21,11 +21,11 @@ + #include "dis-asm.h" + + /* Local function prototypes */ +-static int fetch_data PARAMS ((struct disassemble_info *, bfd_byte *)); ++static int fetch_data (struct disassemble_info *, bfd_byte *); + static int print_insn_arg +- PARAMS ((const char *, unsigned char *, bfd_vma, disassemble_info *)); ++ (const char *, unsigned char *, bfd_vma, disassemble_info *); + static int print_insn_mode +- PARAMS ((const char *, int, unsigned char *, bfd_vma, disassemble_info *)); ++ (const char *, int, unsigned char *, bfd_vma, disassemble_info *); + + + static char *reg_names[] = +@@ -80,9 +80,7 @@ + ? 1 : fetch_data ((info), (addr))) + + static int +-fetch_data (info, addr) +- struct disassemble_info *info; +- bfd_byte *addr; ++fetch_data (struct disassemble_info *info, bfd_byte *addr) + { + int status; + struct private *priv = (struct private *) info->private_data; +@@ -107,9 +105,7 @@ + on INFO->STREAM. Returns length of the instruction, in bytes. */ + + int +-print_insn_vax (memaddr, info) +- bfd_vma memaddr; +- disassemble_info *info; ++print_insn_vax (bfd_vma memaddr, disassemble_info *info) + { + const struct vot *votp; + const char *argp; +@@ -187,11 +183,8 @@ + found. */ + + static int +-print_insn_arg (d, p0, addr, info) +- const char *d; +- unsigned char *p0; +- bfd_vma addr; /* PC for this arg to be relative to */ +- disassemble_info *info; ++print_insn_arg (const char *d, unsigned char *p0, bfd_vma addr, ++ disassemble_info *info) + { + int arg_len; + +@@ -227,12 +220,8 @@ + } + + static int +-print_insn_mode (d, size, p0, addr, info) +- const char *d; +- int size; +- unsigned char *p0; +- bfd_vma addr; /* PC for this arg to be relative to */ +- disassemble_info *info; ++print_insn_mode (const char *d, int size, unsigned char *p0, bfd_vma addr, ++ disassemble_info *info) + { + unsigned char *p = p0; + unsigned char mode, reg; +--- binutils-HEAD/gas/config/tc-vax.c~ 2004-07-05 16:44:01.000000000 +0200 ++++ binutils-HEAD/gas/config/tc-vax.c 2004-07-05 16:45:33.000000000 +0200 +@@ -294,7 +294,7 @@ + } + + void +-md_number_to_chars (char con[], valueT value, intnbytes) ++md_number_to_chars (char con[], valueT value, int nbytes) + { + number_to_chars_littleendian (con, value, nbytes); + } +@@ -2084,7 +2084,7 @@ + #define SP (14) + #define PC (15) + +-/* ++ + int /* return -1 or 0:15 */ + vax_reg_parse (char c1, char c2, char c3, char c4) /* 3 chars of register name */ + { +@@ -3193,7 +3193,7 @@ + + void + md_create_short_jump (char *ptr, addressT from_addr, +- addressT to_addrATTRIBUTE_UNUSED, ++ addressT to_addr ATTRIBUTE_UNUSED, + fragS *frag ATTRIBUTE_UNUSED, + symbolS *to_symbol ATTRIBUTE_UNUSED) + { |
