[RFA] Multi-arch DECR_PC_AFTER_HW_BREAKPOINT

[RFA] Multi-arch DECR_PC_AFTER_HW_BREAKPOINT

[David S. Miller]

It's cousin, DECR_PC_AFTER_BREAKPOINT, was already multi-arched
and judging by its' usage I see no reason why it wasn't multi-arched
already.

Ok to install?

2002-04-22  David S. Miller  <davem@redhat.com>

	* target.h (DECR_PC_AFTER_HW_BREAK): Delete definition.
	* gdbarch.sh: Add DECR_PC_AFTER_HW_BREAK.
	* gdbarch.c, gdbarch.h: Regenerate.
	
--- ./gdbarch.c.~1~	Mon Apr 22 02:12:35 2002
+++ ./gdbarch.c	Mon Apr 22 02:34:39 2002
@@ -225,6 +225,7 @@ struct gdbarch
   gdbarch_memory_insert_breakpoint_ftype *memory_insert_breakpoint;
   gdbarch_memory_remove_breakpoint_ftype *memory_remove_breakpoint;
   CORE_ADDR decr_pc_after_break;
+  CORE_ADDR decr_pc_after_break;
   gdbarch_prepare_to_proceed_ftype *prepare_to_proceed;
   CORE_ADDR function_start_offset;
   gdbarch_remote_translate_xfer_address_ftype *remote_translate_xfer_address;
@@ -399,6 +400,7 @@ struct gdbarch startup_gdbarch =
   0,
   0,
   0,
+  0,
   generic_in_function_epilogue_p,
   construct_inferior_arguments,
   0,
@@ -506,6 +508,7 @@ gdbarch_alloc (const struct gdbarch_info
   current_gdbarch->memory_insert_breakpoint = default_memory_insert_breakpoint;
   current_gdbarch->memory_remove_breakpoint = default_memory_remove_breakpoint;
   current_gdbarch->decr_pc_after_break = -1;
+  current_gdbarch->decr_pc_after_break = -1;
   current_gdbarch->prepare_to_proceed = default_prepare_to_proceed;
   current_gdbarch->function_start_offset = -1;
   current_gdbarch->remote_translate_xfer_address = generic_remote_translate_xfer_address;
@@ -722,6 +725,9 @@ verify_gdbarch (struct gdbarch *gdbarch)
   if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
       && (gdbarch->decr_pc_after_break == -1))
     fprintf_unfiltered (log, "\n\tdecr_pc_after_break");
+  if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
+      && (gdbarch->decr_pc_after_break == -1))
+    fprintf_unfiltered (log, "\n\tdecr_pc_after_break");
   /* Skip verify of prepare_to_proceed, invalid_p == 0 */
   if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
       && (gdbarch->function_start_offset == -1))
@@ -1024,6 +1030,14 @@ gdbarch_dump (struct gdbarch *gdbarch, s
                       "gdbarch_dump: DECR_PC_AFTER_BREAK = %ld\n",
                       (long) DECR_PC_AFTER_BREAK);
 #endif
+#ifdef DECR_PC_AFTER_HW_BREAK
+  fprintf_unfiltered (file,
+                      "gdbarch_dump: DECR_PC_AFTER_HW_BREAK # %s\n",
+                      XSTRING (DECR_PC_AFTER_HW_BREAK));
+  fprintf_unfiltered (file,
+                      "gdbarch_dump: DECR_PC_AFTER_HW_BREAK = %ld\n",
+                      (long) DECR_PC_AFTER_HW_BREAK);
+#endif
 #ifdef DO_REGISTERS_INFO
 #if GDB_MULTI_ARCH
   /* Macro might contain `[{}]' when not multi-arch */
@@ -3918,6 +3932,24 @@ set_gdbarch_memory_remove_breakpoint (st
                                       gdbarch_memory_remove_breakpoint_ftype memory_remove_breakpoint)
 {
   gdbarch->memory_remove_breakpoint = memory_remove_breakpoint;
+}
+
+CORE_ADDR
+gdbarch_decr_pc_after_break (struct gdbarch *gdbarch)
+{
+  if (gdbarch->decr_pc_after_break == -1)
+    internal_error (__FILE__, __LINE__,
+                    "gdbarch: gdbarch_decr_pc_after_break invalid");
+  if (gdbarch_debug >= 2)
+    fprintf_unfiltered (gdb_stdlog, "gdbarch_decr_pc_after_break called\n");
+  return gdbarch->decr_pc_after_break;
+}
+
+void
+set_gdbarch_decr_pc_after_break (struct gdbarch *gdbarch,
+                                 CORE_ADDR decr_pc_after_break)
+{
+  gdbarch->decr_pc_after_break = decr_pc_after_break;
 }
 
 CORE_ADDR
