projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fallout from "Allow symbol and label names to be enclosed in double quotes"
[deliverable/binutils-gdb.git]
/
gas
/
stabs.c
diff --git
a/gas/stabs.c
b/gas/stabs.c
index 33b14c149d37af6b317573b236f8d5f10367702e..9e055c4c1c6776ed7e4b2cd08df757ba1d15dc0e 100644
(file)
--- a/
gas/stabs.c
+++ b/
gas/stabs.c
@@
-1,25
+1,25
@@
/* Generic stabs parsing for gas.
/* Generic stabs parsing for gas.
- Copyright 1989, 1990, 1991, 1993, 1995, 1996, 1997, 1998, 2000, 2001
- Free Software Foundation, Inc.
+ Copyright (C) 1989-2015 Free Software Foundation, Inc.
-This file is part of GAS, the GNU Assembler.
+
This file is part of GAS, the GNU Assembler.
-GAS 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 2
,
-or (at your option) any later version.
+
GAS 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
,
+
or (at your option) any later version.
-GAS 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.
+
GAS 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 GAS; see the file COPYING. If not, write to the Free
-
Software Foundation, 59 Temple Place - Suite 330
, Boston, MA
-
02111-1307
, USA. */
+
You should have received a copy of the GNU General Public License
+
along with GAS; see the file COPYING. If not, write to the Free
+
Software Foundation, 51 Franklin Street - Fifth Floor
, Boston, MA
+
02110-1301
, USA. */
#include "as.h"
#include "as.h"
+#include "filenames.h"
#include "obstack.h"
#include "subsegs.h"
#include "ecoff.h"
#include "obstack.h"
#include "subsegs.h"
#include "ecoff.h"
@@
-34,8
+34,8
@@
Software Foundation, 59 Temple Place - Suite 330, Boston, MA
int outputting_stabs_line_debug = 0;
int outputting_stabs_line_debug = 0;
-static void s_stab_generic
PARAMS ((int, char *, char *)
);
-static void generate_asm_file
PARAMS ((int, char *)
);
+static void s_stab_generic
(int, char *, char *
);
+static void generate_asm_file
(int, char *
);
/* Allow backends to override the names used for the stab sections. */
#ifndef STAB_SECTION_NAME
/* Allow backends to override the names used for the stab sections. */
#ifndef STAB_SECTION_NAME
@@
-80,9
+80,7
@@
static const char *current_function_label;
#endif
unsigned int
#endif
unsigned int
-get_stab_string_offset (string, stabstr_secname)
- const char *string;
- const char *stabstr_secname;
+get_stab_string_offset (const char *string, const char *stabstr_secname)
{
unsigned int length;
unsigned int retval;
{
unsigned int length;
unsigned int retval;
@@
-109,11
+107,9
@@
get_stab_string_offset (string, stabstr_secname)
p = frag_more (1);
*p = 0;
retval = seg_info (seg)->stabu.stab_string_size = 1;
p = frag_more (1);
*p = 0;
retval = seg_info (seg)->stabu.stab_string_size = 1;
-#ifdef BFD_ASSEMBLER
bfd_set_section_flags (stdoutput, seg, SEC_READONLY | SEC_DEBUGGING);
if (seg->name == stabstr_secname)
seg->name = xstrdup (stabstr_secname);
bfd_set_section_flags (stdoutput, seg, SEC_READONLY | SEC_DEBUGGING);
if (seg->name == stabstr_secname)
seg->name = xstrdup (stabstr_secname);
-#endif
}
if (length > 0)
}
if (length > 0)
@@
-152,11
+148,10
@@
aout_process_stab (what, string, type, other, desc)
ends in "\" and the debug info is continued in the next .stabs
directive) from being separated by other random symbols. */
symbol = symbol_create (string, undefined_section, 0,
ends in "\" and the debug info is continued in the next .stabs
directive) from being separated by other random symbols. */
symbol = symbol_create (string, undefined_section, 0,
-
(struct frag *) NULL
);
+
&zero_address_frag
);
if (what == 's' || what == 'n')
{
/* Pick up the value from the input line. */
if (what == 's' || what == 'n')
{
/* Pick up the value from the input line. */
- symbol_set_frag (symbol, &zero_address_frag);
pseudo_set (symbol);
}
else
pseudo_set (symbol);
}
else
@@
-169,6
+164,8
@@
aout_process_stab (what, string, type, other, desc)
symbol_append (symbol, symbol_lastP, &symbol_rootP, &symbol_lastP);
symbol_append (symbol, symbol_lastP, &symbol_rootP, &symbol_lastP);
+ symbol_get_bfdsym (symbol)->flags |= BSF_DEBUGGING;
+
S_SET_TYPE (symbol, type);
S_SET_OTHER (symbol, other);
S_SET_DESC (symbol, desc);
S_SET_TYPE (symbol, type);
S_SET_OTHER (symbol, other);
S_SET_DESC (symbol, desc);
@@
-179,10
+176,7
@@
aout_process_stab (what, string, type, other, desc)
kinds of stab sections. */
static void
kinds of stab sections. */
static void
-s_stab_generic (what, stab_secname, stabstr_secname)
- int what;
- char *stab_secname;
- char *stabstr_secname;
+s_stab_generic (int what, char *stab_secname, char *stabstr_secname)
{
long longint;
char *string, *saved_string_obstack_end;
{
long longint;
char *string, *saved_string_obstack_end;
@@
-337,10
+331,8
@@
s_stab_generic (what, stab_secname, stabstr_secname)
if (! seg_info (seg)->hadone)
{
if (! seg_info (seg)->hadone)
{
-#ifdef BFD_ASSEMBLER
bfd_set_section_flags (stdoutput, seg,
SEC_READONLY | SEC_RELOC | SEC_DEBUGGING);
bfd_set_section_flags (stdoutput, seg,
SEC_READONLY | SEC_RELOC | SEC_DEBUGGING);
-#endif
#ifdef INIT_STAB_SECTION
INIT_STAB_SECTION (seg);
#endif
#ifdef INIT_STAB_SECTION
INIT_STAB_SECTION (seg);
#endif
@@
-405,8
+397,7
@@
s_stab_generic (what, stab_secname, stabstr_secname)
/* Regular stab directive. */
void
/* Regular stab directive. */
void
-s_stab (what)
- int what;
+s_stab (int what)
{
s_stab_generic (what, STAB_SECTION_NAME, STAB_STRING_SECTION_NAME);
}
{
s_stab_generic (what, STAB_SECTION_NAME, STAB_STRING_SECTION_NAME);
}
@@
-414,8
+405,7
@@
s_stab (what)
/* "Extended stabs", used in Solaris only now. */
void
/* "Extended stabs", used in Solaris only now. */
void
-s_xstab (what)
- int what;
+s_xstab (int what)
{
int length;
char *stab_secname, *stabstr_secname;
{
int length;
char *stab_secname, *stabstr_secname;
@@
-467,11
+457,10
@@
s_desc (ignore)
symbolS *symbolP;
int temp;
symbolS *symbolP;
int temp;
- name = input_line_pointer;
- c = get_symbol_end ();
+ c = get_symbol_name (&name);
p = input_line_pointer;
*p = c;
p = input_line_pointer;
*p = c;
- SKIP_WHITESPACE ();
+ SKIP_WHITESPACE
_AFTER_NAME
();
if (*input_line_pointer != ',')
{
*p = 0;
if (*input_line_pointer != ',')
{
*p = 0;
@@
-496,7
+485,7
@@
s_desc (ignore)
/* Generate stabs debugging information to denote the main source file. */
void
/* Generate stabs debugging information to denote the main source file. */
void
-stabs_generate_asm_file ()
+stabs_generate_asm_file (
void
)
{
char *file;
unsigned int lineno;
{
char *file;
unsigned int lineno;
@@
-504,12
+493,14
@@
stabs_generate_asm_file ()
as_where (&file, &lineno);
if (use_gnu_debug_info_extensions)
{
as_where (&file, &lineno);
if (use_gnu_debug_info_extensions)
{
- char *dir, *dir2;
+ const char *dir;
+ char *dir2;
- dir =
getpwd (
);
- dir2 = alloca (strlen (dir) + 2);
+ dir =
remap_debug_filename (getpwd ()
);
+ dir2 =
(char *)
alloca (strlen (dir) + 2);
sprintf (dir2, "%s%s", dir, "/");
generate_asm_file (N_SO, dir2);
sprintf (dir2, "%s%s", dir, "/");
generate_asm_file (N_SO, dir2);
+ xfree ((char *) dir);
}
generate_asm_file (N_SO, file);
}
}
generate_asm_file (N_SO, file);
}
@@
-518,9
+509,7
@@
stabs_generate_asm_file ()
TYPE is one of N_SO, N_SOL. */
static void
TYPE is one of N_SO, N_SOL. */
static void
-generate_asm_file (type, file)
- int type;
- char *file;
+generate_asm_file (int type, char *file)
{
static char *last_file;
static int label_count;
{
static char *last_file;
static int label_count;
@@
-528,11
+517,11
@@
generate_asm_file (type, file)
char sym[30];
char *buf;
char *tmp = file;
char sym[30];
char *buf;
char *tmp = file;
- char *endp = file + strlen (file);
- char *bufp
= buf
;
+ char *
file_
endp = file + strlen (file);
+ char *bufp;
if (last_file != NULL
if (last_file != NULL
- &&
str
cmp (last_file, file) == 0)
+ &&
filename_
cmp (last_file, file) == 0)
return;
/* Rather than try to do this in some efficient fashion, we just
return;
/* Rather than try to do this in some efficient fashion, we just
@@
-547,11
+536,11
@@
generate_asm_file (type, file)
/* Allocate enough space for the file name (possibly extended with
doubled up backslashes), the symbol name, and the other characters
that make up a stabs file directive. */
/* Allocate enough space for the file name (possibly extended with
doubled up backslashes), the symbol name, and the other characters
that make up a stabs file directive. */
- bufp = buf = xmalloc (2 * strlen (file) + strlen (sym) + 12);
+ bufp = buf =
(char *)
xmalloc (2 * strlen (file) + strlen (sym) + 12);
*bufp++ = '"';
*bufp++ = '"';
- while (tmp < endp)
+ while (tmp <
file_
endp)
{
char *bslash = strchr (tmp, '\\');
size_t len = (bslash) ? (size_t) (bslash - tmp + 1) : strlen (tmp);
{
char *bslash = strchr (tmp, '\\');
size_t len = (bslash) ? (size_t) (bslash - tmp + 1) : strlen (tmp);
@@
-587,7
+576,7
@@
generate_asm_file (type, file)
used to produce debugging information for an assembler file. */
void
used to produce debugging information for an assembler file. */
void
-stabs_generate_asm_lineno ()
+stabs_generate_asm_lineno (
void
)
{
static int label_count;
char *hold;
{
static int label_count;
char *hold;
@@
-616,7
+605,7
@@
stabs_generate_asm_lineno ()
prev_lineno = lineno;
}
else if (lineno == prev_lineno
prev_lineno = lineno;
}
else if (lineno == prev_lineno
- &&
str
cmp (file, prev_file) == 0)
+ &&
filename_
cmp (file, prev_file) == 0)
{
/* Same file/line as last time. */
return;
{
/* Same file/line as last time. */
return;
@@
-625,7
+614,7
@@
stabs_generate_asm_lineno ()
{
/* Remember file/line for next time. */
prev_lineno = lineno;
{
/* Remember file/line for next time. */
prev_lineno = lineno;
- if (
str
cmp (file, prev_file) != 0)
+ if (
filename_
cmp (file, prev_file) != 0)
{
free (prev_file);
prev_file = xstrdup (file);
{
free (prev_file);
prev_file = xstrdup (file);
@@
-664,9
+653,7
@@
stabs_generate_asm_lineno ()
All assembler functions are assumed to have return type `void'. */
void
All assembler functions are assumed to have return type `void'. */
void
-stabs_generate_asm_func (funcname, startlabname)
- const char *funcname;
- const char *startlabname;
+stabs_generate_asm_func (const char *funcname, const char *startlabname)
{
static int void_emitted_p;
char *hold = input_line_pointer;
{
static int void_emitted_p;
char *hold = input_line_pointer;
@@
-682,8
+669,9
@@
stabs_generate_asm_func (funcname, startlabname)
}
as_where (&file, &lineno);
}
as_where (&file, &lineno);
- asprintf (&buf, "\"%s:F1\",%d,0,%d,%s",
- funcname, N_FUN, lineno + 1, startlabname);
+ if (asprintf (&buf, "\"%s:F1\",%d,0,%d,%s",
+ funcname, N_FUN, lineno + 1, startlabname) == -1)
+ as_fatal ("%s", xstrerror (errno));
input_line_pointer = buf;
s_stab ('s');
free (buf);
input_line_pointer = buf;
s_stab ('s');
free (buf);
@@
-696,9
+684,8
@@
stabs_generate_asm_func (funcname, startlabname)
/* Emit a stab to record the end of a function. */
void
/* Emit a stab to record the end of a function. */
void
-stabs_generate_asm_endfunc (funcname, startlabname)
- const char *funcname ATTRIBUTE_UNUSED;
- const char *startlabname;
+stabs_generate_asm_endfunc (const char *funcname ATTRIBUTE_UNUSED,
+ const char *startlabname)
{
static int label_count;
char *hold = input_line_pointer;
{
static int label_count;
char *hold = input_line_pointer;
@@
-709,7
+696,8
@@
stabs_generate_asm_endfunc (funcname, startlabname)
++label_count;
colon (sym);
++label_count;
colon (sym);
- asprintf (&buf, "\"\",%d,0,0,%s-%s", N_FUN, sym, startlabname);
+ if (asprintf (&buf, "\"\",%d,0,0,%s-%s", N_FUN, sym, startlabname) == -1)
+ as_fatal ("%s", xstrerror (errno));
input_line_pointer = buf;
s_stab ('s');
free (buf);
input_line_pointer = buf;
s_stab ('s');
free (buf);
This page took
0.026814 seconds
and
4
git commands to generate.