From c1a046e50ee5d3fe4b789ed2ad51c60db6687788 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 21 Feb 2002 23:03:14 +0000 Subject: [PATCH] dwarf2out.c (DWARF_LINE_MIN_INSTR_LENGTH): Removed. * dwarf2out.c (DWARF_LINE_MIN_INSTR_LENGTH): Removed. (output_line_info): Use constant `1', with a long explanatory comment. * system.h (DWARF_LINE_MIN_INSTR_LENGTH): Poison. From-SVN: r49944 --- gcc/ChangeLog | 7 +++++++ gcc/dwarf2out.c | 21 ++++++++++----------- gcc/system.h | 2 +- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 647eb31b556..c7878d70e65 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2002-02-21 Tom Tromey + + * dwarf2out.c (DWARF_LINE_MIN_INSTR_LENGTH): Removed. + (output_line_info): Use constant `1', with a long explanatory + comment. + * system.h (DWARF_LINE_MIN_INSTR_LENGTH): Poison. + Thu Feb 21 22:43:44 2002 J"orn Rennecke * jump.c (redirect_jump): If old label has no UID, don't try to diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index f51df45d77b..8d7d48b39bb 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -3265,16 +3265,6 @@ extern int flag_traditional; #endif #endif -/* Define the architecture-dependent minimum instruction length (in bytes). - In this implementation of DWARF, this field is used for information - 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. - 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. */ #define DWARF_LINE_BASE -10 @@ -7031,8 +7021,17 @@ output_line_info () dw2_asm_output_delta (DWARF_OFFSET_SIZE, p2, p1, "Prolog Length"); ASM_OUTPUT_LABEL (asm_out_file, p1); - dw2_asm_output_data (1, DWARF_LINE_MIN_INSTR_LENGTH, + /* Define the architecture-dependent minimum instruction length (in + bytes). In this implementation of DWARF, this field is used for + information 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. Accordingly, we fix this as `1', which is "correct + enough" for all architectures, and don't let the target override. */ + dw2_asm_output_data (1, 1, "Minimum Instruction Length"); + dw2_asm_output_data (1, DWARF_LINE_DEFAULT_IS_STMT_START, "Default is_stmt_start flag"); dw2_asm_output_data (1, DWARF_LINE_BASE, diff --git a/gcc/system.h b/gcc/system.h index 25e9549a006..0577708bff4 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -605,7 +605,7 @@ typedef char _Bool; OMIT_EH_TABLE EASY_DIV_EXPR IMPLICIT_FIX_EXPR \ LONGJMP_RESTORE_FROM_STACK MAX_INT_TYPE_SIZE ASM_IDENTIFY_GCC \ STDC_VALUE TRAMPOLINE_ALIGN ASM_IDENTIFY_GCC_AFTER_SOURCE \ - SLOW_ZERO_EXTEND SUBREG_REGNO_OFFSET + SLOW_ZERO_EXTEND SUBREG_REGNO_OFFSET DWARF_LINE_MIN_INSTR_LENGTH #endif /* IN_GCC */