@@ -41,21 +41,20 @@ along with this program; if not, write to the Free Software Foundation, Inc.,
4141#define UNKNOWN_INSN_MSG _("*unknown*")
4242
4343static void print_normal
44- PARAMS (( CGEN_CPU_DESC , PTR , long , unsigned int , bfd_vma , int ) );
44+ ( CGEN_CPU_DESC , void * , long , unsigned int , bfd_vma , int );
4545static void print_address
46- PARAMS (( CGEN_CPU_DESC , PTR , bfd_vma , unsigned int , bfd_vma , int ) );
46+ ( CGEN_CPU_DESC , void * , bfd_vma , unsigned int , bfd_vma , int );
4747static void print_keyword
48- PARAMS (( CGEN_CPU_DESC , PTR , CGEN_KEYWORD * , long , unsigned int ) );
48+ ( CGEN_CPU_DESC , void * , CGEN_KEYWORD * , long , unsigned int );
4949static void print_insn_normal
50- PARAMS ((CGEN_CPU_DESC , PTR , const CGEN_INSN * , CGEN_FIELDS * ,
51- bfd_vma , int ));
50+ (CGEN_CPU_DESC , void * , const CGEN_INSN * , CGEN_FIELDS * , bfd_vma , int );
5251static int print_insn
53- PARAMS (( CGEN_CPU_DESC , bfd_vma , disassemble_info * , char * , unsigned ) );
52+ ( CGEN_CPU_DESC , bfd_vma , disassemble_info * , char * , unsigned );
5453static int default_print_insn
55- PARAMS (( CGEN_CPU_DESC , bfd_vma , disassemble_info * ) );
54+ ( CGEN_CPU_DESC , bfd_vma , disassemble_info * );
5655static int read_insn
57- PARAMS (( CGEN_CPU_DESC , bfd_vma , disassemble_info * , char * , int ,
58- CGEN_EXTRACT_INFO * , unsigned long * ) );
56+ ( CGEN_CPU_DESC , bfd_vma , disassemble_info * , char * , int , CGEN_EXTRACT_INFO * ,
57+ unsigned long * );
5958
6059/* -- disassembler routines inserted here */
6160
@@ -343,13 +342,12 @@ fr30_cgen_init_dis (cd)
343342/* Default print handler. */
344343
345344static void
346- print_normal (cd , dis_info , value , attrs , pc , length )
347- CGEN_CPU_DESC cd ATTRIBUTE_UNUSED ;
348- PTR dis_info ;
349- long value ;
350- unsigned int attrs ;
351- bfd_vma pc ATTRIBUTE_UNUSED ;
352- int length ATTRIBUTE_UNUSED ;
345+ print_normal (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED ,
346+ void * dis_info ,
347+ long value ,
348+ unsigned int attrs ,
349+ bfd_vma pc ATTRIBUTE_UNUSED ,
350+ int length ATTRIBUTE_UNUSED )
353351{
354352 disassemble_info * info = (disassemble_info * ) dis_info ;
355353
@@ -369,13 +367,12 @@ print_normal (cd, dis_info, value, attrs, pc, length)
369367/* Default address handler. */
370368
371369static void
372- print_address (cd , dis_info , value , attrs , pc , length )
373- CGEN_CPU_DESC cd ATTRIBUTE_UNUSED ;
374- PTR dis_info ;
375- bfd_vma value ;
376- unsigned int attrs ;
377- bfd_vma pc ATTRIBUTE_UNUSED ;
378- int length ATTRIBUTE_UNUSED ;
370+ print_address (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED ,
371+ void * dis_info ,
372+ bfd_vma value ,
373+ unsigned int attrs ,
374+ bfd_vma pc ATTRIBUTE_UNUSED ,
375+ int length ATTRIBUTE_UNUSED )
379376{
380377 disassemble_info * info = (disassemble_info * ) dis_info ;
381378
@@ -399,12 +396,11 @@ print_address (cd, dis_info, value, attrs, pc, length)
399396/* Keyword print handler. */
400397
401398static void
402- print_keyword (cd , dis_info , keyword_table , value , attrs )
403- CGEN_CPU_DESC cd ATTRIBUTE_UNUSED ;
404- PTR dis_info ;
405- CGEN_KEYWORD * keyword_table ;
406- long value ;
407- unsigned int attrs ATTRIBUTE_UNUSED ;
399+ print_keyword (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED ,
400+ void * dis_info ,
401+ CGEN_KEYWORD * keyword_table ,
402+ long value ,
403+ unsigned int attrs ATTRIBUTE_UNUSED )
408404{
409405 disassemble_info * info = (disassemble_info * ) dis_info ;
410406 const CGEN_KEYWORD_ENTRY * ke ;
@@ -418,17 +414,16 @@ print_keyword (cd, dis_info, keyword_table, value, attrs)
418414
419415/* Default insn printer.
420416
421- DIS_INFO is defined as `PTR ' so the disassembler needn't know anything
417+ DIS_INFO is defined as `void * ' so the disassembler needn't know anything
422418 about disassemble_info. */
423419
424420static void
425- print_insn_normal (cd , dis_info , insn , fields , pc , length )
426- CGEN_CPU_DESC cd ;
427- PTR dis_info ;
428- const CGEN_INSN * insn ;
429- CGEN_FIELDS * fields ;
430- bfd_vma pc ;
431- int length ;
421+ print_insn_normal (CGEN_CPU_DESC cd ,
422+ void * dis_info ,
423+ const CGEN_INSN * insn ,
424+ CGEN_FIELDS * fields ,
425+ bfd_vma pc ,
426+ int length )
432427{
433428 const CGEN_SYNTAX * syntax = CGEN_INSN_SYNTAX (insn );
434429 disassemble_info * info = (disassemble_info * ) dis_info ;
@@ -460,14 +455,13 @@ print_insn_normal (cd, dis_info, insn, fields, pc, length)
460455 Returns 0 if all is well, non-zero otherwise. */
461456
462457static int
463- read_insn (cd , pc , info , buf , buflen , ex_info , insn_value )
464- CGEN_CPU_DESC cd ATTRIBUTE_UNUSED ;
465- bfd_vma pc ;
466- disassemble_info * info ;
467- char * buf ;
468- int buflen ;
469- CGEN_EXTRACT_INFO * ex_info ;
470- unsigned long * insn_value ;
458+ read_insn (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED ,
459+ bfd_vma pc ,
460+ disassemble_info * info ,
461+ char * buf ,
462+ int buflen ,
463+ CGEN_EXTRACT_INFO * ex_info ,
464+ unsigned long * insn_value )
471465{
472466 int status = (* info -> read_memory_func ) (pc , buf , buflen , info );
473467 if (status != 0 )
@@ -491,12 +485,11 @@ read_insn (cd, pc, info, buf, buflen, ex_info, insn_value)
491485 been called). */
492486
493487static int
494- print_insn (cd , pc , info , buf , buflen )
495- CGEN_CPU_DESC cd ;
496- bfd_vma pc ;
497- disassemble_info * info ;
498- char * buf ;
499- unsigned int buflen ;
488+ print_insn (CGEN_CPU_DESC cd ,
489+ bfd_vma pc ,
490+ disassemble_info * info ,
491+ char * buf ,
492+ unsigned int buflen )
500493{
501494 CGEN_INSN_INT insn_value ;
502495 const CGEN_INSN_LIST * insn_list ;
@@ -601,10 +594,7 @@ print_insn (cd, pc, info, buf, buflen)
601594#endif
602595
603596static int
604- default_print_insn (cd , pc , info )
605- CGEN_CPU_DESC cd ;
606- bfd_vma pc ;
607- disassemble_info * info ;
597+ default_print_insn (CGEN_CPU_DESC cd , bfd_vma pc , disassemble_info * info )
608598{
609599 char buf [CGEN_MAX_INSN_SIZE ];
610600 int buflen ;
@@ -643,9 +633,7 @@ typedef struct cpu_desc_list {
643633} cpu_desc_list ;
644634
645635int
646- print_insn_fr30 (pc , info )
647- bfd_vma pc ;
648- disassemble_info * info ;
636+ print_insn_fr30 (bfd_vma pc , disassemble_info * info )
649637{
650638 static cpu_desc_list * cd_list = 0 ;
651639 cpu_desc_list * cl = 0 ;
0 commit comments