From 1ad03bde8a4b930b4f83aa42482afd45c127220c Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sun, 9 Apr 2000 14:37:28 +0000 Subject: Rename gdbarch-utils.[hc] to arch-utils.[hc] --- gdb/ChangeLog | 8 +++ gdb/Makefile.in | 12 ++--- gdb/arch-utils.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++ gdb/arch-utils.h | 52 ++++++++++++++++++++ gdb/gdbarch-utils.c | 137 ---------------------------------------------------- gdb/gdbarch-utils.h | 52 -------------------- gdb/gdbarch.c | 2 +- 7 files changed, 204 insertions(+), 196 deletions(-) create mode 100644 gdb/arch-utils.c create mode 100644 gdb/arch-utils.h delete mode 100644 gdb/gdbarch-utils.c delete mode 100644 gdb/gdbarch-utils.h diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fc0e6c1a6a2..6be0e9b7cb2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +Mon Apr 10 00:21:09 2000 Andrew Cagney + + * gdbarch-utils.h, gdbarch-utils.c: Delete. + * arch-utils.h, arch-utils.c: New files. Avoid 14 character file + name problems. + * Makefile.in: Update. + * gdbarch.c: Update. + Sun Apr 9 23:42:16 2000 Andrew Cagney From 2000-04-07 Jonathan Larmour : diff --git a/gdb/Makefile.in b/gdb/Makefile.in index ddcf7f484ee..2684542d7be 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -467,7 +467,7 @@ SFILES = ax-general.c ax-gdb.c bcache.c blockframe.c breakpoint.c \ demangle.c dwarfread.c dwarf2read.c elfread.c environ.c eval.c \ event-loop.c event-top.c \ expprint.c f-exp.y f-lang.c f-typeprint.c f-valprint.c \ - findvar.c gdbarch.c gdbarch-utils.c gdbtypes.c \ + findvar.c gdbarch.c arch-utils.c gdbtypes.c \ inf-loop.c infcmd.c inflow.c infrun.c language.c \ kod.c kod-cisco.c \ ui-out.c cli-out.c \ @@ -548,7 +548,7 @@ remote_h = remote.h version_h = version.h ui_out_h = ui-out.h cli_out_h = cli-out.h -gdbarch_utils_h = gdbarch-utils.h +arch_utils_h = arch-utils.h # Header files that need to have srcdir added. Note that in the cases # where we use a macro like $(gdbcmd_h), things are carefully arranged @@ -606,7 +606,7 @@ COMMON_OBS = version.o blockframe.o breakpoint.o findvar.o stack.o thread.o \ symtab.o symfile.o symmisc.o infcmd.o infrun.o command.o \ expprint.o environ.o \ event-loop.o event-top.o inf-loop.o \ - gdbarch.o gdbarch-utils.o gdbtypes.o copying.o $(DEPFILES) \ + gdbarch.o arch-utils.o gdbtypes.o copying.o $(DEPFILES) \ mem-break.o target.o parse.o language.o $(YYOBJ) buildsym.o \ kod.o kod-cisco.o \ gdb-events.o \ @@ -1368,8 +1368,8 @@ tracepoint.o: tracepoint.c $(defs_h) $(symtab_h) $(frame_h) $(tracepoint_h) \ gdbarch.o: gdbarch.c $(defs_h) $(bfd_h) $(gdbcmd_h) -gdbarch-utils.o: gdbarch-utils.c $(defs_h) $(bfd_h) $(gdbcmd_h) \ - $(gdbarch_utils_h) +arch-utils.o: arch-utils.c $(defs_h) $(bfd_h) $(gdbcmd_h) \ + $(arch_utils_h) gdbtypes.o: gdbtypes.c $(bfd_h) complaints.h $(defs_h) $(expression_h) \ $(gdbtypes_h) language.h objfiles.h symfile.h $(symtab_h) target.h \ @@ -1546,7 +1546,7 @@ minsyms.o: minsyms.c $(bfd_h) $(defs_h) objfiles.h symfile.h \ mips-nat.o: mips-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) mips-tdep.o: mips-tdep.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \ - $(gdbarch_utils_h) \ + $(arch_utils_h) \ $(inferior_h) language.h objfiles.h symfile.h gdb_string.h mipsread.o: mipsread.c buildsym.h complaints.h $(bfd_h) $(defs_h) \ diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c new file mode 100644 index 00000000000..9048bd75419 --- /dev/null +++ b/gdb/arch-utils.c @@ -0,0 +1,137 @@ +/* Dynamic architecture support for GDB, the GNU debugger. + Copyright 1998-1999, Free Software Foundation, Inc. + + This file is part of GDB. + + This program 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 2 of the License, or + (at your option) any later version. + + This program 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 program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include "defs.h" + +#if GDB_MULTI_ARCH +#include "gdbcmd.h" +#include "inferior.h" /* enum CALL_DUMMY_LOCATION et.al. */ +#else +/* Just include everything in sight so that the every old definition + of macro is visible. */ +#include "gdb_string.h" +#include +#include "symtab.h" +#include "frame.h" +#include "inferior.h" +#include "breakpoint.h" +#include "gdb_wait.h" +#include "gdbcore.h" +#include "gdbcmd.h" +#include "target.h" +#include "gdbthread.h" +#include "annotate.h" +#include "symfile.h" /* for overlay functions */ +#endif + +/* Convenience macro for allocting typesafe memory. */ + +#ifndef XMALLOC +#define XMALLOC(TYPE) (TYPE*) xmalloc (sizeof (TYPE)) +#endif + + +/* Use the program counter to determine the contents and size + of a breakpoint instruction. If no target-dependent macro + BREAKPOINT_FROM_PC has been defined to implement this function, + assume that the breakpoint doesn't depend on the PC, and + use the values of the BIG_BREAKPOINT and LITTLE_BREAKPOINT macros. + Return a pointer to a string of bytes that encode a breakpoint + instruction, stores the length of the string to *lenptr, + and optionally adjust the pc to point to the correct memory location + for inserting the breakpoint. */ + +unsigned char * +legacy_breakpoint_from_pc (CORE_ADDR * pcptr, int *lenptr) +{ + /* {BIG_,LITTLE_}BREAKPOINT is the sequence of bytes we insert for a + breakpoint. On some machines, breakpoints are handled by the + target environment and we don't have to worry about them here. */ +#ifdef BIG_BREAKPOINT + if (TARGET_BYTE_ORDER == BIG_ENDIAN) + { + static unsigned char big_break_insn[] = BIG_BREAKPOINT; + *lenptr = sizeof (big_break_insn); + return big_break_insn; + } +#endif +#ifdef LITTLE_BREAKPOINT + if (TARGET_BYTE_ORDER != BIG_ENDIAN) + { + static unsigned char little_break_insn[] = LITTLE_BREAKPOINT; + *lenptr = sizeof (little_break_insn); + return little_break_insn; + } +#endif +#ifdef BREAKPOINT + { + static unsigned char break_insn[] = BREAKPOINT; + *lenptr = sizeof (break_insn); + return break_insn; + } +#endif + *lenptr = 0; + return NULL; +} + +int +generic_frameless_function_invocation_not (struct frame_info *fi) +{ + return 0; +} + +char * +legacy_register_name (int i) +{ +#ifdef REGISTER_NAMES + static char *names[] = REGISTER_NAMES; + if (i < 0 || i >= (sizeof (names) / sizeof (*names))) + return NULL; + else + return names[i]; +#else + internal_error ("legacy_register_name: called."); + return NULL; +#endif +} + +#if defined (CALL_DUMMY) +LONGEST legacy_call_dummy_words[] = CALL_DUMMY; +#else +LONGEST legacy_call_dummy_words[1]; +#endif +int legacy_sizeof_call_dummy_words = sizeof (legacy_call_dummy_words); + +void +generic_remote_translate_xfer_address (CORE_ADDR gdb_addr, int gdb_len, + CORE_ADDR * rem_addr, int *rem_len) +{ + *rem_addr = gdb_addr; + *rem_len = gdb_len; +} + +/* */ + +extern initialize_file_ftype __initialize_gdbarch_utils; + +void +__initialize_gdbarch_utils (void) +{ +} diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h new file mode 100644 index 00000000000..57da8ceb45f --- /dev/null +++ b/gdb/arch-utils.h @@ -0,0 +1,52 @@ +/* Dynamic architecture support for GDB, the GNU debugger. + Copyright 1998-2000, Free Software Foundation, Inc. + + This file is part of GDB. + + This program 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 2 of the License, or + (at your option) any later version. + + This program 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 program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef GDBARCH_UTILS_H +#define GDBARCH_UTILS_H + +/* gdbarch trace variable */ +extern int gdbarch_debug; + +/* Fallback for register convertible. */ +extern gdbarch_register_convertible_ftype generic_register_convertible_not; + +/* Helper function for targets that don't know how my arguments are + being passed */ +extern gdbarch_frame_num_args_ftype frame_num_args_unknown; + +/* Implementation of breakpoint from PC using any of the deprecated + macros BREAKPOINT, LITTLE_BREAKPOINT, BIG_BREAPOINT. For legacy + targets that don't yet implement their own breakpoint_from_pc(). */ +extern gdbarch_breakpoint_from_pc_ftype legacy_breakpoint_from_pc; + +/* Frameless functions not identifable. */ +extern gdbarch_frameless_function_invocation_ftype generic_frameless_function_invocation_not; + +/* Map onto old REGISTER_NAMES. */ +extern char *legacy_register_name (int i); + +/* Backward compatible call_dummy_words. */ +extern LONGEST legacy_call_dummy_words[]; +extern int legacy_sizeof_call_dummy_words; + +/* Typical remote_translate_xfer_address */ +extern gdbarch_remote_translate_xfer_address_ftype generic_remote_translate_xfer_address; + +#endif diff --git a/gdb/gdbarch-utils.c b/gdb/gdbarch-utils.c deleted file mode 100644 index 9048bd75419..00000000000 --- a/gdb/gdbarch-utils.c +++ /dev/null @@ -1,137 +0,0 @@ -/* Dynamic architecture support for GDB, the GNU debugger. - Copyright 1998-1999, Free Software Foundation, Inc. - - This file is part of GDB. - - This program 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 2 of the License, or - (at your option) any later version. - - This program 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 program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include "defs.h" - -#if GDB_MULTI_ARCH -#include "gdbcmd.h" -#include "inferior.h" /* enum CALL_DUMMY_LOCATION et.al. */ -#else -/* Just include everything in sight so that the every old definition - of macro is visible. */ -#include "gdb_string.h" -#include -#include "symtab.h" -#include "frame.h" -#include "inferior.h" -#include "breakpoint.h" -#include "gdb_wait.h" -#include "gdbcore.h" -#include "gdbcmd.h" -#include "target.h" -#include "gdbthread.h" -#include "annotate.h" -#include "symfile.h" /* for overlay functions */ -#endif - -/* Convenience macro for allocting typesafe memory. */ - -#ifndef XMALLOC -#define XMALLOC(TYPE) (TYPE*) xmalloc (sizeof (TYPE)) -#endif - - -/* Use the program counter to determine the contents and size - of a breakpoint instruction. If no target-dependent macro - BREAKPOINT_FROM_PC has been defined to implement this function, - assume that the breakpoint doesn't depend on the PC, and - use the values of the BIG_BREAKPOINT and LITTLE_BREAKPOINT macros. - Return a pointer to a string of bytes that encode a breakpoint - instruction, stores the length of the string to *lenptr, - and optionally adjust the pc to point to the correct memory location - for inserting the breakpoint. */ - -unsigned char * -legacy_breakpoint_from_pc (CORE_ADDR * pcptr, int *lenptr) -{ - /* {BIG_,LITTLE_}BREAKPOINT is the sequence of bytes we insert for a - breakpoint. On some machines, breakpoints are handled by the - target environment and we don't have to worry about them here. */ -#ifdef BIG_BREAKPOINT - if (TARGET_BYTE_ORDER == BIG_ENDIAN) - { - static unsigned char big_break_insn[] = BIG_BREAKPOINT; - *lenptr = sizeof (big_break_insn); - return big_break_insn; - } -#endif -#ifdef LITTLE_BREAKPOINT - if (TARGET_BYTE_ORDER != BIG_ENDIAN) - { - static unsigned char little_break_insn[] = LITTLE_BREAKPOINT; - *lenptr = sizeof (little_break_insn); - return little_break_insn; - } -#endif -#ifdef BREAKPOINT - { - static unsigned char break_insn[] = BREAKPOINT; - *lenptr = sizeof (break_insn); - return break_insn; - } -#endif - *lenptr = 0; - return NULL; -} - -int -generic_frameless_function_invocation_not (struct frame_info *fi) -{ - return 0; -} - -char * -legacy_register_name (int i) -{ -#ifdef REGISTER_NAMES - static char *names[] = REGISTER_NAMES; - if (i < 0 || i >= (sizeof (names) / sizeof (*names))) - return NULL; - else - return names[i]; -#else - internal_error ("legacy_register_name: called."); - return NULL; -#endif -} - -#if defined (CALL_DUMMY) -LONGEST legacy_call_dummy_words[] = CALL_DUMMY; -#else -LONGEST legacy_call_dummy_words[1]; -#endif -int legacy_sizeof_call_dummy_words = sizeof (legacy_call_dummy_words); - -void -generic_remote_translate_xfer_address (CORE_ADDR gdb_addr, int gdb_len, - CORE_ADDR * rem_addr, int *rem_len) -{ - *rem_addr = gdb_addr; - *rem_len = gdb_len; -} - -/* */ - -extern initialize_file_ftype __initialize_gdbarch_utils; - -void -__initialize_gdbarch_utils (void) -{ -} diff --git a/gdb/gdbarch-utils.h b/gdb/gdbarch-utils.h deleted file mode 100644 index 57da8ceb45f..00000000000 --- a/gdb/gdbarch-utils.h +++ /dev/null @@ -1,52 +0,0 @@ -/* Dynamic architecture support for GDB, the GNU debugger. - Copyright 1998-2000, Free Software Foundation, Inc. - - This file is part of GDB. - - This program 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 2 of the License, or - (at your option) any later version. - - This program 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 program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#ifndef GDBARCH_UTILS_H -#define GDBARCH_UTILS_H - -/* gdbarch trace variable */ -extern int gdbarch_debug; - -/* Fallback for register convertible. */ -extern gdbarch_register_convertible_ftype generic_register_convertible_not; - -/* Helper function for targets that don't know how my arguments are - being passed */ -extern gdbarch_frame_num_args_ftype frame_num_args_unknown; - -/* Implementation of breakpoint from PC using any of the deprecated - macros BREAKPOINT, LITTLE_BREAKPOINT, BIG_BREAPOINT. For legacy - targets that don't yet implement their own breakpoint_from_pc(). */ -extern gdbarch_breakpoint_from_pc_ftype legacy_breakpoint_from_pc; - -/* Frameless functions not identifable. */ -extern gdbarch_frameless_function_invocation_ftype generic_frameless_function_invocation_not; - -/* Map onto old REGISTER_NAMES. */ -extern char *legacy_register_name (int i); - -/* Backward compatible call_dummy_words. */ -extern LONGEST legacy_call_dummy_words[]; -extern int legacy_sizeof_call_dummy_words; - -/* Typical remote_translate_xfer_address */ -extern gdbarch_remote_translate_xfer_address_ftype generic_remote_translate_xfer_address; - -#endif diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 4425e081804..98e0743374b 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -34,7 +34,7 @@ #include "defs.h" -#include "gdbarch-utils.h" +#include "arch-utils.h" #if GDB_MULTI_ARCH #include "gdbcmd.h" -- cgit v1.2.3