Re: Patch: XStormy16 -vs- Dwarf-2 minimum instruction size

[Tom Tromey <tromey at redhat dot com>]

Jason> We have to emit *something* there.  Are you (rth) suggesting we
Jason> just use 1?

rth> Yes.

How's this?

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>

	* config/fr30/fr30.h (DWARF_LINE_MIN_INSTR_LENGTH): Removed.
	* config/sh/sh.h (DWARF_LINE_MIN_INSTR_LENGTH): Removed.
	* config/pj/pj.h (DWARF_LINE_MIN_INSTR_LENGTH): Removed.
	* config/cris/cris.h (DWARF_LINE_MIN_INSTR_LENGTH): Removed.
	* dwarf2out.c (DWARF_LINE_MIN_INSTR_LENGTH): Define
	unconditionally.

Index: dwarf2out.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/dwarf2out.c,v
retrieving revision 1.353
diff -u -r1.353 dwarf2out.c
--- dwarf2out.c 2002/01/30 00:19:23 1.353
+++ dwarf2out.c 2002/02/20 17:00:26
@@ -3270,10 +3270,10 @@
    purposes only.  Since GCC generates assembly language, we have
    no a priori knowledge of how many instruction bytes are generated
    for each source line, and therefore can use only the  DW_LNE_set_address
-   and DW_LNS_fixed_advance_pc line information commands.  */
-#ifndef DWARF_LINE_MIN_INSTR_LENGTH
-#define DWARF_LINE_MIN_INSTR_LENGTH 4
-#endif
+   and DW_LNS_fixed_advance_pc line information commands.
+   Accordingly, we define this as `1', which is "correct enough" for
+   all architectures, and don't let the target override.  */
+#define DWARF_LINE_MIN_INSTR_LENGTH 1
 
 /* Minimum line offset in a special line info. opcode.
    This value was chosen to give a reasonable range of values.  */
Index: config/cris/cris.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/cris/cris.h,v
retrieving revision 1.24
diff -u -r1.24 cris.h
--- config/cris/cris.h 2002/02/17 18:14:50 1.24
+++ config/cris/cris.h 2002/02/20 17:00:30
@@ -1748,9 +1748,7 @@
 
 
 /* Node: SDB and DWARF */
-
-#define DWARF_LINE_MIN_INSTR_LENGTH 2
-
+/* (no definitions) */
 
 /* Node: Cross-compilation */
 #define REAL_ARITHMETIC
Index: config/fr30/fr30.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/fr30/fr30.h,v
retrieving revision 1.27
diff -u -r1.27 fr30.h
--- config/fr30/fr30.h 2002/01/21 06:22:11 1.27
+++ config/fr30/fr30.h 2002/02/20 17:00:32
@@ -1356,16 +1356,6 @@
   fprintf ((STREAM), "\t.p2align %d\n", (POWER))
 
 /*}}}*/ 
-/*{{{  Macros for SDB and Dwarf Output.  */ 
-
-/* Define this macro to allow references to structure, union, or enumeration
-   tags that have not yet been seen to be handled.  Some assemblers choke if
-   forward tags are used, while some require it.  */
-/* #define SDB_ALLOW_FORWARD_REFERENCES */
-
-#define DWARF_LINE_MIN_INSTR_LENGTH 2
-     
-/*}}}*/ 
 /*{{{  Miscellaneous Parameters.  */ 
 
 /* An alias for a machine mode name.  This is the machine mode that elements of
Index: config/pj/pj.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/pj/pj.h,v
retrieving revision 1.18
diff -u -r1.18 pj.h
--- config/pj/pj.h 2002/01/16 02:37:33 1.18
+++ config/pj/pj.h 2002/02/20 17:00:34
@@ -1252,7 +1252,6 @@
 #undef  PREFERRED_DEBUGGING_TYPE 
 #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
 #define DWARF2_UNWIND_INFO 1
-#define DWARF_LINE_MIN_INSTR_LENGTH 1
 
 
 /* varargs and stdarg builtins.  */
Index: config/sh/sh.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/sh/sh.h,v
retrieving revision 1.131
diff -u -r1.131 sh.h
--- config/sh/sh.h 2002/02/11 08:37:07 1.131
+++ config/sh/sh.h 2002/02/20 17:00:37
@@ -3288,8 +3288,6 @@
 #define MD_CAN_REDIRECT_BRANCH(INSN, SEQ) \
   sh_can_redirect_branch ((INSN), (SEQ))
 
-#define DWARF_LINE_MIN_INSTR_LENGTH 2
-
 #if (defined CRT_BEGIN || defined CRT_END) && ! __SHMEDIA__
 /* SH constant pool breaks the devices in crtstuff.c to control section
    in where code resides.  We have to write it as asm code.  */