share "cell" code
The "cell"-based printing code, like phex, was duplicated in both gdb and gdbserver. This patch merges the two implementations into a new file in common/. 2014-02-12 Tom Tromey <tromey@redhat.com> * utils.h: Include print-utils.h. (host_address_to_string, plongest, pulongest, phex, phex_nz) (int_string, core_addr_to_string, core_addr_to_string_nz) (hex_string, hex_string_custom): Don't declare. * utils.c (NUMCELLS, CELLSIZE, get_cell, decimal2str, pulongest) (plongest, thirty_two, phex, phex_nz, octal2str, hex_string) (hex_string_custom, int_string, core_addr_to_string) (core_addr_to_string_nz, host_address_to_string): Move to common/print-utils.c. * common/print-utils.h: New file. * common/print-utils.c: New file * Makefile.in (SFILES): Add common/print-utils.c. (HFILES_NO_SRCDIR): Add common/print-utils.h. (COMMON_OBS): Add print-utils.o. (print-utils.o): New target. 2014-02-12 Tom Tromey <tromey@redhat.com> * utils.h (pulongest, plongest, phex_nz): Don't declare. Include print-utils.h. * utils.c (NUMCELLS, CELLSIZE, get_cell, decimal2str, pulongest) (plongest, thirty_two, phex_nz): Remove. * Makefile.in (SFILES): Add common/print-utils.c. (OBS): Add print-utils.o. (print-utils-ipa.o): New target. (print-utils.o): New target. (IPA_OBJS): Add print-utils-ipa.o.
This commit is contained in:
Tom Tromey
parent
9fb5010805
commit
01fd3ea573
|
|
@ -1,3 +1,21 @@
|
|||
2014-02-12 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* utils.h: Include print-utils.h.
|
||||
(host_address_to_string, plongest, pulongest, phex, phex_nz)
|
||||
(int_string, core_addr_to_string, core_addr_to_string_nz)
|
||||
(hex_string, hex_string_custom): Don't declare.
|
||||
* utils.c (NUMCELLS, CELLSIZE, get_cell, decimal2str, pulongest)
|
||||
(plongest, thirty_two, phex, phex_nz, octal2str, hex_string)
|
||||
(hex_string_custom, int_string, core_addr_to_string)
|
||||
(core_addr_to_string_nz, host_address_to_string): Move to
|
||||
common/print-utils.c.
|
||||
* common/print-utils.h: New file.
|
||||
* common/print-utils.c: New file
|
||||
* Makefile.in (SFILES): Add common/print-utils.c.
|
||||
(HFILES_NO_SRCDIR): Add common/print-utils.h.
|
||||
(COMMON_OBS): Add print-utils.o.
|
||||
(print-utils.o): New target.
|
||||
|
||||
2014-02-12 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* nios2-tdep.c (nios2_stub_frame_base_address): Remove.
|
||||
|
|
|
|||
|
|
@ -839,7 +839,7 @@ SFILES = ada-exp.y ada-lang.c ada-typeprint.c ada-valprint.c ada-tasks.c \
|
|||
common/gdb_vecs.c common/common-utils.c common/xml-utils.c \
|
||||
common/ptid.c common/buffer.c gdb-dlfcn.c common/agent.c \
|
||||
common/format.c common/filestuff.c btrace.c record-btrace.c ctf.c \
|
||||
target/waitstatus.c
|
||||
target/waitstatus.c common/print-utils.c
|
||||
|
||||
LINTFILES = $(SFILES) $(YYFILES) $(CONFIG_SRCS) init.c
|
||||
|
||||
|
|
@ -921,7 +921,8 @@ common/format.h common/host-defs.h utils.h common/queue.h \
|
|||
common/linux-osdata.h gdb-dlfcn.h auto-load.h probe.h stap-probe.h \
|
||||
gdb_bfd.h sparc-ravenscar-thread.h ppc-ravenscar-thread.h common/linux-btrace.h \
|
||||
ctf.h common/i386-cpuid.h common/i386-gcc-cpuid.h target/resume.h \
|
||||
target/wait.h target/waitstatus.h nat/linux-nat.h nat/linux-waitpid.h
|
||||
target/wait.h target/waitstatus.h nat/linux-nat.h nat/linux-waitpid.h \
|
||||
common/print-utils.h
|
||||
|
||||
# Header files that already have srcdir in them, or which are in objdir.
|
||||
|
||||
|
|
@ -1019,7 +1020,8 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
|
|||
inferior.o osdata.o gdb_usleep.o record.o record-full.o gcore.o \
|
||||
gdb_vecs.o jit.o progspace.o skip.o probe.o \
|
||||
common-utils.o buffer.o ptid.o gdb-dlfcn.o common-agent.o \
|
||||
format.o registry.o btrace.o record-btrace.o waitstatus.o
|
||||
format.o registry.o btrace.o record-btrace.o waitstatus.o \
|
||||
print-utils.o
|
||||
|
||||
TSOBS = inflow.o
|
||||
|
||||
|
|
@ -2140,6 +2142,10 @@ mips-linux-watch.o: ${srcdir}/common/mips-linux-watch.c
|
|||
$(COMPILE) $(srcdir)/common/mips-linux-watch.c
|
||||
$(POSTCOMPILE)
|
||||
|
||||
print-utils.o: ${srcdir}/common/print-utils.c
|
||||
$(COMPILE) $(srcdir)/common/print-utils.c
|
||||
$(POSTCOMPILE)
|
||||
|
||||
#
|
||||
# gdb/target/ dependencies
|
||||
#
|
||||
|
|
|
|||
|
|
@ -0,0 +1,334 @@
|
|||
/* Cell-based print utility routines for GDB, the GNU debugger.
|
||||
|
||||
Copyright (C) 1986-2014 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 3 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, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
#ifdef GDBSERVER
|
||||
#include "server.h"
|
||||
#else
|
||||
#include "defs.h"
|
||||
#endif
|
||||
|
||||
#include "print-utils.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <stdint.h>
|
||||
|
||||
/* Temporary storage using circular buffer. */
|
||||
|
||||
#define NUMCELLS 16
|
||||
#define CELLSIZE 50
|
||||
|
||||
/* Return the next entry in the circular buffer. */
|
||||
|
||||
static char *
|
||||
get_cell (void)
|
||||
{
|
||||
static char buf[NUMCELLS][CELLSIZE];
|
||||
static int cell = 0;
|
||||
|
||||
if (++cell >= NUMCELLS)
|
||||
cell = 0;
|
||||
return buf[cell];
|
||||
}
|
||||
|
||||
static char *
|
||||
decimal2str (char *sign, ULONGEST addr, int width)
|
||||
{
|
||||
/* Steal code from valprint.c:print_decimal(). Should this worry
|
||||
about the real size of addr as the above does? */
|
||||
unsigned long temp[3];
|
||||
char *str = get_cell ();
|
||||
int i = 0;
|
||||
|
||||
do
|
||||
{
|
||||
temp[i] = addr % (1000 * 1000 * 1000);
|
||||
addr /= (1000 * 1000 * 1000);
|
||||
i++;
|
||||
width -= 9;
|
||||
}
|
||||
while (addr != 0 && i < (sizeof (temp) / sizeof (temp[0])));
|
||||
|
||||
width += 9;
|
||||
if (width < 0)
|
||||
width = 0;
|
||||
|
||||
switch (i)
|
||||
{
|
||||
case 1:
|
||||
xsnprintf (str, CELLSIZE, "%s%0*lu", sign, width, temp[0]);
|
||||
break;
|
||||
case 2:
|
||||
xsnprintf (str, CELLSIZE, "%s%0*lu%09lu", sign, width,
|
||||
temp[1], temp[0]);
|
||||
break;
|
||||
case 3:
|
||||
xsnprintf (str, CELLSIZE, "%s%0*lu%09lu%09lu", sign, width,
|
||||
temp[2], temp[1], temp[0]);
|
||||
break;
|
||||
default:
|
||||
internal_error (__FILE__, __LINE__,
|
||||
_("failed internal consistency check"));
|
||||
}
|
||||
|
||||
return str;
|
||||
}
|
||||
|
||||
static char *
|
||||
octal2str (ULONGEST addr, int width)
|
||||
{
|
||||
unsigned long temp[3];
|
||||
char *str = get_cell ();
|
||||
int i = 0;
|
||||
|
||||
do
|
||||
{
|
||||
temp[i] = addr % (0100000 * 0100000);
|
||||
addr /= (0100000 * 0100000);
|
||||
i++;
|
||||
width -= 10;
|
||||
}
|
||||
while (addr != 0 && i < (sizeof (temp) / sizeof (temp[0])));
|
||||
|
||||
width += 10;
|
||||
if (width < 0)
|
||||
width = 0;
|
||||
|
||||
switch (i)
|
||||
{
|
||||
case 1:
|
||||
if (temp[0] == 0)
|
||||
xsnprintf (str, CELLSIZE, "%*o", width, 0);
|
||||
else
|
||||
xsnprintf (str, CELLSIZE, "0%0*lo", width, temp[0]);
|
||||
break;
|
||||
case 2:
|
||||
xsnprintf (str, CELLSIZE, "0%0*lo%010lo", width, temp[1], temp[0]);
|
||||
break;
|
||||
case 3:
|
||||
xsnprintf (str, CELLSIZE, "0%0*lo%010lo%010lo", width,
|
||||
temp[2], temp[1], temp[0]);
|
||||
break;
|
||||
default:
|
||||
internal_error (__FILE__, __LINE__,
|
||||
_("failed internal consistency check"));
|
||||
}
|
||||
|
||||
return str;
|
||||
}
|
||||
|
||||
/* See print-utils.h. */
|
||||
|
||||
char *
|
||||
pulongest (ULONGEST u)
|
||||
{
|
||||
return decimal2str ("", u, 0);
|
||||
}
|
||||
|
||||
/* See print-utils.h. */
|
||||
|
||||
char *
|
||||
plongest (LONGEST l)
|
||||
{
|
||||
if (l < 0)
|
||||
return decimal2str ("-", -l, 0);
|
||||
else
|
||||
return decimal2str ("", l, 0);
|
||||
}
|
||||
|
||||
/* Eliminate warning from compiler on 32-bit systems. */
|
||||
static int thirty_two = 32;
|
||||
|
||||
/* See print-utils.h. */
|
||||
|
||||
char *
|
||||
phex (ULONGEST l, int sizeof_l)
|
||||
{
|
||||
char *str;
|
||||
|
||||
switch (sizeof_l)
|
||||
{
|
||||
case 8:
|
||||
str = get_cell ();
|
||||
xsnprintf (str, CELLSIZE, "%08lx%08lx",
|
||||
(unsigned long) (l >> thirty_two),
|
||||
(unsigned long) (l & 0xffffffff));
|
||||
break;
|
||||
case 4:
|
||||
str = get_cell ();
|
||||
xsnprintf (str, CELLSIZE, "%08lx", (unsigned long) l);
|
||||
break;
|
||||
case 2:
|
||||
str = get_cell ();
|
||||
xsnprintf (str, CELLSIZE, "%04x", (unsigned short) (l & 0xffff));
|
||||
break;
|
||||
default:
|
||||
str = phex (l, sizeof (l));
|
||||
break;
|
||||
}
|
||||
|
||||
return str;
|
||||
}
|
||||
|
||||
/* See print-utils.h. */
|
||||
|
||||
char *
|
||||
phex_nz (ULONGEST l, int sizeof_l)
|
||||
{
|
||||
char *str;
|
||||
|
||||
switch (sizeof_l)
|
||||
{
|
||||
case 8:
|
||||
{
|
||||
unsigned long high = (unsigned long) (l >> thirty_two);
|
||||
|
||||
str = get_cell ();
|
||||
if (high == 0)
|
||||
xsnprintf (str, CELLSIZE, "%lx",
|
||||
(unsigned long) (l & 0xffffffff));
|
||||
else
|
||||
xsnprintf (str, CELLSIZE, "%lx%08lx", high,
|
||||
(unsigned long) (l & 0xffffffff));
|
||||
break;
|
||||
}
|
||||
case 4:
|
||||
str = get_cell ();
|
||||
xsnprintf (str, CELLSIZE, "%lx", (unsigned long) l);
|
||||
break;
|
||||
case 2:
|
||||
str = get_cell ();
|
||||
xsnprintf (str, CELLSIZE, "%x", (unsigned short) (l & 0xffff));
|
||||
break;
|
||||
default:
|
||||
str = phex_nz (l, sizeof (l));
|
||||
break;
|
||||
}
|
||||
|
||||
return str;
|
||||
}
|
||||
|
||||
/* See print-utils.h. */
|
||||
|
||||
char *
|
||||
hex_string (LONGEST num)
|
||||
{
|
||||
char *result = get_cell ();
|
||||
|
||||
xsnprintf (result, CELLSIZE, "0x%s", phex_nz (num, sizeof (num)));
|
||||
return result;
|
||||
}
|
||||
|
||||
/* See print-utils.h. */
|
||||
|
||||
char *
|
||||
hex_string_custom (LONGEST num, int width)
|
||||
{
|
||||
char *result = get_cell ();
|
||||
char *result_end = result + CELLSIZE - 1;
|
||||
const char *hex = phex_nz (num, sizeof (num));
|
||||
int hex_len = strlen (hex);
|
||||
|
||||
if (hex_len > width)
|
||||
width = hex_len;
|
||||
if (width + 2 >= CELLSIZE)
|
||||
internal_error (__FILE__, __LINE__, _("\
|
||||
hex_string_custom: insufficient space to store result"));
|
||||
|
||||
strcpy (result_end - width - 2, "0x");
|
||||
memset (result_end - width, '0', width);
|
||||
strcpy (result_end - hex_len, hex);
|
||||
return result_end - width - 2;
|
||||
}
|
||||
|
||||
/* See print-utils.h. */
|
||||
|
||||
char *
|
||||
int_string (LONGEST val, int radix, int is_signed, int width,
|
||||
int use_c_format)
|
||||
{
|
||||
switch (radix)
|
||||
{
|
||||
case 16:
|
||||
{
|
||||
char *result;
|
||||
|
||||
if (width == 0)
|
||||
result = hex_string (val);
|
||||
else
|
||||
result = hex_string_custom (val, width);
|
||||
if (! use_c_format)
|
||||
result += 2;
|
||||
return result;
|
||||
}
|
||||
case 10:
|
||||
{
|
||||
if (is_signed && val < 0)
|
||||
return decimal2str ("-", -val, width);
|
||||
else
|
||||
return decimal2str ("", val, width);
|
||||
}
|
||||
case 8:
|
||||
{
|
||||
char *result = octal2str (val, width);
|
||||
|
||||
if (use_c_format || val == 0)
|
||||
return result;
|
||||
else
|
||||
return result + 1;
|
||||
}
|
||||
default:
|
||||
internal_error (__FILE__, __LINE__,
|
||||
_("failed internal consistency check"));
|
||||
}
|
||||
}
|
||||
|
||||
/* See print-utils.h. */
|
||||
|
||||
const char *
|
||||
core_addr_to_string (const CORE_ADDR addr)
|
||||
{
|
||||
char *str = get_cell ();
|
||||
|
||||
strcpy (str, "0x");
|
||||
strcat (str, phex (addr, sizeof (addr)));
|
||||
return str;
|
||||
}
|
||||
|
||||
/* See print-utils.h. */
|
||||
|
||||
const char *
|
||||
core_addr_to_string_nz (const CORE_ADDR addr)
|
||||
{
|
||||
char *str = get_cell ();
|
||||
|
||||
strcpy (str, "0x");
|
||||
strcat (str, phex_nz (addr, sizeof (addr)));
|
||||
return str;
|
||||
}
|
||||
|
||||
/* See print-utils.h. */
|
||||
|
||||
const char *
|
||||
host_address_to_string (const void *addr)
|
||||
{
|
||||
char *str = get_cell ();
|
||||
|
||||
xsnprintf (str, CELLSIZE, "0x%s", phex_nz ((uintptr_t) addr, sizeof (addr)));
|
||||
return str;
|
||||
}
|
||||
|
|
@ -0,0 +1,70 @@
|
|||
/* Cell-based print utility routines for GDB, the GNU debugger.
|
||||
|
||||
Copyright (C) 1986-2014 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 3 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, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
#ifndef COMMON_CELLS_H
|
||||
#define COMMON_CELLS_H
|
||||
|
||||
/* %d for LONGEST. The result is stored in a circular static buffer,
|
||||
NUMCELLS deep. */
|
||||
|
||||
extern char *pulongest (ULONGEST u);
|
||||
|
||||
/* %u for ULONGEST. The result is stored in a circular static buffer,
|
||||
NUMCELLS deep. */
|
||||
|
||||
extern char *plongest (LONGEST l);
|
||||
|
||||
extern char *phex (ULONGEST l, int sizeof_l);
|
||||
|
||||
/* Convert a ULONGEST into a HEX string, like %lx. The result is
|
||||
stored in a circular static buffer, NUMCELLS deep. */
|
||||
|
||||
extern char *phex_nz (ULONGEST l, int sizeof_l);
|
||||
|
||||
/* Converts a LONGEST to a C-format hexadecimal literal and stores it
|
||||
in a static string. Returns a pointer to this string. */
|
||||
|
||||
extern char *hex_string (LONGEST num);
|
||||
|
||||
/* Converts a LONGEST number to a C-format hexadecimal literal and
|
||||
stores it in a static string. Returns a pointer to this string
|
||||
that is valid until the next call. The number is padded on the
|
||||
left with 0s to at least WIDTH characters. */
|
||||
|
||||
extern char *hex_string_custom (LONGEST num, int width);
|
||||
|
||||
/* Convert VAL to a numeral in the given radix. For
|
||||
* radix 10, IS_SIGNED may be true, indicating a signed quantity;
|
||||
* otherwise VAL is interpreted as unsigned. If WIDTH is supplied,
|
||||
* it is the minimum width (0-padded if needed). USE_C_FORMAT means
|
||||
* to use C format in all cases. If it is false, then 'x'
|
||||
* and 'o' formats do not include a prefix (0x or leading 0). */
|
||||
|
||||
extern char *int_string (LONGEST val, int radix, int is_signed, int width,
|
||||
int use_c_format);
|
||||
|
||||
/* Convert a CORE_ADDR into a string. */
|
||||
|
||||
extern const char *core_addr_to_string (const CORE_ADDR addr);
|
||||
|
||||
extern const char *core_addr_to_string_nz (const CORE_ADDR addr);
|
||||
|
||||
extern const char *host_address_to_string (const void *addr);
|
||||
|
||||
#endif /* COMMON_CELLS_H */
|
||||
|
|
@ -1,3 +1,15 @@
|
|||
2014-02-12 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* utils.h (pulongest, plongest, phex_nz): Don't declare.
|
||||
Include print-utils.h.
|
||||
* utils.c (NUMCELLS, CELLSIZE, get_cell, decimal2str, pulongest)
|
||||
(plongest, thirty_two, phex_nz): Remove.
|
||||
* Makefile.in (SFILES): Add common/print-utils.c.
|
||||
(OBS): Add print-utils.o.
|
||||
(print-utils-ipa.o): New target.
|
||||
(print-utils.o): New target.
|
||||
(IPA_OBJS): Add print-utils-ipa.o.
|
||||
|
||||
2014-02-06 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* Makefile.in (SFILES): Fix indentation.
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ SFILES= $(srcdir)/gdbreplay.c $(srcdir)/inferiors.c $(srcdir)/dll.c \
|
|||
$(srcdir)/common/linux-osdata.c $(srcdir)/common/ptid.c \
|
||||
$(srcdir)/common/buffer.c $(srcdir)/common/linux-btrace.c \
|
||||
$(srcdir)/common/filestuff.c $(srcdir)/target/waitstatus.c \
|
||||
$(srcdir)/common/mips-linux-watch.c
|
||||
$(srcdir)/common/mips-linux-watch.c $(srcdir)/common/print-utils.c
|
||||
|
||||
DEPFILES = @GDBSERVER_DEPFILES@
|
||||
|
||||
|
|
@ -176,7 +176,7 @@ OBS = agent.o ax.o inferiors.o regcache.o remote-utils.o server.o signals.o \
|
|||
target.o waitstatus.o utils.o debug.o version.o vec.o gdb_vecs.o \
|
||||
mem-break.o hostio.o event-loop.o tracepoint.o xml-utils.o \
|
||||
common-utils.o ptid.o buffer.o format.o filestuff.o dll.o notif.o \
|
||||
tdesc.o $(XML_BUILTIN) $(DEPFILES) $(LIBOBJS)
|
||||
tdesc.o print-utils.o $(XML_BUILTIN) $(DEPFILES) $(LIBOBJS)
|
||||
GDBREPLAY_OBS = gdbreplay.o version.o
|
||||
GDBSERVER_LIBS = @GDBSERVER_LIBS@
|
||||
XM_CLIBS = @LIBS@
|
||||
|
|
@ -291,7 +291,7 @@ gdbreplay$(EXEEXT): $(GDBREPLAY_OBS) $(LIBGNU)
|
|||
${CC-LD} $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) -o gdbreplay$(EXEEXT) $(GDBREPLAY_OBS) \
|
||||
$(XM_CLIBS) $(LIBGNU)
|
||||
|
||||
IPA_OBJS=ax-ipa.o tracepoint-ipa.o format-ipa.o utils-ipa.o regcache-ipa.o remote-utils-ipa.o common-utils-ipa.o tdesc-ipa.o ${IPA_DEPFILES}
|
||||
IPA_OBJS=ax-ipa.o tracepoint-ipa.o format-ipa.o utils-ipa.o regcache-ipa.o remote-utils-ipa.o common-utils-ipa.o tdesc-ipa.o print-utils-ipa.o ${IPA_DEPFILES}
|
||||
|
||||
IPA_LIB=libinproctrace.so
|
||||
|
||||
|
|
@ -471,6 +471,9 @@ amd64-linux-ipa.o: amd64-linux.c
|
|||
tdesc-ipa.o: tdesc.c
|
||||
$(IPAGENT_COMPILE) $<
|
||||
$(POSTCOMPILE)
|
||||
print-utils-ipa.o: ../common/print-utils.c
|
||||
$(IPAGENT_COMPILE) $<
|
||||
$(POSTCOMPILE)
|
||||
|
||||
ax.o: ax.c
|
||||
$(COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
|
||||
|
|
@ -479,6 +482,9 @@ ax.o: ax.c
|
|||
signals.o: ../common/signals.c
|
||||
$(COMPILE) $<
|
||||
$(POSTCOMPILE)
|
||||
print-utils.o: ../common/print-utils.c
|
||||
$(COMPILE) $<
|
||||
$(POSTCOMPILE)
|
||||
linux-procfs.o: ../common/linux-procfs.c
|
||||
$(COMPILE) $<
|
||||
$(POSTCOMPILE)
|
||||
|
|
|
|||
|
|
@ -165,123 +165,6 @@ internal_error (const char *file, int line, const char *fmt, ...)
|
|||
exit (1);
|
||||
}
|
||||
|
||||
/* Temporary storage using circular buffer. */
|
||||
#define NUMCELLS 10
|
||||
#define CELLSIZE 50
|
||||
|
||||
/* Return the next entry in the circular buffer. */
|
||||
|
||||
static char *
|
||||
get_cell (void)
|
||||
{
|
||||
static char buf[NUMCELLS][CELLSIZE];
|
||||
static int cell = 0;
|
||||
if (++cell >= NUMCELLS)
|
||||
cell = 0;
|
||||
return buf[cell];
|
||||
}
|
||||
|
||||
static char *
|
||||
decimal2str (char *sign, ULONGEST addr)
|
||||
{
|
||||
/* Steal code from valprint.c:print_decimal(). Should this worry
|
||||
about the real size of addr as the above does? */
|
||||
unsigned long temp[3];
|
||||
char *str = get_cell ();
|
||||
int i = 0;
|
||||
int width = 9;
|
||||
|
||||
do
|
||||
{
|
||||
temp[i] = addr % (1000 * 1000 * 1000);
|
||||
addr /= (1000 * 1000 * 1000);
|
||||
i++;
|
||||
}
|
||||
while (addr != 0 && i < (sizeof (temp) / sizeof (temp[0])));
|
||||
|
||||
switch (i)
|
||||
{
|
||||
case 1:
|
||||
xsnprintf (str, CELLSIZE, "%s%0*lu", sign, width, temp[0]);
|
||||
break;
|
||||
case 2:
|
||||
xsnprintf (str, CELLSIZE, "%s%0*lu%09lu", sign, width,
|
||||
temp[1], temp[0]);
|
||||
break;
|
||||
case 3:
|
||||
xsnprintf (str, CELLSIZE, "%s%0*lu%09lu%09lu", sign, width,
|
||||
temp[2], temp[1], temp[0]);
|
||||
break;
|
||||
default:
|
||||
internal_error (__FILE__, __LINE__,
|
||||
"failed internal consistency check");
|
||||
}
|
||||
|
||||
return str;
|
||||
}
|
||||
|
||||
/* %u for ULONGEST. The result is stored in a circular static buffer,
|
||||
NUMCELLS deep. */
|
||||
|
||||
char *
|
||||
pulongest (ULONGEST u)
|
||||
{
|
||||
return decimal2str ("", u);
|
||||
}
|
||||
|
||||
/* %d for LONGEST. The result is stored in a circular static buffer,
|
||||
NUMCELLS deep. */
|
||||
|
||||
char *
|
||||
plongest (LONGEST l)
|
||||
{
|
||||
if (l < 0)
|
||||
return decimal2str ("-", -l);
|
||||
else
|
||||
return decimal2str ("", l);
|
||||
}
|
||||
|
||||
/* Eliminate warning from compiler on 32-bit systems. */
|
||||
static int thirty_two = 32;
|
||||
|
||||
/* Convert a ULONGEST into a HEX string, like %lx. The result is
|
||||
stored in a circular static buffer, NUMCELLS deep. */
|
||||
|
||||
char *
|
||||
phex_nz (ULONGEST l, int sizeof_l)
|
||||
{
|
||||
char *str;
|
||||
|
||||
switch (sizeof_l)
|
||||
{
|
||||
case 8:
|
||||
{
|
||||
unsigned long high = (unsigned long) (l >> thirty_two);
|
||||
str = get_cell ();
|
||||
if (high == 0)
|
||||
xsnprintf (str, CELLSIZE, "%lx",
|
||||
(unsigned long) (l & 0xffffffff));
|
||||
else
|
||||
xsnprintf (str, CELLSIZE, "%lx%08lx", high,
|
||||
(unsigned long) (l & 0xffffffff));
|
||||
break;
|
||||
}
|
||||
case 4:
|
||||
str = get_cell ();
|
||||
xsnprintf (str, CELLSIZE, "%lx", (unsigned long) l);
|
||||
break;
|
||||
case 2:
|
||||
str = get_cell ();
|
||||
xsnprintf (str, CELLSIZE, "%x", (unsigned short) (l & 0xffff));
|
||||
break;
|
||||
default:
|
||||
str = phex_nz (l, sizeof (l));
|
||||
break;
|
||||
}
|
||||
|
||||
return str;
|
||||
}
|
||||
|
||||
/* Convert a CORE_ADDR into a HEX string, like %lx.
|
||||
The result is stored in a circular static buffer, NUMCELLS deep. */
|
||||
|
||||
|
|
|
|||
|
|
@ -19,14 +19,13 @@
|
|||
#ifndef UTILS_H
|
||||
#define UTILS_H
|
||||
|
||||
#include "print-utils.h"
|
||||
|
||||
void perror_with_name (const char *string);
|
||||
void error (const char *string,...) ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 2);
|
||||
void fatal (const char *string,...) ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 2);
|
||||
void warning (const char *string,...) ATTRIBUTE_PRINTF (1, 2);
|
||||
char *paddress (CORE_ADDR addr);
|
||||
char *pulongest (ULONGEST u);
|
||||
char *plongest (LONGEST l);
|
||||
char *phex_nz (ULONGEST l, int sizeof_l);
|
||||
char *pfildes (gdb_fildes_t fd);
|
||||
|
||||
#endif /* UTILS_H */
|
||||
|
|
|
|||
296
gdb/utils.c
296
gdb/utils.c
|
|
@ -2707,21 +2707,6 @@ When set, debugging messages will be marked with seconds and microseconds."),
|
|||
&setdebuglist, &showdebuglist);
|
||||
}
|
||||
|
||||
/* Print routines to handle variable size regs, etc. */
|
||||
/* Temporary storage using circular buffer. */
|
||||
#define NUMCELLS 16
|
||||
#define CELLSIZE 50
|
||||
static char *
|
||||
get_cell (void)
|
||||
{
|
||||
static char buf[NUMCELLS][CELLSIZE];
|
||||
static int cell = 0;
|
||||
|
||||
if (++cell >= NUMCELLS)
|
||||
cell = 0;
|
||||
return buf[cell];
|
||||
}
|
||||
|
||||
const char *
|
||||
paddress (struct gdbarch *gdbarch, CORE_ADDR addr)
|
||||
{
|
||||
|
|
@ -2781,278 +2766,6 @@ core_addr_eq (const void *ap, const void *bp)
|
|||
return *addr_ap == *addr_bp;
|
||||
}
|
||||
|
||||
static char *
|
||||
decimal2str (char *sign, ULONGEST addr, int width)
|
||||
{
|
||||
/* Steal code from valprint.c:print_decimal(). Should this worry
|
||||
about the real size of addr as the above does? */
|
||||
unsigned long temp[3];
|
||||
char *str = get_cell ();
|
||||
int i = 0;
|
||||
|
||||
do
|
||||
{
|
||||
temp[i] = addr % (1000 * 1000 * 1000);
|
||||
addr /= (1000 * 1000 * 1000);
|
||||
i++;
|
||||
width -= 9;
|
||||
}
|
||||
while (addr != 0 && i < (sizeof (temp) / sizeof (temp[0])));
|
||||
|
||||
width += 9;
|
||||
if (width < 0)
|
||||
width = 0;
|
||||
|
||||
switch (i)
|
||||
{
|
||||
case 1:
|
||||
xsnprintf (str, CELLSIZE, "%s%0*lu", sign, width, temp[0]);
|
||||
break;
|
||||
case 2:
|
||||
xsnprintf (str, CELLSIZE, "%s%0*lu%09lu", sign, width,
|
||||
temp[1], temp[0]);
|
||||
break;
|
||||
case 3:
|
||||
xsnprintf (str, CELLSIZE, "%s%0*lu%09lu%09lu", sign, width,
|
||||
temp[2], temp[1], temp[0]);
|
||||
break;
|
||||
default:
|
||||
internal_error (__FILE__, __LINE__,
|
||||
_("failed internal consistency check"));
|
||||
}
|
||||
|
||||
return str;
|
||||
}
|
||||
|
||||
static char *
|
||||
octal2str (ULONGEST addr, int width)
|
||||
{
|
||||
unsigned long temp[3];
|
||||
char *str = get_cell ();
|
||||
int i = 0;
|
||||
|
||||
do
|
||||
{
|
||||
temp[i] = addr % (0100000 * 0100000);
|
||||
addr /= (0100000 * 0100000);
|
||||
i++;
|
||||
width -= 10;
|
||||
}
|
||||
while (addr != 0 && i < (sizeof (temp) / sizeof (temp[0])));
|
||||
|
||||
width += 10;
|
||||
if (width < 0)
|
||||
width = 0;
|
||||
|
||||
switch (i)
|
||||
{
|
||||
case 1:
|
||||
if (temp[0] == 0)
|
||||
xsnprintf (str, CELLSIZE, "%*o", width, 0);
|
||||
else
|
||||
xsnprintf (str, CELLSIZE, "0%0*lo", width, temp[0]);
|
||||
break;
|
||||
case 2:
|
||||
xsnprintf (str, CELLSIZE, "0%0*lo%010lo", width, temp[1], temp[0]);
|
||||
break;
|
||||
case 3:
|
||||
xsnprintf (str, CELLSIZE, "0%0*lo%010lo%010lo", width,
|
||||
temp[2], temp[1], temp[0]);
|
||||
break;
|
||||
default:
|
||||
internal_error (__FILE__, __LINE__,
|
||||
_("failed internal consistency check"));
|
||||
}
|
||||
|
||||
return str;
|
||||
}
|
||||
|
||||
char *
|
||||
pulongest (ULONGEST u)
|
||||
{
|
||||
return decimal2str ("", u, 0);
|
||||
}
|
||||
|
||||
char *
|
||||
plongest (LONGEST l)
|
||||
{
|
||||
if (l < 0)
|
||||
return decimal2str ("-", -l, 0);
|
||||
else
|
||||
return decimal2str ("", l, 0);
|
||||
}
|
||||
|
||||
/* Eliminate warning from compiler on 32-bit systems. */
|
||||
static int thirty_two = 32;
|
||||
|
||||
char *
|
||||
phex (ULONGEST l, int sizeof_l)
|
||||
{
|
||||
char *str;
|
||||
|
||||
switch (sizeof_l)
|
||||
{
|
||||
case 8:
|
||||
str = get_cell ();
|
||||
xsnprintf (str, CELLSIZE, "%08lx%08lx",
|
||||
(unsigned long) (l >> thirty_two),
|
||||
(unsigned long) (l & 0xffffffff));
|
||||
break;
|
||||
case 4:
|
||||
str = get_cell ();
|
||||
xsnprintf (str, CELLSIZE, "%08lx", (unsigned long) l);
|
||||
break;
|
||||
case 2:
|
||||
str = get_cell ();
|
||||
xsnprintf (str, CELLSIZE, "%04x", (unsigned short) (l & 0xffff));
|
||||
break;
|
||||
default:
|
||||
str = phex (l, sizeof (l));
|
||||
break;
|
||||
}
|
||||
|
||||
return str;
|
||||
}
|
||||
|
||||
char *
|
||||
phex_nz (ULONGEST l, int sizeof_l)
|
||||
{
|
||||
char *str;
|
||||
|
||||
switch (sizeof_l)
|
||||
{
|
||||
case 8:
|
||||
{
|
||||
unsigned long high = (unsigned long) (l >> thirty_two);
|
||||
|
||||
str = get_cell ();
|
||||
if (high == 0)
|
||||
xsnprintf (str, CELLSIZE, "%lx",
|
||||
(unsigned long) (l & 0xffffffff));
|
||||
else
|
||||
xsnprintf (str, CELLSIZE, "%lx%08lx", high,
|
||||
(unsigned long) (l & 0xffffffff));
|
||||
break;
|
||||
}
|
||||
case 4:
|
||||
str = get_cell ();
|
||||
xsnprintf (str, CELLSIZE, "%lx", (unsigned long) l);
|
||||
break;
|
||||
case 2:
|
||||
str = get_cell ();
|
||||
xsnprintf (str, CELLSIZE, "%x", (unsigned short) (l & 0xffff));
|
||||
break;
|
||||
default:
|
||||
str = phex_nz (l, sizeof (l));
|
||||
break;
|
||||
}
|
||||
|
||||
return str;
|
||||
}
|
||||
|
||||
/* Converts a LONGEST to a C-format hexadecimal literal and stores it
|
||||
in a static string. Returns a pointer to this string. */
|
||||
char *
|
||||
hex_string (LONGEST num)
|
||||
{
|
||||
char *result = get_cell ();
|
||||
|
||||
xsnprintf (result, CELLSIZE, "0x%s", phex_nz (num, sizeof (num)));
|
||||
return result;
|
||||
}
|
||||
|
||||
/* Converts a LONGEST number to a C-format hexadecimal literal and
|
||||
stores it in a static string. Returns a pointer to this string
|
||||
that is valid until the next call. The number is padded on the
|
||||
left with 0s to at least WIDTH characters. */
|
||||
char *
|
||||
hex_string_custom (LONGEST num, int width)
|
||||
{
|
||||
char *result = get_cell ();
|
||||
char *result_end = result + CELLSIZE - 1;
|
||||
const char *hex = phex_nz (num, sizeof (num));
|
||||
int hex_len = strlen (hex);
|
||||
|
||||
if (hex_len > width)
|
||||
width = hex_len;
|
||||
if (width + 2 >= CELLSIZE)
|
||||
internal_error (__FILE__, __LINE__, _("\
|
||||
hex_string_custom: insufficient space to store result"));
|
||||
|
||||
strcpy (result_end - width - 2, "0x");
|
||||
memset (result_end - width, '0', width);
|
||||
strcpy (result_end - hex_len, hex);
|
||||
return result_end - width - 2;
|
||||
}
|
||||
|
||||
/* Convert VAL to a numeral in the given radix. For
|
||||
* radix 10, IS_SIGNED may be true, indicating a signed quantity;
|
||||
* otherwise VAL is interpreted as unsigned. If WIDTH is supplied,
|
||||
* it is the minimum width (0-padded if needed). USE_C_FORMAT means
|
||||
* to use C format in all cases. If it is false, then 'x'
|
||||
* and 'o' formats do not include a prefix (0x or leading 0). */
|
||||
|
||||
char *
|
||||
int_string (LONGEST val, int radix, int is_signed, int width,
|
||||
int use_c_format)
|
||||
{
|
||||
switch (radix)
|
||||
{
|
||||
case 16:
|
||||
{
|
||||
char *result;
|
||||
|
||||
if (width == 0)
|
||||
result = hex_string (val);
|
||||
else
|
||||
result = hex_string_custom (val, width);
|
||||
if (! use_c_format)
|
||||
result += 2;
|
||||
return result;
|
||||
}
|
||||
case 10:
|
||||
{
|
||||
if (is_signed && val < 0)
|
||||
return decimal2str ("-", -val, width);
|
||||
else
|
||||
return decimal2str ("", val, width);
|
||||
}
|
||||
case 8:
|
||||
{
|
||||
char *result = octal2str (val, width);
|
||||
|
||||
if (use_c_format || val == 0)
|
||||
return result;
|
||||
else
|
||||
return result + 1;
|
||||
}
|
||||
default:
|
||||
internal_error (__FILE__, __LINE__,
|
||||
_("failed internal consistency check"));
|
||||
}
|
||||
}
|
||||
|
||||
/* Convert a CORE_ADDR into a string. */
|
||||
const char *
|
||||
core_addr_to_string (const CORE_ADDR addr)
|
||||
{
|
||||
char *str = get_cell ();
|
||||
|
||||
strcpy (str, "0x");
|
||||
strcat (str, phex (addr, sizeof (addr)));
|
||||
return str;
|
||||
}
|
||||
|
||||
const char *
|
||||
core_addr_to_string_nz (const CORE_ADDR addr)
|
||||
{
|
||||
char *str = get_cell ();
|
||||
|
||||
strcpy (str, "0x");
|
||||
strcat (str, phex_nz (addr, sizeof (addr)));
|
||||
return str;
|
||||
}
|
||||
|
||||
/* Convert a string back into a CORE_ADDR. */
|
||||
CORE_ADDR
|
||||
string_to_core_addr (const char *my_string)
|
||||
|
|
@ -3091,15 +2804,6 @@ string_to_core_addr (const char *my_string)
|
|||
return addr;
|
||||
}
|
||||
|
||||
const char *
|
||||
host_address_to_string (const void *addr)
|
||||
{
|
||||
char *str = get_cell ();
|
||||
|
||||
xsnprintf (str, CELLSIZE, "0x%s", phex_nz ((uintptr_t) addr, sizeof (addr)));
|
||||
return str;
|
||||
}
|
||||
|
||||
char *
|
||||
gdb_realpath (const char *filename)
|
||||
{
|
||||
|
|
|
|||
22
gdb/utils.h
22
gdb/utils.h
|
|
@ -23,6 +23,7 @@
|
|||
|
||||
#include "cleanups.h"
|
||||
#include "exceptions.h"
|
||||
#include "print-utils.h"
|
||||
|
||||
extern void initialize_utils (void);
|
||||
|
||||
|
|
@ -245,8 +246,6 @@ extern void fputstrn_unfiltered (const char *str, int n, int quotr,
|
|||
/* Display the host ADDR on STREAM formatted as ``0x%x''. */
|
||||
extern void gdb_print_host_address (const void *addr, struct ui_file *stream);
|
||||
|
||||
extern const char *host_address_to_string (const void *addr);
|
||||
|
||||
/* Convert CORE_ADDR to string in platform-specific manner.
|
||||
This is usually formatted similar to 0x%lx. */
|
||||
extern const char *paddress (struct gdbarch *gdbarch, CORE_ADDR addr);
|
||||
|
|
@ -261,27 +260,8 @@ extern const char *print_core_address (struct gdbarch *gdbarch,
|
|||
extern hashval_t core_addr_hash (const void *ap);
|
||||
extern int core_addr_eq (const void *ap, const void *bp);
|
||||
|
||||
/* %d for LONGEST */
|
||||
extern char *plongest (LONGEST l);
|
||||
/* %u for ULONGEST */
|
||||
extern char *pulongest (ULONGEST l);
|
||||
|
||||
extern char *phex (ULONGEST l, int sizeof_l);
|
||||
extern char *phex_nz (ULONGEST l, int sizeof_l);
|
||||
extern char *int_string (LONGEST, int, int, int, int);
|
||||
|
||||
/* Convert a CORE_ADDR into a HEX string with leading zeros.
|
||||
The output from core_addr_to_string() can be passed direct to
|
||||
string_to_core_addr(). */
|
||||
extern const char *core_addr_to_string (const CORE_ADDR addr);
|
||||
extern const char *core_addr_to_string_nz (const CORE_ADDR addr);
|
||||
extern CORE_ADDR string_to_core_addr (const char *my_string);
|
||||
|
||||
/* Return a string that contains a number formatted as a hex
|
||||
string. */
|
||||
extern char *hex_string (LONGEST);
|
||||
extern char *hex_string_custom (LONGEST, int);
|
||||
|
||||
extern void fprintf_symbol_filtered (struct ui_file *, const char *,
|
||||
enum language, int);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue