/* Data structures and API for event locations in GDB.
- Copyright (C) 2013-2015 Free Software Foundation, Inc.
+ Copyright (C) 2013-2016 Free Software Foundation, Inc.
This file is part of GDB.
{
/* The type of this breakpoint specification. */
enum event_location_type type;
-#define EL_TYPE(PTR) (PTR)->type
+#define EL_TYPE(P) (P)->type
union
{
This representation is used by both "normal" linespecs and
probes. */
char *addr_string;
-#define EL_LINESPEC(PTR) ((PTR)->u.addr_string)
-#define EL_PROBE(PTR) ((PTR)->u.addr_string)
+#define EL_LINESPEC(P) ((P)->u.addr_string)
+#define EL_PROBE(P) ((P)->u.addr_string)
/* An address in the inferior. */
CORE_ADDR address;
-#define EL_ADDRESS(PTR) (PTR)->u.address
+#define EL_ADDRESS(P) (P)->u.address
/* An explicit location. */
- struct explicit_location explicit;
-#define EL_EXPLICIT(PTR) (&((PTR)->u.explicit))
+ struct explicit_location explicit_loc;
+#define EL_EXPLICIT(P) (&((P)->u.explicit_loc))
} u;
/* Cached string representation of this location. This is used, e.g., to
save stop event locations to file. Malloc'd. */
char *as_string;
-#define EL_STRING(PTR) ((PTR)->as_string)
+#define EL_STRING(P) ((P)->as_string)
};
/* See description in location.h. */
/* See description in location.h. */
void
-initialize_explicit_location (struct explicit_location *explicit)
+initialize_explicit_location (struct explicit_location *explicit_loc)
{
- memset (explicit, 0, sizeof (struct explicit_location));
- explicit->line_offset.sign = LINE_OFFSET_UNKNOWN;
+ memset (explicit_loc, 0, sizeof (struct explicit_location));
+ explicit_loc->line_offset.sign = LINE_OFFSET_UNKNOWN;
}
/* See description in location.h. */
/* See description in location.h. */
struct event_location *
-new_address_location (CORE_ADDR addr)
+new_address_location (CORE_ADDR addr, const char *addr_string,
+ int addr_string_len)
{
struct event_location *location;
location = XCNEW (struct event_location);
EL_TYPE (location) = ADDRESS_LOCATION;
EL_ADDRESS (location) = addr;
+ if (addr_string != NULL)
+ EL_STRING (location) = xstrndup (addr_string, addr_string_len);
return location;
}
/* See description in location.h. */
+const char *
+get_address_string_location (const struct event_location *location)
+{
+ gdb_assert (EL_TYPE (location) == ADDRESS_LOCATION);
+ return EL_STRING (location);
+}
+
+/* See description in location.h. */
+
struct event_location *
new_probe_location (const char *probe)
{
/* See description in location.h. */
struct event_location *
-new_explicit_location (const struct explicit_location *explicit)
+new_explicit_location (const struct explicit_location *explicit_loc)
{
struct event_location tmp;
memset (&tmp, 0, sizeof (struct event_location));
EL_TYPE (&tmp) = EXPLICIT_LOCATION;
initialize_explicit_location (EL_EXPLICIT (&tmp));
- if (explicit != NULL)
+ if (explicit_loc != NULL)
{
- if (explicit->source_filename != NULL)
+ if (explicit_loc->source_filename != NULL)
{
EL_EXPLICIT (&tmp)->source_filename
- = explicit->source_filename;
+ = explicit_loc->source_filename;
}
- if (explicit->function_name != NULL)
+ if (explicit_loc->function_name != NULL)
EL_EXPLICIT (&tmp)->function_name
- = explicit->function_name;
+ = explicit_loc->function_name;
- if (explicit->label_name != NULL)
- EL_EXPLICIT (&tmp)->label_name = explicit->label_name;
+ if (explicit_loc->label_name != NULL)
+ EL_EXPLICIT (&tmp)->label_name = explicit_loc->label_name;
- if (explicit->line_offset.sign != LINE_OFFSET_UNKNOWN)
- EL_EXPLICIT (&tmp)->line_offset = explicit->line_offset;
+ if (explicit_loc->line_offset.sign != LINE_OFFSET_UNKNOWN)
+ EL_EXPLICIT (&tmp)->line_offset = explicit_loc->line_offset;
}
return copy_event_location (&tmp);
}
/* This convenience function returns a malloc'd string which
- represents the location in EXPLICIT.
+ represents the location in EXPLICIT_LOC.
AS_LINESPEC is non-zero if this string should be a linespec.
Otherwise it will be output in explicit form. */
static char *
explicit_to_string_internal (int as_linespec,
- const struct explicit_location *explicit)
+ const struct explicit_location *explicit_loc)
{
struct ui_file *buf;
char space, *result;
buf = mem_fileopen ();
cleanup = make_cleanup_ui_file_delete (buf);
- if (explicit->source_filename != NULL)
+ if (explicit_loc->source_filename != NULL)
{
if (!as_linespec)
fputs_unfiltered ("-source ", buf);
- fputs_unfiltered (explicit->source_filename, buf);
+ fputs_unfiltered (explicit_loc->source_filename, buf);
need_space = 1;
}
- if (explicit->function_name != NULL)
+ if (explicit_loc->function_name != NULL)
{
if (need_space)
fputc_unfiltered (space, buf);
if (!as_linespec)
fputs_unfiltered ("-function ", buf);
- fputs_unfiltered (explicit->function_name, buf);
+ fputs_unfiltered (explicit_loc->function_name, buf);
need_space = 1;
}
- if (explicit->label_name != NULL)
+ if (explicit_loc->label_name != NULL)
{
if (need_space)
fputc_unfiltered (space, buf);
if (!as_linespec)
fputs_unfiltered ("-label ", buf);
- fputs_unfiltered (explicit->label_name, buf);
+ fputs_unfiltered (explicit_loc->label_name, buf);
need_space = 1;
}
- if (explicit->line_offset.sign != LINE_OFFSET_UNKNOWN)
+ if (explicit_loc->line_offset.sign != LINE_OFFSET_UNKNOWN)
{
if (need_space)
fputc_unfiltered (space, buf);
if (!as_linespec)
fputs_unfiltered ("-line ", buf);
fprintf_filtered (buf, "%s%d",
- (explicit->line_offset.sign == LINE_OFFSET_NONE ? ""
- : (explicit->line_offset.sign
+ (explicit_loc->line_offset.sign == LINE_OFFSET_NONE ? ""
+ : (explicit_loc->line_offset.sign
== LINE_OFFSET_PLUS ? "+" : "-")),
- explicit->line_offset.offset);
+ explicit_loc->line_offset.offset);
}
result = ui_file_xstrdup (buf, NULL);
/* See description in location.h. */
char *
-explicit_location_to_string (const struct explicit_location *explicit)
+explicit_location_to_string (const struct explicit_location *explicit_loc)
{
- return explicit_to_string_internal (0, explicit);
+ return explicit_to_string_internal (0, explicit_loc);
}
/* See description in location.h. */
char *
-explicit_location_to_linespec (const struct explicit_location *explicit)
+explicit_location_to_linespec (const struct explicit_location *explicit_loc)
{
- return explicit_to_string_internal (1, explicit);
+ return explicit_to_string_internal (1, explicit_loc);
}
/* See description in location.h. */
{
/* Special case: C++ operator,. */
if (language->la_language == language_cplus
- && strncmp (*inp, "operator", 8)
- && (*inp)[9] == ',')
- (*inp) += 9;
+ && strncmp (*inp, "operator", 8) == 0)
+ (*inp) += 8;
++(*inp);
}
}
struct event_location *location;
/* It is assumed that input beginning with '-' and a non-digit
- character is an explicit location. */
+ character is an explicit location. "-p" is reserved, though,
+ for probe locations. */
if (argp == NULL
- || *argp == '\0'
+ || *argp == NULL
|| *argp[0] != '-'
- || !isalpha ((*argp)[1]))
+ || !isalpha ((*argp)[1])
+ || ((*argp)[0] == '-' && (*argp)[1] == 'p'))
return NULL;
location = new_explicit_location (NULL);
/* See description in location.h. */
struct event_location *
-string_to_event_location (char **stringp,
- const struct language_defn *language)
+string_to_event_location_basic (char **stringp,
+ const struct language_defn *language)
{
struct event_location *location;
+ const char *cs;
- /* First, check if the string is an address location. */
- if (*stringp != NULL && **stringp == '*')
+ /* Try the input as a probe spec. */
+ cs = *stringp;
+ if (cs != NULL && probe_linespec_to_ops (&cs) != NULL)
{
- const char *arg, *orig;
- CORE_ADDR addr;
-
- orig = arg = *stringp;
- addr = linespec_expression_to_pc (&arg);
- location = new_address_location (addr);
- *stringp += arg - orig;
+ location = new_probe_location (*stringp);
+ *stringp += strlen (*stringp);
}
else
{
- const char *cs;
-
- /* Next, try the input as a probe spec. */
- cs = *stringp;
- if (cs != NULL && probe_linespec_to_ops (&cs) != NULL)
- {
- location = new_probe_location (*stringp);
- *stringp += strlen (*stringp);
- }
- else
+ /* Try an address location. */
+ if (*stringp != NULL && **stringp == '*')
{
const char *arg, *orig;
+ CORE_ADDR addr;
- /* Next, try an explicit location. */
orig = arg = *stringp;
- location = string_to_explicit_location (&arg, language, 0);
- if (location != NULL)
- {
- /* It was a valid explicit location. Advance STRINGP to
- the end of input. */
- *stringp += arg - orig;
- }
- else
- {
- /* Everything else is a linespec. */
- location = new_linespec_location (stringp);
- }
+ addr = linespec_expression_to_pc (&arg);
+ location = new_address_location (addr, orig, arg - orig);
+ *stringp += arg - orig;
+ }
+ else
+ {
+ /* Everything else is a linespec. */
+ location = new_linespec_location (stringp);
}
}
/* See description in location.h. */
+struct event_location *
+string_to_event_location (char **stringp,
+ const struct language_defn *language)
+{
+ struct event_location *location;
+ const char *arg, *orig;
+
+ /* Try an explicit location. */
+ orig = arg = *stringp;
+ location = string_to_explicit_location (&arg, language, 0);
+ if (location != NULL)
+ {
+ /* It was a valid explicit location. Advance STRINGP to
+ the end of input. */
+ *stringp += arg - orig;
+ }
+ else
+ {
+ /* Everything else is a "basic" linespec, address, or probe
+ location. */
+ location = string_to_event_location_basic (stringp, language);
+ }
+
+ return location;
+}
+
+/* See description in location.h. */
+
int
event_location_empty_p (const struct event_location *location)
{
projects / deliverable / binutils-gdb.git / blobdiff