old-cross-binutils/gdb/guile/scm-disasm.c
Pedro Alves 72e0248351 guile: Add as_a_scm_t_subr
Building GDB in C++ mode on Fedora 20, the gdb/guile/ code shows ~280
errors like:

 src/gdb/guile/guile.c:515:1: error: invalid conversion from ‘scm_unused_struct* (*)(SCM, SCM) {aka scm_unused_struct* (*)(scm_unused_struct*, scm_unused_struct*)}’ to ‘scm_t_subr {aka void*}’ [-fpermissive]

This commit fixes them all.

gdb/ChangeLog:
2015-09-07  Pedro Alves  <palves@redhat.com>

	* guile/guile-internal.h (as_a_scm_t_subr): New.
	* guile/guile.c (misc_guile_functions): Use it.
	* guile/scm-arch.c (arch_functions): Use it.
	* guile/scm-block.c (block_functions, gdbscm_initialize_blocks):
	Use it.
	* guile/scm-breakpoint.c (breakpoint_functions): Use it.
	* guile/scm-cmd.c (command_functions): Use it.
	* guile/scm-disasm.c (disasm_functions): Use it.
	* guile/scm-exception.c (exception_functions)
	(private_exception_functions): Use it.
	* guile/scm-frame.c (frame_functions)
	* guile/scm-gsmob.c (gsmob_functions): Use it.
	* guile/scm-iterator.c (iterator_functions): Use it.
	* guile/scm-lazy-string.c (lazy_string_functions): Use it.
	* guile/scm-math.c (math_functions): Use it.
	* guile/scm-objfile.c (objfile_functions): Use it.
	* guile/scm-param.c (parameter_functions): Use it.
	* guile/scm-ports.c (port_functions, private_port_functions): Use
	it.
	* guile/scm-pretty-print.c (pretty_printer_functions): Use it.
	* guile/scm-progspace.c (pspace_functions): Use it.
	* guile/scm-string.c (string_functions): Use it.
	* guile/scm-symbol.c (symbol_functions): Use it.
	* guile/scm-symtab.c (symtab_functions): Use it.
	* guile/scm-type.c (type_functions, gdbscm_initialize_types): Use
	it.
	* guile/scm-value.c (value_functions): Use it.
2015-09-07 19:34:31 +01:00

358 lines
11 KiB
C
Raw Blame History

This file contains invisible Unicode characters

This file contains invisible Unicode characters that are indistinguishable to humans but may be processed differently by a computer. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