--- ./target.h.~1~	Thu Apr 18 11:09:06 2002
+++ ./target.h	Mon Apr 22 02:32:14 2002
@@ -1091,13 +1091,6 @@ extern void (*target_new_objfile_hook) (
 #define target_stopped_data_address() 0
 #endif
 
-/* If defined, then we need to decr pc by this much after a hardware break-
-   point.  Presumably this overrides DECR_PC_AFTER_BREAK...  */
-
-#ifndef DECR_PC_AFTER_HW_BREAK
-#define DECR_PC_AFTER_HW_BREAK 0
-#endif
-
 /* Sometimes gdb may pick up what appears to be a valid target address
    from a minimal symbol, but the value really means, essentially,
    "This is an index into a table which is populated when the inferior
--- ./gdbarch.h.~1~	Mon Apr 22 02:11:55 2002
+++ ./gdbarch.h	Mon Apr 22 02:33:58 2002
@@ -1762,6 +1762,17 @@ extern void set_gdbarch_decr_pc_after_br
 #endif
 #endif
 
+extern CORE_ADDR gdbarch_decr_pc_after_break (struct gdbarch *gdbarch);
+extern void set_gdbarch_decr_pc_after_break (struct gdbarch *gdbarch, CORE_ADDR decr_pc_after_break);
+#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DECR_PC_AFTER_HW_BREAK)
+#error "Non multi-arch definition of DECR_PC_AFTER_HW_BREAK"
+#endif
+#if GDB_MULTI_ARCH
+#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (DECR_PC_AFTER_HW_BREAK)
+#define DECR_PC_AFTER_HW_BREAK (gdbarch_decr_pc_after_break (current_gdbarch))
+#endif
+#endif
+
 /* Default (function) for non- multi-arch platforms. */
 #if (!GDB_MULTI_ARCH) && !defined (PREPARE_TO_PROCEED)
 #define PREPARE_TO_PROCEED(select_it) (default_prepare_to_proceed (select_it))
--- ./gdbarch.sh.~1~	Mon Apr 22 02:11:27 2002
+++ ./gdbarch.sh	Mon Apr 22 02:32:01 2002
@@ -552,6 +552,7 @@ f:2:BREAKPOINT_FROM_PC:const unsigned ch
 f:2:MEMORY_INSERT_BREAKPOINT:int:memory_insert_breakpoint:CORE_ADDR addr, char *contents_cache:addr, contents_cache::0:default_memory_insert_breakpoint::0
 f:2:MEMORY_REMOVE_BREAKPOINT:int:memory_remove_breakpoint:CORE_ADDR addr, char *contents_cache:addr, contents_cache::0:default_memory_remove_breakpoint::0
 v:2:DECR_PC_AFTER_BREAK:CORE_ADDR:decr_pc_after_break::::0:-1
+v:2:DECR_PC_AFTER_HW_BREAK:CORE_ADDR:decr_pc_after_break::::0:-1
 f::PREPARE_TO_PROCEED:int:prepare_to_proceed:int select_it:select_it::0:default_prepare_to_proceed::0
 v:2:FUNCTION_START_OFFSET:CORE_ADDR:function_start_offset::::0:-1
 #

Re: [RFA] Multi-arch DECR_PC_AFTER_HW_BREAKPOINT

[David S. Miller]

   From: "David S. Miller" <davem@redhat.com>
   Date: Mon, 22 Apr 2002 02:31:27 -0700 (PDT)
   
   2002-04-22  David S. Miller  <davem@redhat.com>
   
   	* target.h (DECR_PC_AFTER_HW_BREAK): Delete definition.
   	* gdbarch.sh: Add DECR_PC_AFTER_HW_BREAK.
   	* gdbarch.c, gdbarch.h: Regenerate.
   	
There was a typo that patch, this copy is OK.

2002-04-22  David S. Miller  <davem@redhat.com>

	* target.h (DECR_PC_AFTER_HW_BREAK): Delete definition.
	* gdbarch.sh: Add DECR_PC_AFTER_HW_BREAK.
	* gdbarch.c, gdbarch.h: Regenerate.
	
--- ./gdbarch.c.~1~	Mon Apr 22 02:12:35 2002
+++ ./gdbarch.c	Mon Apr 22 02:40:41 2002
@@ -225,6 +225,7 @@ struct gdbarch
   gdbarch_memory_insert_breakpoint_ftype *memory_insert_breakpoint;
   gdbarch_memory_remove_breakpoint_ftype *memory_remove_breakpoint;
   CORE_ADDR decr_pc_after_break;
+  CORE_ADDR decr_pc_after_hw_break;
   gdbarch_prepare_to_proceed_ftype *prepare_to_proceed;
   CORE_ADDR function_start_offset;
   gdbarch_remote_translate_xfer_address_ftype *remote_translate_xfer_address;
@@ -399,6 +400,7 @@ struct gdbarch startup_gdbarch =
   0,
   0,
   0,
+  0,
   generic_in_function_epilogue_p,
   construct_inferior_arguments,
   0,
@@ -506,6 +508,7 @@ gdbarch_alloc (const struct gdbarch_info
   current_gdbarch->memory_insert_breakpoint = default_memory_insert_breakpoint;
   current_gdbarch->memory_remove_breakpoint = default_memory_remove_breakpoint;
   current_gdbarch->decr_pc_after_break = -1;
+  current_gdbarch->decr_pc_after_hw_break = -1;
   current_gdbarch->prepare_to_proceed = default_prepare_to_proceed;
   current_gdbarch->function_start_offset = -1;
   current_gdbarch->remote_translate_xfer_address = generic_remote_translate_xfer_address;
@@ -722,6 +725,9 @@ verify_gdbarch (struct gdbarch *gdbarch)
   if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
       && (gdbarch->decr_pc_after_break == -1))
     fprintf_unfiltered (log, "\n\tdecr_pc_after_break");
+  if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
+      && (gdbarch->decr_pc_after_hw_break == -1))
+    fprintf_unfiltered (log, "\n\tdecr_pc_after_hw_break");
   /* Skip verify of prepare_to_proceed, invalid_p == 0 */
   if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
       && (gdbarch->function_start_offset == -1))
