diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 3efedc8..266a6ec 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -805,7 +805,7 @@ SFILES = ada-exp.y ada-lang.c ada-typeprint.c ada-valprint.c ada-tasks.c \
inline-frame.c \
interps.c \
jv-exp.y jv-lang.c jv-valprint.c jv-typeprint.c jv-varobj.c \
- language.c linespec.c minidebug.c \
+ language.c linespec.c location.c minidebug.c \
m2-exp.y m2-lang.c m2-typeprint.c m2-valprint.c \
macrotab.c macroexp.c macrocmd.c macroscope.c main.c maint.c \
mdebugread.c memattr.c mem-break.c minsyms.c mipsread.c memory-map.c \
@@ -887,7 +887,7 @@ mi/mi-out.h mi/mi-main.h mi/mi-common.h mi/mi-cmds.h linux-nat.h \
complaints.h gdb_proc_service.h gdb_regex.h xtensa-tdep.h inf-loop.h \
common/gdb_wait.h common/gdb_assert.h solib.h ppc-tdep.h cp-support.h glibc-tdep.h \
interps.h auxv.h gdbcmd.h tramp-frame.h mipsnbsd-tdep.h \
-amd64-linux-tdep.h linespec.h i387-tdep.h mn10300-tdep.h \
+amd64-linux-tdep.h linespec.h location.h i387-tdep.h mn10300-tdep.h \
sparc64-tdep.h monitor.h ppcobsd-tdep.h srec.h solib-pa64.h \
coff-pe-read.h parser-defs.h gdb_ptrace.h mips-linux-tdep.h \
m68k-tdep.h spu-tdep.h jv-lang.h environ.h solib-irix.h amd64-tdep.h \
@@ -964,7 +964,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
source.o value.o eval.o valops.o valarith.o valprint.o printcmd.o \
block.o symtab.o psymtab.o symfile.o symfile-debug.o symmisc.o \
linespec.o dictionary.o \
- infcall.o \
+ location.o infcall.o \
infcmd.o infrun.o \
expprint.o environ.o stack.o thread.o \
exceptions.o \
diff --git a/gdb/location.c b/gdb/location.c
new file mode 100644
index 0000000..57900bf
--- /dev/null
+++ b/gdb/location.c
@@ -0,0 +1,194 @@
+/* Data structures and API for event locations in GDB.
+ Copyright (C) 2013-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 . */
+
+#include "defs.h"
+#include "gdb_assert.h"
+#include "location.h"
+#include "symtab.h"
+#include "language.h"
+#include "linespec.h"
+#include "cli/cli-utils.h"
+#include "probe.h"
+
+#include
+#include
+
+/* Initialize the given LOCATION. */
+
+void
+initialize_event_location (struct event_location *location,
+ enum event_location_type type)
+{
+ memset (location, 0, sizeof (struct event_location));
+ EVENT_LOCATION_TYPE (location) = type;
+}
+
+/* Create a new linespec location. The return result is malloc'd
+ and should be freed with delete_event_location. */
+
+struct event_location *
+new_linespec_location (const char *linespec)
+{
+ struct event_location *location;
+
+ location = XNEW (struct event_location);
+ initialize_event_location (location, LINESPEC_LOCATION);
+ if (linespec != NULL)
+ EVENT_LOCATION_LINESPEC (location) = xstrdup (linespec);
+ return location;
+}
+
+/* Return a copy of the given SRC location. */
+
+struct event_location *
+copy_event_location (const struct event_location *src)
+{
+ struct event_location *dst;
+
+ dst = XCNEW (struct event_location);
+ EVENT_LOCATION_TYPE (dst) = EVENT_LOCATION_TYPE (src);
+ if (src->as_string != NULL)
+ dst->as_string = xstrdup (src->as_string);
+
+ switch (EVENT_LOCATION_TYPE (src))
+ {
+ case LINESPEC_LOCATION:
+ EVENT_LOCATION_LINESPEC (dst) = xstrdup (EVENT_LOCATION_LINESPEC (src));
+ break;
+
+ default:
+ gdb_assert_not_reached ("unknown event location type");
+ }
+
+ return dst;
+}
+
+/* A cleanup function for struct event_location. */
+
+static void
+delete_event_location_cleanup (void *data)
+{
+ struct event_location *location = (struct event_location *) data;
+
+ delete_event_location (location);
+}
+
+/* Make a cleanup to free LOCATION. */
+
+struct cleanup *
+make_cleanup_delete_event_location (struct event_location *location)
+{
+ return make_cleanup (delete_event_location_cleanup, location);
+}
+
+/* Free LOCATION and any associated data. */
+
+void
+delete_event_location (struct event_location *location)
+{
+ if (location != NULL)
+ {
+ xfree (location->as_string);
+
+ switch (EVENT_LOCATION_TYPE (location))
+ {
+ case LINESPEC_LOCATION:
+ xfree (EVENT_LOCATION_LINESPEC (location));
+ break;
+
+ default:
+ gdb_assert_not_reached ("unknown event location type");
+ }
+
+ xfree (location);
+ }
+}
+
+/* A const version of event_location_to_string that will not cache
+ the resulting string representation. The result is malloc'd
+ and must be freed by the caller. */
+
+char *
+event_location_to_string_const (const struct event_location *location)
+{
+ char *result = NULL;
+
+ if (location->as_string != NULL)
+ return xstrdup (location->as_string);
+
+ switch (EVENT_LOCATION_TYPE (location))
+ {
+ case LINESPEC_LOCATION:
+ if (EVENT_LOCATION_LINESPEC (location) != NULL)
+ result = xstrdup (EVENT_LOCATION_LINESPEC (location));
+ break;
+
+ default:
+ gdb_assert_not_reached ("unknown event location type");
+ }
+
+ return result;
+}
+
+/* Return a string representation of the LOCATION.
+ This function may return NULL for unspecified linespecs,
+ e.g, LINESPEC_LOCATION and addr_string is NULL.
+
+ The result is cached in LOCATION. */
+
+const char *
+event_location_to_string (struct event_location *location)
+{
+ /* Cache a copy of the string representation. */
+ if (location->as_string == NULL)
+ location->as_string = event_location_to_string_const (location);
+
+ return location->as_string;
+}
+
+/* Parse the user input in *STRINGP and turn it into a struct
+ event_location, advancing STRINGP past any parsed input.
+ Return value is malloc'd. */
+
+struct event_location *
+string_to_event_location (char **stringp,
+ const struct language_defn *language)
+{
+ struct event_location *location;
+
+ location = new_linespec_location (*stringp);
+ if (*stringp != NULL)
+ *stringp += strlen (*stringp);
+
+ return location;
+}
+
+/* A convenience function for testing for unset locations. */
+
+int
+event_location_empty_p (const struct event_location *location)
+{
+ switch (EVENT_LOCATION_TYPE (location))
+ {
+ case LINESPEC_LOCATION:
+ return EVENT_LOCATION_LINESPEC (location) == NULL;
+
+ default:
+ gdb_assert_not_reached ("unknown event location type");
+ }
+}
diff --git a/gdb/location.h b/gdb/location.h
new file mode 100644
index 0000000..418e271
--- /dev/null
+++ b/gdb/location.h
@@ -0,0 +1,115 @@
+/* Data structures and API for event locations in GDB.
+ Copyright (C) 2013, 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 . */
+
+#ifndef LOCATIONS_H
+#define LOCATIONS_H 1
+
+struct language_defn;
+
+/* An enumeration of the various ways to specify a stop event
+ location (used with create_breakpoint). */
+
+enum event_location_type
+{
+ /* A traditional linespec. */
+ LINESPEC_LOCATION
+};
+
+/* An event location used to set a stop event in the inferior.
+ This structure is an amalgam of the various ways
+ to specify where a stop event should be set. */
+
+struct event_location
+{
+ /* The type of this breakpoint specification. */
+ enum event_location_type type;
+#define EVENT_LOCATION_TYPE(S) ((S)->type)
+
+ union
+ {
+ /* A generic "this is a string specification" for a location.
+ This representation is used by both "normal" linespecs and
+ probes. */
+ char *addr_string;
+#define EVENT_LOCATION_LINESPEC(S) ((S)->u.addr_string)
+ } u;
+
+ /* Cached string representation of this location. This is used to
+ save stop event locations to file. Malloc'd. */
+ char *as_string;
+};
+
+/* Return a string representation of the LOCATION.
+ This function may return NULL for unspecified linespecs,
+ e.g, EVENT_LOCATION_LINESPEC and addr_string is NULL.
+
+ The result is cached in LOCATION. */
+
+extern const char *
+ event_location_to_string (struct event_location *location);
+
+/* A const version of event_location_to_string that will not cache
+ the resulting string representation. The result is malloc'd
+ and must be freed by the caller. */
+
+extern char *
+ event_location_to_string_const (const struct event_location *location);
+
+/* Free an event location and any associated data. */
+
+extern void delete_event_location (struct event_location *location);
+
+/* Make a cleanup to free LOCATION. */
+
+extern struct cleanup *
+ make_cleanup_delete_event_location (struct event_location *location);
+
+/* Create a new linespec location. The return result is malloc'd
+ and should be freed with delete_event_location. */
+
+extern struct event_location *
+ new_linespec_location (const char *linespec);
+
+/* Return a copy of the given SRC location. */
+
+extern struct event_location *
+ copy_event_location (const struct event_location *src);
+
+/* Initialize the given LOCATION. */
+
+extern void initialize_event_location (struct event_location *location,
+ enum event_location_type type);
+
+/* Attempt to convert the input string in *ARGP into an event location.
+ ARGP is advanced past any processed input. Returns a event_location
+ (malloc'd) if an event location was successfully found in *ARGP,
+ NULL otherwise.
+
+ This function may call error() if *ARGP looks like properly formed,
+ but invalid, input, e.g., if it is called with missing argument parameters
+ or invalid options. */
+
+extern struct event_location *
+ string_to_event_location (char **argp,
+ const struct language_defn *langauge);
+
+/* A convenience function for testing for unset locations. */
+
+extern int event_location_empty_p (const struct event_location *location);
+
+#endif /* LOCATIONS_H */