Chiebot-Mirror
/
yasm
mirror of https://github.com/yasm/yasm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't shadow global (standard C) "index" (noticed by LCLint).

Browse Source 
svn path=/trunk/yasm/; revision=429
0.3
Peter Johnson 23 years ago
parent 5ad58cef6b
commit ddacb97e3e
10 changed files with 75 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      libyasm/errwarn.c
  2. 4
      libyasm/errwarn.h
  3. 31
      libyasm/linemgr.c
  4. 4
      libyasm/linemgr.h
  5. 8
      src/errwarn.c
  6. 4
      src/errwarn.h
  7. 31
      src/globals.c
  8. 4
      src/globals.h
  9. 31
      src/linemgr.c
  10. 4
      src/linemgr.h

8
libyasm/errwarn.c
Unescape View File

@ -239,14 +239,14 @@ WarningNow(const char *fmt, ...)
}
void
ErrorAt(unsigned long index, const char *fmt, ...)
ErrorAt(unsigned long lindex, const char *fmt, ...)
{
/* XXX: Should insert into list instead of printing immediately */
va_list ap;
const char *filename;
unsigned long line;
line_lookup(index, &filename, &line);
line_lookup(lindex, &filename, &line);
fprintf(stderr, "%s:%lu: ", filename?filename:"(NULL)", line);
va_start(ap, fmt);
vfprintf(stderr, fmt, ap);
@ -255,14 +255,14 @@ ErrorAt(unsigned long index, const char *fmt, ...)
}
void
WarningAt(unsigned long index, const char *fmt, ...)
WarningAt(unsigned long lindex, const char *fmt, ...)
{
/* XXX: Should insert into list instead of printing immediately */
va_list ap;
const char *filename;
unsigned long line;
line_lookup(index, &filename, &line);
line_lookup(lindex, &filename, &line);
fprintf(stderr, "%s:%lu: %s ", filename?filename:"NULL", line,
_("warning:"));
va_start(ap, fmt);

4
libyasm/errwarn.h
Unescape View File

@ -46,8 +46,8 @@ void Warning(const char *, ...) /*@printflike@*/;
* called in line order from a parser. The *At() functions are much slower,
* at least in the current implementation.
*/
void ErrorAt(unsigned long index, const char *, ...) /*@printflike@*/;
void WarningAt(unsigned long index, const char *, ...) /*@printflike@*/;
void ErrorAt(unsigned long lindex, const char *, ...) /*@printflike@*/;
void WarningAt(unsigned long lindex, const char *, ...) /*@printflike@*/;
/* These two functions immediately output the error or warning, with no file
* or line information. They should be used for errors and warnings outside

31
libyasm/linemgr.c
Unescape View File

@ -49,14 +49,14 @@ typedef struct line_index_mapping {
/* "original" source base line number */
unsigned long line;
/* "original" source line number increment (for following lines) */
unsigned int line_inc;
unsigned long line_inc;
} line_index_mapping;
/* Shared storage for filenames */
static /*@only@*/ /*@null@*/ HAMT *filename_table = NULL;
/* Virtual line number. Uniquely specifies every line read by the parser. */
unsigned long line_index = 1;
static line_index_mapping_head *line_index_map = NULL;
static /*@only@*/ /*@null@*/ line_index_mapping_head *line_index_map = NULL;
/* Global assembler options. */
unsigned int asm_options = 0;
@ -105,13 +105,17 @@ void
line_shutdown(void)
{
line_index_mapping *mapping, *mapping2;
mapping = STAILQ_FIRST(line_index_map);
while (mapping) {
mapping2 = STAILQ_NEXT(mapping, link);
xfree(mapping);
mapping = mapping2;
if (line_index_map) {
mapping = STAILQ_FIRST(line_index_map);
while (mapping) {
mapping2 = STAILQ_NEXT(mapping, link);
xfree(mapping);
mapping = mapping2;
}
xfree(line_index_map);
line_index_map = NULL;
}
xfree(line_index_map);
if (filename_table) {
HAMT_delete(filename_table, filename_delete_one);
@ -120,21 +124,24 @@ line_shutdown(void)
}
void
line_lookup(unsigned long index, const char **filename, unsigned long *line)
line_lookup(unsigned long lindex, const char **filename, unsigned long *line)
{
line_index_mapping *mapping, *mapping2;
assert(index <= line_index);
assert(lindex <= line_index);
/* Linearly search through map to find highest line_index <= index */
assert(line_index_map != NULL);
mapping = STAILQ_FIRST(line_index_map);
while (mapping) {
mapping2 = STAILQ_NEXT(mapping, link);
if (!mapping2 || mapping2->index > index)
if (!mapping2 || mapping2->index > lindex)
break;
mapping = mapping2;
}
assert(mapping != NULL);
*filename = mapping->filename;
*line = mapping->line+mapping->line_inc*(index-mapping->index);
*line = mapping->line+mapping->line_inc*(lindex-mapping->index);
}

4
libyasm/linemgr.h
Unescape View File

@ -40,7 +40,7 @@ extern int indent_level;
void line_set(const char *filename, unsigned long line,
unsigned long line_inc);
void line_shutdown(void);
void line_lookup(unsigned long index, const char **filename,
unsigned long *line);
void line_lookup(unsigned long lindex, /*@out@*/ const char **filename,
/*@out@*/ unsigned long *line);
#endif

8
src/errwarn.c
Unescape View File

@ -239,14 +239,14 @@ WarningNow(const char *fmt, ...)
}
void
ErrorAt(unsigned long index, const char *fmt, ...)
ErrorAt(unsigned long lindex, const char *fmt, ...)
{
/* XXX: Should insert into list instead of printing immediately */
va_list ap;
const char *filename;
unsigned long line;
line_lookup(index, &filename, &line);
line_lookup(lindex, &filename, &line);
fprintf(stderr, "%s:%lu: ", filename?filename:"(NULL)", line);
va_start(ap, fmt);
vfprintf(stderr, fmt, ap);
@ -255,14 +255,14 @@ ErrorAt(unsigned long index, const char *fmt, ...)
}
void
WarningAt(unsigned long index, const char *fmt, ...)
WarningAt(unsigned long lindex, const char *fmt, ...)
{
/* XXX: Should insert into list instead of printing immediately */
va_list ap;
const char *filename;
unsigned long line;
line_lookup(index, &filename, &line);
line_lookup(lindex, &filename, &line);
fprintf(stderr, "%s:%lu: %s ", filename?filename:"NULL", line,
_("warning:"));
va_start(ap, fmt);

4
src/errwarn.h
Unescape View File

@ -46,8 +46,8 @@ void Warning(const char *, ...) /*@printflike@*/;
* called in line order from a parser. The *At() functions are much slower,
* at least in the current implementation.
*/
void ErrorAt(unsigned long index, const char *, ...) /*@printflike@*/;
void WarningAt(unsigned long index, const char *, ...) /*@printflike@*/;
void ErrorAt(unsigned long lindex, const char *, ...) /*@printflike@*/;
void WarningAt(unsigned long lindex, const char *, ...) /*@printflike@*/;
/* These two functions immediately output the error or warning, with no file
* or line information. They should be used for errors and warnings outside

31
src/globals.c
Unescape View File

@ -49,14 +49,14 @@ typedef struct line_index_mapping {
/* "original" source base line number */
unsigned long line;
/* "original" source line number increment (for following lines) */
unsigned int line_inc;
unsigned long line_inc;
} line_index_mapping;
/* Shared storage for filenames */
static /*@only@*/ /*@null@*/ HAMT *filename_table = NULL;
/* Virtual line number. Uniquely specifies every line read by the parser. */
unsigned long line_index = 1;
static line_index_mapping_head *line_index_map = NULL;
static /*@only@*/ /*@null@*/ line_index_mapping_head *line_index_map = NULL;
/* Global assembler options. */
unsigned int asm_options = 0;
@ -105,13 +105,17 @@ void
line_shutdown(void)
{
line_index_mapping *mapping, *mapping2;
mapping = STAILQ_FIRST(line_index_map);
while (mapping) {
mapping2 = STAILQ_NEXT(mapping, link);
xfree(mapping);
mapping = mapping2;
if (line_index_map) {
mapping = STAILQ_FIRST(line_index_map);
while (mapping) {
mapping2 = STAILQ_NEXT(mapping, link);
xfree(mapping);
mapping = mapping2;
}
xfree(line_index_map);
line_index_map = NULL;
}
xfree(line_index_map);
if (filename_table) {
HAMT_delete(filename_table, filename_delete_one);
@ -120,21 +124,24 @@ line_shutdown(void)
}
void
line_lookup(unsigned long index, const char **filename, unsigned long *line)
line_lookup(unsigned long lindex, const char **filename, unsigned long *line)
{
line_index_mapping *mapping, *mapping2;
assert(index <= line_index);
assert(lindex <= line_index);
/* Linearly search through map to find highest line_index <= index */
assert(line_index_map != NULL);
mapping = STAILQ_FIRST(line_index_map);
while (mapping) {
mapping2 = STAILQ_NEXT(mapping, link);
if (!mapping2 || mapping2->index > index)
if (!mapping2 || mapping2->index > lindex)
break;
mapping = mapping2;
}
assert(mapping != NULL);
*filename = mapping->filename;
*line = mapping->line+mapping->line_inc*(index-mapping->index);
*line = mapping->line+mapping->line_inc*(lindex-mapping->index);
}

4
src/globals.h
Unescape View File

@ -40,7 +40,7 @@ extern int indent_level;
void line_set(const char *filename, unsigned long line,
unsigned long line_inc);
void line_shutdown(void);
void line_lookup(unsigned long index, const char **filename,
unsigned long *line);
void line_lookup(unsigned long lindex, /*@out@*/ const char **filename,
/*@out@*/ unsigned long *line);
#endif

31
src/linemgr.c
Unescape View File

@ -49,14 +49,14 @@ typedef struct line_index_mapping {
/* "original" source base line number */
unsigned long line;
/* "original" source line number increment (for following lines) */
unsigned int line_inc;
unsigned long line_inc;
} line_index_mapping;
/* Shared storage for filenames */
static /*@only@*/ /*@null@*/ HAMT *filename_table = NULL;
/* Virtual line number. Uniquely specifies every line read by the parser. */
unsigned long line_index = 1;
static line_index_mapping_head *line_index_map = NULL;
static /*@only@*/ /*@null@*/ line_index_mapping_head *line_index_map = NULL;
/* Global assembler options. */
unsigned int asm_options = 0;
@ -105,13 +105,17 @@ void
line_shutdown(void)
{
line_index_mapping *mapping, *mapping2;
mapping = STAILQ_FIRST(line_index_map);
while (mapping) {
mapping2 = STAILQ_NEXT(mapping, link);
xfree(mapping);
mapping = mapping2;
if (line_index_map) {
mapping = STAILQ_FIRST(line_index_map);
while (mapping) {
mapping2 = STAILQ_NEXT(mapping, link);
xfree(mapping);
mapping = mapping2;
}
xfree(line_index_map);
line_index_map = NULL;
}
xfree(line_index_map);
if (filename_table) {
HAMT_delete(filename_table, filename_delete_one);
@ -120,21 +124,24 @@ line_shutdown(void)
}
void
line_lookup(unsigned long index, const char **filename, unsigned long *line)
line_lookup(unsigned long lindex, const char **filename, unsigned long *line)
{
line_index_mapping *mapping, *mapping2;
assert(index <= line_index);
assert(lindex <= line_index);
/* Linearly search through map to find highest line_index <= index */
assert(line_index_map != NULL);
mapping = STAILQ_FIRST(line_index_map);
while (mapping) {
mapping2 = STAILQ_NEXT(mapping, link);
if (!mapping2 || mapping2->index > index)
if (!mapping2 || mapping2->index > lindex)
break;
mapping = mapping2;
}
assert(mapping != NULL);
*filename = mapping->filename;
*line = mapping->line+mapping->line_inc*(index-mapping->index);
*line = mapping->line+mapping->line_inc*(lindex-mapping->index);
}

4
src/linemgr.h
Unescape View File

@ -40,7 +40,7 @@ extern int indent_level;
void line_set(const char *filename, unsigned long line,
unsigned long line_inc);
void line_shutdown(void);
void line_lookup(unsigned long index, const char **filename,
unsigned long *line);
void line_lookup(unsigned long lindex, /*@out@*/ const char **filename,
/*@out@*/ unsigned long *line);
#endif

Write Preview
Loading…
Cancel
Save