@@ -1024,6 +1030,14 @@ gdbarch_dump (struct gdbarch *gdbarch, s
                       "gdbarch_dump: DECR_PC_AFTER_BREAK = %ld\n",
                       (long) DECR_PC_AFTER_BREAK);
 #endif
+#ifdef DECR_PC_AFTER_HW_BREAK
+  fprintf_unfiltered (file,
+                      "gdbarch_dump: DECR_PC_AFTER_HW_BREAK # %s\n",
+                      XSTRING (DECR_PC_AFTER_HW_BREAK));
+  fprintf_unfiltered (file,
+                      "gdbarch_dump: DECR_PC_AFTER_HW_BREAK = %ld\n",
+                      (long) DECR_PC_AFTER_HW_BREAK);
+#endif
 #ifdef DO_REGISTERS_INFO
 #if GDB_MULTI_ARCH
   /* Macro might contain `[{}]' when not multi-arch */
@@ -3936,6 +3950,24 @@ set_gdbarch_decr_pc_after_break (struct 
                                  CORE_ADDR decr_pc_after_break)
 {
   gdbarch->decr_pc_after_break = decr_pc_after_break;
+}
+
+CORE_ADDR
+gdbarch_decr_pc_after_hw_break (struct gdbarch *gdbarch)
+{
+  if (gdbarch->decr_pc_after_hw_break == -1)
+    internal_error (__FILE__, __LINE__,
+                    "gdbarch: gdbarch_decr_pc_after_hw_break invalid");
+  if (gdbarch_debug >= 2)
+    fprintf_unfiltered (gdb_stdlog, "gdbarch_decr_pc_after_hw_break called\n");
+  return gdbarch->decr_pc_after_hw_break;
+}
+
+void
+set_gdbarch_decr_pc_after_hw_break (struct gdbarch *gdbarch,
+                                    CORE_ADDR decr_pc_after_hw_break)
+{
+  gdbarch->decr_pc_after_hw_break = decr_pc_after_hw_break;
 }
 
 int
