From ef299415078bb9a103d188cb321d685dd53ac1fa Mon Sep 17 00:00:00 2001 From: Michael Eager Date: Wed, 7 Oct 2009 15:40:17 +0000 Subject: [PATCH] * opcodes/microblaze-dis.c: Add include for microblaze-dis.h, eliminate local extern decls. * opcodes/microblaze-dis.h: New. --- opcodes/ChangeLog | 6 ++++++ opcodes/microblaze-dis.c | 8 ++------ opcodes/microblaze-dis.h | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 opcodes/microblaze-dis.h diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index ec598ef016c..176106781f3 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,9 @@ +2009-10-07 Michael Eager + + * opcodes/microblaze-dis.c: Add include for microblaze-dis.h, + eliminate local extern decls. + * opcodes/microblaze-dis.h: New. + 2009-10-06 Nick Clifton * po/fi.po: Updated Finnish translation. diff --git a/opcodes/microblaze-dis.c b/opcodes/microblaze-dis.c index 3c4eef9db51..b4723c20e1b 100644 --- a/opcodes/microblaze-dis.c +++ b/opcodes/microblaze-dis.c @@ -24,9 +24,10 @@ #define STATIC_TABLE #define DEFINE_TABLE -#include "microblaze-opc.h" #include "dis-asm.h" #include +#include "microblaze-opc.h" +#include "microblaze-dis.h" #define get_field_rd(instr) get_field (instr, RD_MASK, RD_LOW) #define get_field_r1(instr) get_field (instr, RA_MASK, RA_LOW) @@ -35,11 +36,6 @@ #define get_int_field_r1(instr) ((instr & RA_MASK) >> RA_LOW) -enum microblaze_instr get_insn_microblaze (long, bfd_boolean *, - enum microblaze_instr_type *, short *); -unsigned long microblaze_get_target_address (long, bfd_boolean, int, long, long, - long, bfd_boolean *, bfd_boolean *); -enum microblaze_instr microblaze_decode_insn (long insn, int *rd, int *ra, int *rb, int *imm); static char * get_field (long instr, long mask, unsigned short low) diff --git a/opcodes/microblaze-dis.h b/opcodes/microblaze-dis.h new file mode 100644 index 00000000000..4742bbcc059 --- /dev/null +++ b/opcodes/microblaze-dis.h @@ -0,0 +1,34 @@ +/* Disassemble Xilinx microblaze instructions. + + Copyright 2009 Free Software Foundation, Inc. + + This file is part of the GNU opcodes library. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + It is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + License for more details. + + You should have received a copy of the GNU General Public License + along with this file; see the file COPYING. If not, write to the + Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ + +#ifndef MICROBLAZE_DIS_H +#define MICROBLAZE_DIS_H 1 + +extern enum microblaze_instr microblaze_decode_insn (long, int *, int *, + int *, int *); +extern unsigned long microblaze_get_target_address (long, bfd_boolean, int, + long, long, long, bfd_boolean *, bfd_boolean *); + +extern enum microblaze_instr get_insn_microblaze (long, bfd_boolean *, + enum microblaze_instr_type *, + short *); + +#endif /* microblaze-dis.h */ -- 2.30.2