/* listing.c - mainting assembly listings
- Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
+ Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+ 2001
+ Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
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. */
+02111-1307, USA. */
/*
- Contributed by Steve Chamberlain
- sac@cygnus.com
-
+ Contributed by Steve Chamberlain <sac@cygnus.com>
A listing page looks like:
If the counter goes below zero, listing is suppressed.
-
Listings are a maintained by read calling various listing_<foo>
functions. What happens most is that the macro NO_LISTING is not
defined (from the Makefile), then the macro LISTING_NEWLINE expands
#define LISTING_WORD_SIZE 4
#endif
#ifndef LISTING_LHS_WIDTH
-#define LISTING_LHS_WIDTH 1
+#define LISTING_LHS_WIDTH ((LISTING_WORD_SIZE) > 4 ? 1 : 4 / (LISTING_WORD_SIZE))
#endif
#ifndef LISTING_LHS_WIDTH_SECOND
-#define LISTING_LHS_WIDTH_SECOND 1
+#define LISTING_LHS_WIDTH_SECOND LISTING_LHS_WIDTH
#endif
#ifndef LISTING_RHS_WIDTH
#define LISTING_RHS_WIDTH 100
#define LISTING_LHS_CONT_LINES 4
#endif
-/* This structure remembers which .s were used */
-typedef struct file_info_struct
-{
- struct file_info_struct *next;
- char *filename;
- long pos;
- int linenum;
- int at_end;
-}
-file_info_type;
-
-
-/* this structure rememebrs which line from which file goes into which
- frag */
-struct list_info_struct
-{
- /* Frag which this line of source is nearest to */
+/* This structure remembers which .s were used. */
+typedef struct file_info_struct {
+ struct file_info_struct * next;
+ char * filename;
+ long pos;
+ unsigned int linenum;
+ int at_end;
+} file_info_type;
+
+/* This structure rememebrs which line from which file goes into which
+ frag. */
+struct list_info_struct {
+ /* Frag which this line of source is nearest to. */
fragS *frag;
- /* The actual line in the source file */
+ /* The actual line in the source file. */
unsigned int line;
/* Pointer to the file info struct for the file which this line
- belongs to */
+ belongs to. */
file_info_type *file;
/* The expanded text of any macro that may have been executing. */
char *line_contents;
- /* Next in list */
+ /* Next in list. */
struct list_info_struct *next;
/* Pointer to the file info struct for the high level language
- source line that belongs here */
+ source line that belongs here. */
file_info_type *hll_file;
- /* High level language source line */
- int hll_line;
+ /* High level language source line. */
+ unsigned int hll_line;
- /* Pointer to any error message associated with this line */
+ /* Pointer to any error message associated with this line. */
char *message;
- enum
- {
- EDICT_NONE,
- EDICT_SBTTL,
- EDICT_TITLE,
- EDICT_NOLIST,
- EDICT_LIST,
- EDICT_NOLIST_NEXT,
- EDICT_EJECT
- } edict;
+ enum {
+ EDICT_NONE,
+ EDICT_SBTTL,
+ EDICT_TITLE,
+ EDICT_NOLIST,
+ EDICT_LIST,
+ EDICT_NOLIST_NEXT,
+ EDICT_EJECT
+ } edict;
char *edict_arg;
/* Nonzero if this line is to be omitted because it contains
typedef struct list_info_struct list_info_type;
-static struct list_info_struct *head;
-struct list_info_struct *listing_tail;
-extern int listing;
+int listing_lhs_width = LISTING_LHS_WIDTH;
+int listing_lhs_width_second = LISTING_LHS_WIDTH_SECOND;
+int listing_lhs_cont_lines = LISTING_LHS_CONT_LINES;
+int listing_rhs_width = LISTING_RHS_WIDTH;
+
+struct list_info_struct * listing_tail;
-static int paper_width = 200;
-static int paper_height = 60;
+static file_info_type * file_info_head;
+static file_info_type * last_open_file_info;
+static FILE * last_open_file;
+static struct list_info_struct * head;
+static int paper_width = 200;
+static int paper_height = 60;
+
+extern int listing;
/* File to output listings to. */
static FILE *list_file;
static int debugging_pseudo PARAMS ((list_info_type *, const char *));
static void listing_listing PARAMS ((char *name));
-
static void
listing_message (name, message)
const char *name;
const char *message;
{
- unsigned int l = strlen (name) + strlen (message) + 1;
- char *n = (char *) xmalloc (l);
- strcpy (n, name);
- strcat (n, message);
if (listing_tail != (list_info_type *) NULL)
{
+ unsigned int l = strlen (name) + strlen (message) + 1;
+ char *n = (char *) xmalloc (l);
+ strcpy (n, name);
+ strcat (n, message);
listing_tail->message = n;
}
}
listing_warning (message)
const char *message;
{
- listing_message ("Warning:", message);
+ listing_message (_("Warning:"), message);
}
void
listing_error (message)
const char *message;
{
- listing_message ("Error:", message);
+ listing_message (_("Error:"), message);
}
-
-int listing_lhs_width = LISTING_LHS_WIDTH;
-int listing_lhs_width_second = LISTING_LHS_WIDTH_SECOND;
-int listing_lhs_cont_lines = LISTING_LHS_CONT_LINES;
-int listing_rhs_width = LISTING_RHS_WIDTH;
-
-
-static file_info_type *file_info_head;
-static file_info_type *last_open_file_info;
-static FILE *last_open_file;
-
static file_info_type *
file_info (file_name)
const char *file_name;
{
- /* Find an entry with this file name */
+ /* Find an entry with this file name. */
file_info_type *p = file_info_head;
while (p != (file_info_type *) NULL)
p = p->next;
}
- /* Make new entry */
+ /* Make new entry. */
p = (file_info_type *) xmalloc (sizeof (file_info_type));
p->next = file_info_head;
return p;
}
-
static void
new_frag ()
{
as_where (&file, &line);
if (ps == NULL)
{
- if (line == last_line && !(last_file && file && strcmp(file, last_file)))
+ if (line == last_line
+ && !(last_file && file && strcmp (file, last_file)))
return;
new = (list_info_type *) xmalloc (sizeof (list_info_type));
- new->line_contents = NULL;
+
+ /* Detect if we are reading from stdin by examining the file
+ name returned by as_where().
+
+ [FIXME: We rely upon the name in the strcmp below being the
+ same as the one used by input_scrub_new_file(), if that is
+ not true, then this code will fail].
+
+ If we are reading from stdin, then we need to save each input
+ line here (assuming of course that we actually have a line of
+ input to read), so that it can be displayed in the listing
+ that is produced at the end of the assembly. */
+ if (strcmp (file, _("{standard input}")) == 0
+ && input_line_pointer != NULL)
+ {
+ char *copy;
+ int len;
+ int seen_quote = 0;
+
+ for (copy = input_line_pointer - 1;
+ *copy && (seen_quote
+ || (! is_end_of_line [(unsigned char) *copy]));
+ copy++)
+ if (*copy == '"' && copy[-1] != '\\')
+ seen_quote = ! seen_quote;
+
+ len = (copy - input_line_pointer) + 2;
+
+ copy = xmalloc (len);
+
+ if (copy != NULL)
+ {
+ char *src = input_line_pointer - 1;
+ char *dest = copy;
+
+ while (--len)
+ {
+ unsigned char c = *src++;
+
+ /* Omit control characters in the listing. */
+ if (isascii (c) && ! iscntrl (c))
+ *dest++ = c;
+ }
+
+ *dest = 0;
+ }
+
+ new->line_contents = copy;
+ }
+ else
+ new->line_contents = NULL;
}
else
{
last_line = line;
last_file = file;
+
new_frag ();
if (listing_tail)
- {
- listing_tail->next = new;
- }
+ listing_tail->next = new;
else
- {
- head = new;
- }
+ head = new;
+
listing_tail = new;
new->frag = frag_now;
new->hll_file = (file_info_type *) NULL;
new->hll_line = 0;
new->debugging = 0;
+
new_frag ();
#ifdef OBJ_ELF
new_frag ();
}
-/*
- This function returns the next source line from the file supplied,
- truncated to size. It appends a fake line to the end of each input
- file to make
-*/
+/* This function returns the next source line from the file supplied,
+ truncated to size. It appends a fake line to the end of each input
+ file to make. */
static char *
buffer_line (file, line, size)
- file_info_type * file;
+ file_info_type *file;
char *line;
unsigned int size;
{
char *p = line;
- /* If we couldn't open the file, return an empty line */
+ /* If we couldn't open the file, return an empty line. */
if (file->at_end)
return "";
}
last_open_file_info = file;
- last_open_file = fopen (file->filename, "r");
- if (!last_open_file)
- return "";
+ last_open_file = fopen (file->filename, FOPEN_RT);
+ if (last_open_file == NULL)
+ {
+ file->at_end = 1;
+ return "";
+ }
/* Seek to where we were last time this file was open. */
if (file->pos)
- fseek(last_open_file, file->pos, SEEK_SET);
+ fseek (last_open_file, file->pos, SEEK_SET);
}
c = fgetc (last_open_file);
- size -= 1; /* leave room for null */
+ /* Leave room for null. */
+ size -= 1;
while (c != EOF && c != '\n')
{
return line;
}
-
static const char *fn;
static unsigned int eject; /* Eject pending */
static unsigned int page; /* Current page number */
-static char *title; /* current title */
-static char *subtitle; /* current subtitle */
-static unsigned int on_page; /* number of lines printed on current page */
-
+static char *title; /* Current title */
+static char *subtitle; /* Current subtitle */
+static unsigned int on_page; /* Number of lines printed on current page */
static void
listing_page (list)
list_info_type *list;
{
/* Grope around, see if we can see a title or subtitle edict coming up
- soon (we look down 10 lines of the page and see if it's there)*/
- if ((eject || (on_page >= paper_height)) && paper_height != 0)
+ soon. (we look down 10 lines of the page and see if it's there) */
+ if ((eject || (on_page >= (unsigned int) paper_height))
+ && paper_height != 0)
{
unsigned int c = 10;
int had_title = 0;
c--;
}
-
if (page > 1)
{
fprintf (list_file, "\f");
}
}
-
static unsigned int
calc_hex (list)
- list_info_type * list;
+ list_info_type *list;
{
int data_buffer_size;
list_info_type *first = list;
- unsigned int address = (unsigned int) ~0;
+ unsigned int address = ~(unsigned int) 0;
fragS *frag;
fragS *frag_ptr;
- unsigned int byte_in_frag;
+ unsigned int octet_in_frag;
- /* Find first frag which says it belongs to this line */
+ /* Find first frag which says it belongs to this line. */
frag = list->frag;
while (frag && frag->line != list)
frag = frag->fr_next;
data_buffer_size = 0;
- /* Dump all the frags which belong to this line */
+ /* Dump all the frags which belong to this line. */
while (frag_ptr != (fragS *) NULL && frag_ptr->line == first)
{
- /* Print as many bytes from the fixed part as is sensible */
- byte_in_frag = 0;
- while (byte_in_frag < frag_ptr->fr_fix
+ /* Print as many bytes from the fixed part as is sensible. */
+ octet_in_frag = 0;
+ while ((offsetT) octet_in_frag < frag_ptr->fr_fix
&& data_buffer_size < MAX_BYTES - 3)
{
- if (address == ~0)
+ if (address == ~(unsigned int) 0)
{
- address = frag_ptr->fr_address;
+ address = frag_ptr->fr_address / OCTETS_PER_BYTE;
}
sprintf (data_buffer + data_buffer_size,
"%02X",
- (frag_ptr->fr_literal[byte_in_frag]) & 0xff);
+ (frag_ptr->fr_literal[octet_in_frag]) & 0xff);
data_buffer_size += 2;
- byte_in_frag++;
+ octet_in_frag++;
}
+ if (frag_ptr->fr_type == rs_fill)
{
- unsigned int var_rep_max = byte_in_frag;
- unsigned int var_rep_idx = byte_in_frag;
+ unsigned int var_rep_max = octet_in_frag;
+ unsigned int var_rep_idx = octet_in_frag;
- /* Print as many bytes from the variable part as is sensible */
- while ((byte_in_frag
- < frag_ptr->fr_fix + frag_ptr->fr_var * frag_ptr->fr_offset)
+ /* Print as many bytes from the variable part as is sensible. */
+ while (((offsetT) octet_in_frag
+ < (frag_ptr->fr_fix + frag_ptr->fr_var * frag_ptr->fr_offset))
&& data_buffer_size < MAX_BYTES - 3)
{
- if (address == ~0)
+ if (address == ~(unsigned int) 0)
{
- address = frag_ptr->fr_address;
+ address = frag_ptr->fr_address / OCTETS_PER_BYTE;
}
sprintf (data_buffer + data_buffer_size,
"%02X",
data_buffer_size += 2;
var_rep_idx++;
- byte_in_frag++;
+ octet_in_frag++;
- if (var_rep_idx >= frag_ptr->fr_fix + frag_ptr->fr_var)
+ if ((offsetT) var_rep_idx >= frag_ptr->fr_fix + frag_ptr->fr_var)
var_rep_idx = var_rep_max;
}
}
return address;
}
-
-
-
-
-
static void
print_lines (list, lineno, string, address)
list_info_type *list;
unsigned int idx;
unsigned int nchars;
unsigned int lines;
- unsigned int byte_in_word = 0;
+ unsigned int octet_in_word = 0;
char *src = data_buffer;
+ int cur;
- /* Print the stuff on the first line */
+ /* Print the stuff on the first line. */
listing_page (list);
nchars = (LISTING_WORD_SIZE * 2 + 1) * listing_lhs_width;
- /* Print the hex for the first line */
- if (address == ~0)
+
+ /* Print the hex for the first line. */
+ if (address == ~(unsigned int) 0)
{
fprintf (list_file, "% 4d ", lineno);
for (idx = 0; idx < nchars; idx++)
fprintf (list_file, " ");
fprintf (list_file, "\t%s\n", string ? string : "");
+
on_page++;
+
listing_page (0);
+ return;
}
+
+ if (had_errors ())
+ fprintf (list_file, "% 4d ???? ", lineno);
else
+ fprintf (list_file, "% 4d %04x ", lineno, address);
+
+ /* And the data to go along with it. */
+ idx = 0;
+ cur = 0;
+ while (src[cur] && idx < nchars)
{
- if (had_errors ())
- {
- fprintf (list_file, "% 4d ???? ", lineno);
- }
- else
+ int offset;
+ offset = cur;
+ fprintf (list_file, "%c%c", src[offset], src[offset + 1]);
+ cur += 2;
+ octet_in_word++;
+
+ if (octet_in_word == LISTING_WORD_SIZE)
{
- fprintf (list_file, "% 4d %04x ", lineno, address);
+ fprintf (list_file, " ");
+ idx++;
+ octet_in_word = 0;
}
- /* And the data to go along with it */
- idx = 0;
+ idx += 2;
+ }
- while (*src && idx < nchars)
- {
- fprintf (list_file, "%c%c", src[0], src[1]);
- src += 2;
- byte_in_word++;
- if (byte_in_word == LISTING_WORD_SIZE)
- {
- fprintf (list_file, " ");
- idx++;
- byte_in_word = 0;
- }
- idx += 2;
- }
+ for (; idx < nchars; idx++)
+ fprintf (list_file, " ");
- for (; idx < nchars; idx++)
- fprintf (list_file, " ");
+ fprintf (list_file, "\t%s\n", string ? string : "");
+ on_page++;
+ listing_page (list);
- fprintf (list_file, "\t%s\n", string ? string : "");
- on_page++;
+ if (list->message)
+ {
+ fprintf (list_file, "**** %s\n", list->message);
listing_page (list);
- if (list->message)
- {
- fprintf (list_file, "**** %s\n", list->message);
- listing_page (list);
- on_page++;
- }
+ on_page++;
+ }
- for (lines = 0; lines < listing_lhs_cont_lines && *src; lines++)
+ for (lines = 0;
+ lines < (unsigned int) listing_lhs_cont_lines
+ && src[cur];
+ lines++)
+ {
+ nchars = ((LISTING_WORD_SIZE * 2) + 1) * listing_lhs_width_second - 1;
+ idx = 0;
+
+ /* Print any more lines of data, but more compactly. */
+ fprintf (list_file, "% 4d ", lineno);
+
+ while (src[cur] && idx < nchars)
{
- nchars = (((LISTING_WORD_SIZE * 2) + 1)
- * listing_lhs_width_second - 1);
- idx = 0;
- /* Print any more lines of data, but more compactly */
- fprintf (list_file, "% 4d ", lineno);
+ int offset;
+ offset = cur;
+ fprintf (list_file, "%c%c", src[offset], src[offset + 1]);
+ cur += 2;
+ idx += 2;
+ octet_in_word++;
- while (*src && idx < nchars)
+ if (octet_in_word == LISTING_WORD_SIZE)
{
- fprintf (list_file, "%c%c", src[0], src[1]);
- src += 2;
- idx += 2;
- byte_in_word++;
- if (byte_in_word == LISTING_WORD_SIZE)
- {
- fprintf (list_file, " ");
- idx++;
- byte_in_word = 0;
- }
+ fprintf (list_file, " ");
+ idx++;
+ octet_in_word = 0;
}
-
- fprintf (list_file, "\n");
- on_page++;
- listing_page (list);
-
}
-
+ fprintf (list_file, "\n");
+ on_page++;
+ listing_page (list);
}
}
-
static void
list_symbol_table ()
{
for (ptr = symbol_rootP; ptr != (symbolS *) NULL; ptr = symbol_next (ptr))
{
- if (ptr->sy_frag->line)
+ if (SEG_NORMAL (S_GET_SEGMENT (ptr))
+ || S_GET_SEGMENT (ptr) == absolute_section)
{
+#ifdef BFD_ASSEMBLER
+ /* Don't report section symbols. They are not interesting. */
+ if (symbol_section_p (ptr))
+ continue;
+#endif
if (S_GET_NAME (ptr))
{
char buf[30], fmt[8];
got_some = 1;
}
- fprintf (list_file, "%20s:%-5d %s:%s %s\n",
- ptr->sy_frag->line->file->filename,
- ptr->sy_frag->line->line,
- segment_name (S_GET_SEGMENT (ptr)),
- buf, S_GET_NAME (ptr));
+ if (symbol_get_frag (ptr) && symbol_get_frag (ptr)->line)
+ {
+ fprintf (list_file, "%20s:%-5d %s:%s %s\n",
+ symbol_get_frag (ptr)->line->file->filename,
+ symbol_get_frag (ptr)->line->line,
+ segment_name (S_GET_SEGMENT (ptr)),
+ buf, S_GET_NAME (ptr));
+ }
+ else
+ {
+ fprintf (list_file, "%33s:%s %s\n",
+ segment_name (S_GET_SEGMENT (ptr)),
+ buf, S_GET_NAME (ptr));
+ }
on_page++;
listing_page (0);
{
if (S_GET_NAME (ptr) && strlen (S_GET_NAME (ptr)) != 0)
{
- if (ptr->sy_frag->line == 0
-#ifdef S_IS_REGISTER
- && !S_IS_REGISTER (ptr)
-#endif
- && S_GET_SEGMENT (ptr) != reg_section)
+ if (S_GET_SEGMENT (ptr) == undefined_section)
{
if (!got_some)
{
&& !current_file->at_end)
{
char *p = buffer_line (current_file, buffer, width);
- fprintf (list_file, "%4d:%-13s **** %s\n", current_file->linenum,
+ fprintf (list_file, "%4u:%-13s **** %s\n", current_file->linenum,
current_file->filename, p);
on_page++;
listing_page (list);
was_debug = in_debug;
in_debug = 0;
- while (isspace (*line))
+ while (isspace ((unsigned char) *line))
line++;
if (*line != '.')
static void
listing_listing (name)
- char *name;
+ char *name ATTRIBUTE_UNUSED;
{
list_info_type *list = head;
file_info_type *current_hll_file = (file_info_type *) NULL;
list = head->next;
-
while (list)
{
+ unsigned int list_line;
+
width = listing_rhs_width > paper_width ? paper_width :
listing_rhs_width;
+ list_line = list->line;
switch (list->edict)
{
case EDICT_LIST:
- show_listing++;
+ /* Skip all lines up to the current. */
+ list_line--;
break;
case EDICT_NOLIST:
show_listing--;
break;
case EDICT_NOLIST_NEXT:
+ if (show_listing == 0)
+ list_line--;
break;
case EDICT_EJECT:
break;
abort ();
}
+ if (show_listing <= 0)
+ {
+ while (list->file->linenum < list_line
+ && !list->file->at_end)
+ p = buffer_line (list->file, buffer, width);
+ }
+
+ if (list->edict == EDICT_LIST
+ || (list->edict == EDICT_NOLIST_NEXT && show_listing == 0))
+ {
+ /* Enable listing for the single line that caused the enable. */
+ list_line++;
+ show_listing++;
+ }
+
if (show_listing > 0)
{
/* Scan down the list and print all the stuff which can be done
if (!((listing & LISTING_NODEBUG)
&& debugging_pseudo (list, list->line_contents)))
{
- print_lines (list, list->file->linenum,
+ print_lines (list,
+ list->file->linenum == 0 ? list->line : list->file->linenum,
list->line_contents, calc_hex (list));
}
+ free (list->line_contents);
+ list->line_contents = NULL;
}
else
{
- while (list->file->linenum < list->line
+ while (list->file->linenum < list_line
&& !list->file->at_end)
{
unsigned int address;
p = buffer_line (list->file, buffer, width);
- if (list->file->linenum < list->line)
- address = ~ (unsigned int) 0;
+ if (list->file->linenum < list_line)
+ address = ~(unsigned int) 0;
else
address = calc_hex (list);
eject = 1;
}
}
- else
- {
- while (list->file->linenum < list->line
- && !list->file->at_end)
- p = buffer_line (list->file, buffer, width);
- }
- if (list->edict == EDICT_NOLIST_NEXT)
+ if (list->edict == EDICT_NOLIST_NEXT && show_listing == 1)
--show_listing;
list = list->next;
char *name;
{
int using_stdout;
- file_info_type *fi;
title = "";
subtitle = "";
}
else
{
- list_file = fopen (name, "w");
+ list_file = fopen (name, FOPEN_WT);
if (list_file != NULL)
using_stdout = 0;
else
{
- as_perror ("can't open list file: %s", name);
+ as_perror (_("can't open list file: %s"), name);
list_file = stdout;
using_stdout = 1;
}
if (! using_stdout)
{
if (fclose (list_file) == EOF)
- as_perror ("error closing list file: %s", name);
+ as_perror (_("error closing list file: %s"), name);
}
if (last_open_file)
}
}
-
void
listing_file (name)
const char *name;
void
listing_eject (ignore)
- int ignore;
+ int ignore ATTRIBUTE_UNUSED;
{
if (listing)
listing_tail->edict = EDICT_EJECT;
void
listing_flags (ignore)
- int ignore;
+ int ignore ATTRIBUTE_UNUSED;
{
while ((*input_line_pointer++) && (*input_line_pointer != '\n'))
input_line_pointer++;
}
}
-
void
listing_psize (width_only)
int width_only;
if (paper_height < 0 || paper_height > 1000)
{
paper_height = 0;
- as_warn ("strange paper height, set to no form");
+ as_warn (_("strange paper height, set to no form"));
}
if (*input_line_pointer != ',')
void
listing_nopage (ignore)
- int ignore;
+ int ignore ATTRIBUTE_UNUSED;
{
paper_height = 0;
}
}
else if (*input_line_pointer == '\n')
{
- as_bad ("New line in title");
+ as_bad (_("new line in title"));
demand_empty_rest_of_line ();
return;
}
}
}
-
-
void
listing_source_line (line)
unsigned int line;
listing_tail->hll_file = file_info (file);
}
-
-
#else
-
-/* Dummy functions for when compiled without listing enabled */
+/* Dummy functions for when compiled without listing enabled. */
void
listing_flags (ignore)
s_ignore (0);
}
-void
+void
listing_list (on)
int on;
{
s_ignore (0);
}
-void
+void
listing_eject (ignore)
int ignore;
{
s_ignore (0);
}
-void
+void
listing_psize (ignore)
int ignore;
{
s_ignore (0);
}
-void
+void
listing_title (depth)
int depth;
{
}
-void
+void
listing_newline (name)
char *name;
{
}
-void
+void
listing_source_line (n)
unsigned int n;
{
}
-void
+
+void
listing_source_file (n)
const char *n;
{
projects / external / binutils.git / blobdiff