--- ./target.h.~1~	Thu Apr 18 11:09:06 2002
+++ ./target.h	Mon Apr 22 02:32:14 2002
@@ -1091,13 +1091,6 @@ extern void (*target_new_objfile_hook) (
 #define target_stopped_data_address() 0
 #endif
 
-/* If defined, then we need to decr pc by this much after a hardware break-
-   point.  Presumably this overrides DECR_PC_AFTER_BREAK...  */
-
-#ifndef DECR_PC_AFTER_HW_BREAK
-#define DECR_PC_AFTER_HW_BREAK 0
-#endif
-
 /* Sometimes gdb may pick up what appears to be a valid target address
    from a minimal symbol, but the value really means, essentially,
    "This is an index into a table which is populated when the inferior
--- ./gdbarch.h.~1~	Mon Apr 22 02:11:55 2002
+++ ./gdbarch.h	Mon Apr 22 02:40:00 2002
@@ -1762,6 +1762,17 @@ extern void set_gdbarch_decr_pc_after_br
 #endif
 #endif
 
+extern CORE_ADDR gdbarch_decr_pc_after_hw_break (struct gdbarch *gdbarch);
+extern void set_gdbarch_decr_pc_after_hw_break (struct gdbarch *gdbarch, CORE_ADDR decr_pc_after_hw_break);
+#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DECR_PC_AFTER_HW_BREAK)
+#error "Non multi-arch definition of DECR_PC_AFTER_HW_BREAK"
+#endif
+#if GDB_MULTI_ARCH
+#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (DECR_PC_AFTER_HW_BREAK)
+#define DECR_PC_AFTER_HW_BREAK (gdbarch_decr_pc_after_hw_break (current_gdbarch))
+#endif
+#endif
+
 /* Default (function) for non- multi-arch platforms. */
 #if (!GDB_MULTI_ARCH) && !defined (PREPARE_TO_PROCEED)
 #define PREPARE_TO_PROCEED(select_it) (default_prepare_to_proceed (select_it))
--- ./gdbarch.sh.~1~	Mon Apr 22 02:11:27 2002
+++ ./gdbarch.sh	Mon Apr 22 02:39:35 2002
@@ -552,6 +552,7 @@ f:2:BREAKPOINT_FROM_PC:const unsigned ch
 f:2:MEMORY_INSERT_BREAKPOINT:int:memory_insert_breakpoint:CORE_ADDR addr, char *contents_cache:addr, contents_cache::0:default_memory_insert_breakpoint::0
 f:2:MEMORY_REMOVE_BREAKPOINT:int:memory_remove_breakpoint:CORE_ADDR addr, char *contents_cache:addr, contents_cache::0:default_memory_remove_breakpoint::0
 v:2:DECR_PC_AFTER_BREAK:CORE_ADDR:decr_pc_after_break::::0:-1
+v:2:DECR_PC_AFTER_HW_BREAK:CORE_ADDR:decr_pc_after_hw_break::::0:-1
 f::PREPARE_TO_PROCEED:int:prepare_to_proceed:int select_it:select_it::0:default_prepare_to_proceed::0
 v:2:FUNCTION_START_OFFSET:CORE_ADDR:function_start_offset::::0:-1
 #

Re: [RFA] Multi-arch DECR_PC_AFTER_HW_BREAKPOINT

[Momchil Velikov]

>>>>> "David" == David S Miller <davem@redhat.com> writes:

David> +++ ./gdbarch.c	Mon Apr 22 02:34:39 2002
David> @@ -225,6 +225,7 @@ struct gdbarch
David>    gdbarch_memory_insert_breakpoint_ftype *memory_insert_breakpoint;
David>    gdbarch_memory_remove_breakpoint_ftype *memory_remove_breakpoint;
David>    CORE_ADDR decr_pc_after_break;
David> +  CORE_ADDR decr_pc_after_break;

Hmm, maybe it should be ``decr_pc_after_hw_break'' or something ?  And
in the other places too.

Re: [RFA] Multi-arch DECR_PC_AFTER_HW_BREAKPOINT

[David S. Miller]

   From: Momchil Velikov <velco@fadata.bg>
   Date: 22 Apr 2002 12:42:55 +0300
   
   Hmm, maybe it should be ``decr_pc_after_hw_break'' or something ?  And
   in the other places too.
   
See my followup posting, it fixed that typo.

Re: [RFA] Multi-arch DECR_PC_AFTER_HW_BREAKPOINT

[Jason R Thorpe]

On Mon, Apr 22, 2002 at 02:31:27AM -0700, David S. Miller wrote:

 >    CORE_ADDR decr_pc_after_break;
 > +  CORE_ADDR decr_pc_after_break;

You must have typo'd gdbarch.sh... note the missing "hw_"

-- 
        -- Jason R. Thorpe <thorpej@wasabisystems.com>

Re: [RFA] Multi-arch DECR_PC_AFTER_HW_BREAKPOINT

[David S. Miller]

   From: Jason R Thorpe <thorpej@wasabisystems.com>
   Date: Mon, 22 Apr 2002 08:44:42 -0700

   On Mon, Apr 22, 2002 at 02:31:27AM -0700, David S. Miller wrote:
   
    >    CORE_ADDR decr_pc_after_break;
    > +  CORE_ADDR decr_pc_after_break;
   
   You must have typo'd gdbarch.sh... note the missing "hw_"
   
Note my follow up posting that I made 5 minutes after the one you are
quoting which fixes this :-)