/* Scheme interface to architecture.
Copyright (C) 2014-2015 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/>. */
/* See README file in this directory for implementation notes, coding
conventions, et.al. */
#include "defs.h"
#include "arch-utils.h"
#include "disasm.h"
#include "dis-asm.h"
#include "gdbarch.h"
#include "gdbcore.h" /* Why is memory_error here? */
#include "guile-internal.h"
static SCM port_keyword;
static SCM offset_keyword;
static SCM size_keyword;
static SCM count_keyword;
static SCM address_symbol;
static SCM asm_symbol;
static SCM length_symbol;
/* Struct used to pass "application data" in disassemble_info. */
struct gdbscm_disasm_data
{
struct gdbarch *gdbarch;
SCM port;
/* The offset of the address of the first instruction in PORT. */
ULONGEST offset;
};
/* Struct used to pass data from gdbscm_disasm_read_memory to
gdbscm_disasm_read_memory_worker. */
struct gdbscm_disasm_read_data
{
bfd_vma memaddr;
bfd_byte *myaddr;
unsigned int length;
struct disassemble_info *dinfo;
};
/* Subroutine of gdbscm_arch_disassemble to simplify it.
Return the result for one instruction. */
static SCM
dascm_make_insn (CORE_ADDR pc, const char *assembly, int insn_len)
{
return scm_list_3 (scm_cons (address_symbol,
gdbscm_scm_from_ulongest (pc)),
scm_cons (asm_symbol,
gdbscm_scm_from_c_string (assembly)),
scm_cons (length_symbol,
scm_from_int (insn_len)));
}
/* Helper function for gdbscm_disasm_read_memory to safely read from a
Scheme port. Called via gdbscm_call_guile.
The result is a statically allocated error message or NULL if success. */
static void *
gdbscm_disasm_read_memory_worker (void *datap)
{
struct gdbscm_disasm_read_data *data = datap;
struct disassemble_info *dinfo = data->dinfo;
struct gdbscm_disasm_data *disasm_data = dinfo->application_data;
SCM seekto, newpos, port = disasm_data->port;
size_t bytes_read;
seekto = gdbscm_scm_from_ulongest (data->memaddr - disasm_data->offset);
newpos = scm_seek (port, seekto, scm_from_int (SEEK_SET));
if (!scm_is_eq (seekto, newpos))
return "seek error";
bytes_read = scm_c_read (port, data->myaddr, data->length);
if (bytes_read != data->length)
return "short read";
/* If we get here the read succeeded. */
return NULL;
}
/* disassemble_info.read_memory_func for gdbscm_print_insn_from_port. */
static int
gdbscm_disasm_read_memory (bfd_vma memaddr, bfd_byte *myaddr,
unsigned int length,
struct disassemble_info *dinfo)
{
struct gdbscm_disasm_read_data data;
void *status;
data.memaddr = memaddr;
data.myaddr = myaddr;
data.length = length;
data.dinfo = dinfo;
status = gdbscm_with_guile (gdbscm_disasm_read_memory_worker, &data);
/* TODO: IWBN to distinguish problems reading target memory versus problems
with the port (e.g., EOF).
We return TARGET_XFER_E_IO here as that's what memory_error looks for. */
return status != NULL ? TARGET_XFER_E_IO : 0;
}
/* disassemble_info.memory_error_func for gdbscm_print_insn_from_port.
Technically speaking, we don't need our own memory_error_func,
but to not provide one would leave a subtle dependency in the code.
This function exists to keep a clear boundary. */
static void
gdbscm_disasm_memory_error (int status, bfd_vma memaddr,
struct disassemble_info *info)
{
memory_error (status, memaddr);
}
/* disassemble_info.print_address_func for gdbscm_print_insn_from_port.
Since we need to use our own application_data value, we need to supply
this routine as well. */
static void
gdbscm_disasm_print_address (bfd_vma addr, struct disassemble_info *info)
{
struct gdbscm_disasm_data *data = info->application_data;
struct gdbarch *gdbarch = data->gdbarch;
print_address (gdbarch, addr, info->stream);
}
/* Subroutine of gdbscm_arch_disassemble to simplify it.
Call gdbarch_print_insn using a port for input.
PORT must be seekable.
OFFSET is the offset in PORT from which addresses begin.
For example, when printing from a bytevector, addresses passed to the
bv seek routines must be in the range [0,size). However, the bytevector
may represent an instruction at address 0x1234. To handle this case pass
0x1234 for OFFSET.
This is based on gdb_print_insn, see it for details. */
static int
gdbscm_print_insn_from_port (struct gdbarch *gdbarch,
SCM port, ULONGEST offset, CORE_ADDR memaddr,
struct ui_file *stream, int *branch_delay_insns)
{
struct disassemble_info di;
int length;
struct gdbscm_disasm_data data;
di = gdb_disassemble_info (gdbarch, stream);
data.gdbarch = gdbarch;
data.port = port;
data.offset = offset;
di.application_data = &data;
di.read_memory_func = gdbscm_disasm_read_memory;
di.memory_error_func = gdbscm_disasm_memory_error;
di.print_address_func = gdbscm_disasm_print_address;
length = gdbarch_print_insn (gdbarch, memaddr, &di);
if (branch_delay_insns)
{
if (di.insn_info_valid)
*branch_delay_insns = di.branch_delay_insns;
else
*branch_delay_insns = 0;
}
return length;
}
/* (arch-disassemble <gdb:arch> address
[#:port port] [#:offset address] [#:size integer] [#:count integer])
-> list
Returns a list of disassembled instructions.
If PORT is provided, read bytes from it. Otherwise read target memory.
If PORT is #f, read target memory.
PORT must be seekable. IWBN to remove this restriction, and a future
release may. For now the restriction is in place because it's not clear
all disassemblers are strictly sequential.
If SIZE is provided, limit the number of bytes read to this amount.
If COUNT is provided, limit the number of instructions to this amount.
Each instruction in the result is an alist:
(('address . address) ('asm . disassembly) ('length . length)).
We could use a hash table (dictionary) but there aren't that many fields. */
static SCM
gdbscm_arch_disassemble (SCM self, SCM start_scm, SCM rest)
{
arch_smob *a_smob
= arscm_get_arch_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
struct gdbarch *gdbarch = arscm_get_gdbarch (a_smob);
const SCM keywords[] = {
port_keyword, offset_keyword, size_keyword, count_keyword, SCM_BOOL_F
};
int port_arg_pos = -1, offset_arg_pos = -1;
int size_arg_pos = -1, count_arg_pos = -1;
SCM port = SCM_BOOL_F;
ULONGEST offset = 0;
unsigned int count = 1;
unsigned int size;
ULONGEST start_arg;
CORE_ADDR start, end;
CORE_ADDR pc;
unsigned int i;
int using_port;
SCM result;
gdbscm_parse_function_args (FUNC_NAME, SCM_ARG2, keywords, "U#OUuu",
start_scm, &start_arg, rest,
&port_arg_pos, &port,
&offset_arg_pos, &offset,
&size_arg_pos, &size,
&count_arg_pos, &count);
/* START is first stored in a ULONGEST because we don't have a format char
for CORE_ADDR, and it's not really worth it to have one yet. */
start = start_arg;
if (port_arg_pos > 0)
{
SCM_ASSERT_TYPE (gdbscm_is_false (port)
|| gdbscm_is_true (scm_input_port_p (port)),
port, port_arg_pos, FUNC_NAME, _("input port"));
}
using_port = gdbscm_is_true (port);
if (offset_arg_pos > 0
&& (port_arg_pos < 0
|| gdbscm_is_false (port)))
{
gdbscm_out_of_range_error (FUNC_NAME, offset_arg_pos,
gdbscm_scm_from_ulongest (offset),
_("offset provided but port is missing"));
}
if (size_arg_pos > 0)
{
if (size == 0)
return SCM_EOL;
/* For now be strict about start+size overflowing. If it becomes
a nuisance we can relax things later. */
if (start + size < start)
{
gdbscm_out_of_range_error (FUNC_NAME, 0,
scm_list_2 (gdbscm_scm_from_ulongest (start),
gdbscm_scm_from_ulongest (size)),
_("start+size overflows"));
}
end = start + size - 1;
}
else
end = ~(CORE_ADDR) 0;
if (count == 0)
return SCM_EOL;
result = SCM_EOL;
for (pc = start, i = 0; pc <= end && i < count; )
{
int insn_len = 0;
char *as = NULL;
struct ui_file *memfile = mem_fileopen ();
struct cleanup *cleanups = make_cleanup_ui_file_delete (memfile);
TRY
{
if (using_port)
{
insn_len = gdbscm_print_insn_from_port (gdbarch, port, offset,
pc, memfile, NULL);
}
else
insn_len = gdb_print_insn (gdbarch, pc, memfile, NULL);
}
CATCH (except, RETURN_MASK_ALL)
{
GDBSCM_HANDLE_GDB_EXCEPTION_WITH_CLEANUPS (except, cleanups);
}
END_CATCH
as = ui_file_xstrdup (memfile, NULL);
result = scm_cons (dascm_make_insn (pc, as, insn_len),
result);
pc += insn_len;
i++;
do_cleanups (cleanups);
xfree (as);
}
return scm_reverse_x (result, SCM_EOL);
}
/* Initialize the Scheme architecture support. */
static const scheme_function disasm_functions[] =
{
{ "arch-disassemble", 2, 0, 1, as_a_scm_t_subr (gdbscm_arch_disassemble),
"\
Return list of disassembled instructions in memory.\n\
\n\
Arguments: <gdb:arch> start-address\n\
[#:port port] [#:offset address]\n\
[#:size <integer>] [#:count <integer>]\n\
port: If non-#f, it is an input port to read bytes from.\n\
offset: Specifies the address offset of the first byte in the port.\n\
This is useful if the input is from something other than memory\n\
(e.g., a bytevector) and you want the result to be as if the bytes\n\
came from that address. The value to pass for start-address is\n\
then also the desired disassembly address, not the offset in, e.g.,\n\
the bytevector.\n\
size: Limit the number of bytes read to this amount.\n\
count: Limit the number of instructions to this amount.\n\
\n\
Returns:\n\
Each instruction in the result is an alist:\n\
(('address . address) ('asm . disassembly) ('length . length))." },
END_FUNCTIONS
};
void
gdbscm_initialize_disasm (void)
{
gdbscm_define_functions (disasm_functions, 1);
port_keyword = scm_from_latin1_keyword ("port");
offset_keyword = scm_from_latin1_keyword ("offset");
size_keyword = scm_from_latin1_keyword ("size");
count_keyword = scm_from_latin1_keyword ("count");
address_symbol = scm_from_latin1_symbol ("address");
asm_symbol = scm_from_latin1_symbol ("asm");
length_symbol = scm_from_latin1_symbol ("length");
}