/* listing.c - maintain assembly listings
- Copyright (C) 1991-2014 Free Software Foundation, Inc.
+ Copyright (C) 1991-2016 Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
#include "as.h"
#include "filenames.h"
-#include "obstack.h"
#include "safe-ctype.h"
#include "input-file.h"
#include "subsegs.h"
static void new_frag (void);
static void listing_page (list_info_type *);
static unsigned int calc_hex (list_info_type *);
-static void print_lines (list_info_type *, unsigned int, char *, unsigned int);
+static void print_lines (list_info_type *, unsigned int, const char *,
+ unsigned int);
static void list_symbol_table (void);
static int debugging_pseudo (list_info_type *, const char *);
static void listing_listing (char *);
void
listing_warning (const char *message)
{
- listing_message (_("Warning:"), message);
+ listing_message (_("Warning: "), message);
}
void
listing_error (const char *message)
{
- listing_message (_("Error:"), message);
+ listing_message (_("Error: "), message);
}
static file_info_type *
void
listing_newline (char *ps)
{
- char *file;
+ const char *file;
unsigned int line;
static unsigned int last_line = 0xffff;
- static char *last_file = NULL;
+ static const char *last_file = NULL;
list_info_type *new_i = NULL;
if (listing == 0)
}
#endif
- as_where (&file, &line);
+ file = as_where (&line);
if (ps == NULL)
{
if (line == last_line
truncated to size. It appends a fake line to the end of each input
file to make using the returned buffer simpler. */
-static char *
+static const char *
buffer_line (file_info_type *file, char *line, unsigned int size)
{
unsigned int count = 0;
/* This function rewinds the requested file back to the line requested,
reads it in again into the buffer provided and then restores the file
- back to its original location. Returns the buffer pointer upon success
- or an empty string if an error occurs. */
+ back to its original location. */
-static char *
+static void
rebuffer_line (file_info_type * file,
unsigned int linenum,
char * buffer,
/* Sanity checks. */
if (file == NULL || buffer == NULL || size <= 1 || file->linenum <= linenum)
- return "";
+ return;
/* Check the cache and see if we last used this file. */
if (last_open_file_info == NULL || file != last_open_file_info)
if (last_open_file == NULL)
{
file->at_end = 1;
- return "";
+ return;
}
/* Seek to where we were last time this file was open. */
/* Remember where we are in the current file. */
pos2 = pos = ftell (last_open_file);
if (pos < 3)
- return "";
+ return;
current_line = file->linenum;
/* Leave room for the nul at the end of the buffer. */
if (fread (buffer, 1, size, last_open_file) != size)
{
as_warn (_("unable to rebuffer file: %s\n"), file->filename);
- return "";
+ return;
}
for (ptr = buffer + size; ptr >= buffer; -- ptr)
/* Reset the file position. */
fseek (last_open_file, pos, SEEK_SET);
-
- return buffer;
}
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 unsigned int eject; /* Eject pending. */
+static unsigned int page; /* Current page number. */
+static const char *title; /* Current title. */
+static const char *subtitle; /* Current subtitle. */
+static unsigned int on_page; /* Number of lines printed on current page. */
static void
listing_page (list_info_type *list)
static void
print_lines (list_info_type *list, unsigned int lineno,
- char *string, unsigned int address)
+ const char *string, unsigned int address)
{
unsigned int idx;
unsigned int nchars;
while (current_file->linenum < list->hll_line
&& !current_file->at_end)
{
- char *p;
+ const char *p;
cache = cached_lines + next_free_line;
cache->file = current_file;
list_info_type *list = head;
file_info_type *current_hll_file = (file_info_type *) NULL;
char *buffer;
- char *p;
+ const char *p;
int show_listing = 1;
unsigned int width;