Re: [RFA] Multi-arch DECR_PC_AFTER_HW_BREAKPOINT

[Andrew Cagney]

Hmm,

+  if ((GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL)
+      && (gdbarch->decr_pc_after_hw_break == -1))
+    fprintf_unfiltered (log, "\n\tdecr_pc_after_hw_break");

-#ifndef DECR_PC_AFTER_HW_BREAK
-#define DECR_PC_AFTER_HW_BREAK 0
-#endif

+extern CORE_ADDR gdbarch_decr_pc_after_hw_break (struct gdbarch *gdbarch);
+extern void set_gdbarch_decr_pc_after_hw_break (struct gdbarch 
*gdbarch, CORE_A
DDR decr_pc_after_hw_break);
+#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined 
(DECR_PC_AFTER_HW_BREA
K)
+#error "Non multi-arch definition of DECR_PC_AFTER_HW_BREAK"
+#endif
+#if GDB_MULTI_ARCH
+#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined 
(DECR_PC_AFTER_HW_BRE
AK)
+#define DECR_PC_AFTER_HW_BREAK (gdbarch_decr_pc_after_hw_break 
(current_gdbarch
))
+#endif
+#endif
+

Keep in mind that a multi-arch conversion should, in no way, alter GDB's 
behavour.  GDB shall continue to build and/or run on any of the targets 
listed in the MAINTAINER file.

I suspect for the above, you want something like TARGET_SHORT_BIT.  As 
things are:

v850-elf (and other non-multi-arch targets) don't build:
/home/scratch/GDB/src/gdb/breakpoint.c:2467: `DECR_PC_AFTER_HW_BREAK' 
undeclared (first use in this function)
/home/scratch/GDB/src/gdb/breakpoint.c:2467: (Each undeclared identifier 
is reported only once
/home/scratch/GDB/src/gdb/breakpoint.c:2467: for each function it 
appears in.)

cris-elf and other multi-arch targets panic:
(gdb) maint print architecture
..../home/scratch/GDB/src/gdb/gdbarch.c:3948: gdb-internal-error: 
gdbarch: gdbarch_decr_pc_after_hw_break invalid
An internal GDB error was detected.  This may make further
debugging unreliable.  Quit this debugging session? (y or n)

Can you please ensure that all the targets listed in the MAINTAINERS 
file still build and pass a smoke-test.

> The GAWK segment:
> 
>   awk < "${maintainers}" '
>   $2 ~ /--target=.*/ {
>     targets = gensub (/^.*--target=/, "", 1, $2)
>     warnings = gensub (/[)]*$/, "", 1, $3)
>     split (targets, targ, /,/)
>     for (i in targ) {
> 	print targ[i], warnings
>     }
>   }'
> 
> can be used to generate a full list of --target=
> --enable-gdb-build-warnings= pairs.

(Richard Earnshaw posted a pretty neat shell script to help with this).

The other part, you've figured out (thanks!), is that the changes need 
to be small.  This is so that when (not if) a change breaks a target, 
the developers can very quickly drill down to the specific change that 
caused problems.

enjoy,
Andrew

Re: [RFA] Multi-arch DECR_PC_AFTER_HW_BREAKPOINT

[David S. Miller]

   From: Andrew Cagney <ac131313@cygnus.com>
   Date: Wed, 24 Apr 2002 22:07:39 -0400

   Can you please ensure that all the targets listed in the MAINTAINERS 
   file still build and pass a smoke-test.

Ok, I'll fix this up.