Index: ChangeLog

2003-08-07  Andrew Cagney  <cagney@redhat.com>

	* interps.h (INTERP_MI2, INTERP_MI3): Define.

Index: doc/ChangeLog
2003-08-07  Andrew Cagney  <cagney@redhat.com>

	* gdb.texinfo (Mode Options): Mention that "mi2" was included in
	GDB 6.0.

Index: mi/ChangeLog
2003-08-07  Andrew Cagney  <cagney@redhat.com>

	* mi-interp.c (_initialize_mi_interp): Register "mi2" and "mi3".
	Make "mi" select "mi2".

Index: testsuite/gdb.mi/ChangeLog
2003-08-07  Andrew Cagney  <cagney@redhat.com>

	* mi2-basics.exp: Copy base MI .exp file, set MIFLAGS to -i=mi2.
	* mi2-break.exp, mi2-cli.exp, mi2-console.exp: Ditto.
	* mi2-disassemble.exp, mi2-eval.exp, mi2-file.exp: Ditto.
	* mi2-hack-cli.exp, mi2-pthreads.exp, mi2-read-memory.exp: Ditto.
	* mi2-regs.exp, mi2-return.exp, mi2-simplerun.exp: Ditto.
	* mi2-stack.exp, mi2-stepi.exp, mi2-syn-frame.exp: Ditto.
	* mi2-until.exp, mi2-var-block.exp, mi2-var-child.exp: Ditto.
	* mi2-var-cmd.exp, mi2-var-display.exp, mi2-watch.exp: Ditto.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 29591f7a4b1dc45026e5f1172e1c8c313f7bc5dc..e44fa1a78987fabd6c37891d6f72e5ba9b803253 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-07  Andrew Cagney  <cagney@redhat.com>
+
+       * interps.h (INTERP_MI2, INTERP_MI3): Define.
+
 2003-08-07  Michal Ludvig  <mludvig@suse.cz>
 
        * x86-64-tdep.c (x86_64_dwarf_regmap): Correct register numbers.

diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 29455ad55da4778894903c38c73957d9f080d6f0..20bfa9b18bf333a7ac742a1b1cfb0caf332e8e30 100644 (file)
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-07  Andrew Cagney  <cagney@redhat.com>
+
+       * gdb.texinfo (Mode Options): Mention that "mi2" was included in
+       GDB 6.0.
+
 2003-08-06  Andrew Cagney  <cagney@redhat.com>
 
        * gdb.texinfo (Mode Options): Mention that level three is the

diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index b750398ec61ed5413b4f7dfc63be4bfd17d07fe6..cc28065c1b8c84e952420868583433ec7c2ce0ce 100644 (file)
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -1133,11 +1133,11 @@ communicate with @value{GDBN} using it as a back end.
 @xref{Interpreters, , Command Interpreters}.
 
 @samp{--interpreter=mi} (or @samp{--interpreter=mi2}) causes
-@value{GDBN} to use the current @dfn{@sc{gdb/mi} interface}
-(@pxref{GDB/MI, , The @sc{gdb/mi} Interface}).  The previous @sc{gdb/mi}
-interface, included in @value{GDBN} version 5.3, can be selected with
-@samp{--interpreter=mi1}.  Earlier @sc{gdb/mi} interfaces
-are not supported.
+@value{GDBN} to use the @dfn{@sc{gdb/mi} interface} (@pxref{GDB/MI, ,
+The @sc{gdb/mi} Interface}) included in @var{GDBN} version 6.0.  The
+previous @sc{gdb/mi} interface, included in @value{GDBN} version 5.3,
+can be selected with @samp{--interpreter=mi1}.  Earlier @sc{gdb/mi}
+interfaces are not supported.
 
 @item -write
 @cindex @code{--write}

diff --git a/gdb/interps.h b/gdb/interps.h
index 74008d6c21a25e978a435cd81f6419a1efe5c538..d24cf6a46d77a3a4a68d0a33120bce69470edad9 100644 (file)
--- a/gdb/interps.h
+++ b/gdb/interps.h
@@ -68,6 +68,8 @@ extern void clear_interpreter_hooks (void);
 /* well-known interpreters */
 #define INTERP_CONSOLE         "console"
 #define INTERP_MI1             "mi1"
+#define INTERP_MI2             "mi2"
+#define INTERP_MI3             "mi3"
 #define INTERP_MI              "mi"
 
 #endif

diff --git a/gdb/mi/ChangeLog b/gdb/mi/ChangeLog
index 31fd26f0efde180bb77249df2ad740b8b7399cb8..47fe133c32cb2d402c311fa49935d1665aa01e8c 100644 (file)
--- a/gdb/mi/ChangeLog
+++ b/gdb/mi/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-07  Andrew Cagney  <cagney@redhat.com>
+
+       * mi-interp.c (_initialize_mi_interp): Register "mi2" and "mi3".
+       Make "mi" select "mi2".
+
 2003-07-02  Daniel Jacobowitz  <drow@mvista.com>
 
        * mi-out.c (mi_ui_out_impl): Add NULL for redirect member.

diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 696ae06e24c97775f51a1f020cf1e0416287457a..e00e32989e46335aeb6adb96d7df2b58365b613c 100644 (file)
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -407,8 +407,12 @@ _initialize_mi_interp (void)
     mi_interpreter_prompt_p    /* prompt_proc_p */
   };
 
-  /* Create MI1 interpreter */
+  /* The various interpreter levels.  */
   interp_add (interp_new (INTERP_MI1, NULL, mi_out_new (1), &procs));
+  interp_add (interp_new (INTERP_MI2, NULL, mi_out_new (2), &procs));
+  interp_add (interp_new (INTERP_MI3, NULL, mi_out_new (3), &procs));
 
-  interp_add (interp_new (INTERP_MI, NULL, mi_out_new (3), &procs));
+  /* "mi" selects the most recent released version.  "mi2" was
+     released as part of GDB 6.0.  */
+  interp_add (interp_new (INTERP_MI, NULL, mi_out_new (2), &procs));
 }

diff --git a/gdb/testsuite/gdb.mi/ChangeLog b/gdb/testsuite/gdb.mi/ChangeLog
index e4aec350f683ab51550620e15b6cc108153d3e0b..6f263c33056934ee69252daba52dbd60adb5539f 100644 (file)
--- a/gdb/testsuite/gdb.mi/ChangeLog
+++ b/gdb/testsuite/gdb.mi/ChangeLog
@@ -1,3 +1,14 @@
+2003-08-07  Andrew Cagney  <cagney@redhat.com>
+
+       * mi2-basics.exp: Copy base MI .exp file, set MIFLAGS to -i=mi2.
+       * mi2-break.exp, mi2-cli.exp, mi2-console.exp: Ditto.
+       * mi2-disassemble.exp, mi2-eval.exp, mi2-file.exp: Ditto.
+       * mi2-hack-cli.exp, mi2-pthreads.exp, mi2-read-memory.exp: Ditto.
+       * mi2-regs.exp, mi2-return.exp, mi2-simplerun.exp: Ditto.
+       * mi2-stack.exp, mi2-stepi.exp, mi2-syn-frame.exp: Ditto.
+       * mi2-until.exp, mi2-var-block.exp, mi2-var-child.exp: Ditto.
+       * mi2-var-cmd.exp, mi2-var-display.exp, mi2-watch.exp: Ditto.
+
 2003-05-03  J. Brobecker  <brobecker@gnat.com>
 
        From Thierry Schneider  <tpschneider1@yahoo.com>: