summaryrefslogtreecommitdiff
path: root/listing.c
diff options
context:
space:
mode:
Diffstat (limited to 'listing.c')
-rw-r--r--listing.c267
1 files changed, 129 insertions, 138 deletions
diff --git a/listing.c b/listing.c
index 5deea2a5..1f5e961b 100644
--- a/listing.c
+++ b/listing.c
@@ -18,7 +18,7 @@
#include "nasmlib.h"
#include "listing.h"
-#define LIST_MAX_LEN 216 /* something sensible */
+#define LIST_MAX_LEN 216 /* something sensible */
#define LIST_INDENT 40
#define LIST_HEXBIT 18
@@ -37,50 +37,52 @@ static char xdigit[] = "0123456789ABCDEF";
static char listline[LIST_MAX_LEN];
static int listlinep;
-static char listdata[2*LIST_INDENT]; /* we need less than that actually */
+static char listdata[2 * LIST_INDENT]; /* we need less than that actually */
static long listoffset;
static long listlineno;
static long listp;
-static int suppress; /* for INCBIN & TIMES special cases */
+static int suppress; /* for INCBIN & TIMES special cases */
static int listlevel, listlevel_e;
static FILE *listfp;
-static void list_emit (void)
+static void list_emit(void)
{
if (!listlinep && !listdata[0])
- return;
+ return;
fprintf(listfp, "%6ld ", ++listlineno);
if (listdata[0])
- fprintf(listfp, "%08lX %-*s", listoffset, LIST_HEXBIT+1, listdata);
+ fprintf(listfp, "%08lX %-*s", listoffset, LIST_HEXBIT + 1,
+ listdata);
else
- fprintf(listfp, "%*s", LIST_HEXBIT+10, "");
+ fprintf(listfp, "%*s", LIST_HEXBIT + 10, "");
if (listlevel_e)
- fprintf(listfp, "%s<%d>", (listlevel < 10 ? " " : ""), listlevel_e);
+ fprintf(listfp, "%s<%d>", (listlevel < 10 ? " " : ""),
+ listlevel_e);
else if (listlinep)
- fprintf(listfp, " ");
+ fprintf(listfp, " ");
if (listlinep)
- fprintf(listfp, " %s", listline);
+ fprintf(listfp, " %s", listline);
fputc('\n', listfp);
listlinep = FALSE;
listdata[0] = '\0';
}
-static void list_init (char *fname, efunc error)
+static void list_init(char *fname, efunc error)
{
- listfp = fopen (fname, "w");
+ listfp = fopen(fname, "w");
if (!listfp) {
- error (ERR_NONFATAL, "unable to open listing file `%s'", fname);
- return;
+ error(ERR_NONFATAL, "unable to open listing file `%s'", fname);
+ return;
}
*listline = '\0';
@@ -94,183 +96,172 @@ static void list_init (char *fname, efunc error)
mistack->inhibiting = TRUE;
}
-static void list_cleanup (void)
+static void list_cleanup(void)
{
if (!listp)
- return;
+ return;
while (mistack) {
- MacroInhibit *temp = mistack;
- mistack = temp->next;
- nasm_free (temp);
+ MacroInhibit *temp = mistack;
+ mistack = temp->next;
+ nasm_free(temp);
}
list_emit();
- fclose (listfp);
+ fclose(listfp);
}
-static void list_out (long offset, char *str)
+static void list_out(long offset, char *str)
{
if (strlen(listdata) + strlen(str) > LIST_HEXBIT) {
- strcat(listdata, "-");
- list_emit();
+ strcat(listdata, "-");
+ list_emit();
}
if (!listdata[0])
- listoffset = offset;
+ listoffset = offset;
strcat(listdata, str);
}
-static void list_output (long offset, const void *data, unsigned long type)
+static void list_output(long offset, const void *data, unsigned long type)
{
unsigned long typ, size;
- if (!listp || suppress || user_nolist) /* fbk - 9/2/00 */
- return;
+ if (!listp || suppress || user_nolist) /* fbk - 9/2/00 */
+ return;
typ = type & OUT_TYPMASK;
size = type & OUT_SIZMASK;
- if (typ == OUT_RAWDATA)
- {
- unsigned char const *p = data;
- char q[3];
- while (size--)
- {
- HEX (q, *p);
- q[2] = '\0';
- list_out (offset++, q);
- p++;
- }
- }
- else if (typ == OUT_ADDRESS)
- {
- unsigned long d = *(long *)data;
- char q[11];
- unsigned char p[4], *r = p;
- if (size == 4)
- {
- q[0] = '['; q[9] = ']'; q[10] = '\0';
- WRITELONG (r, d);
- HEX (q+1, p[0]);
- HEX (q+3, p[1]);
- HEX (q+5, p[2]);
- HEX (q+7, p[3]);
- list_out (offset, q);
- }
- else {
- q[0] = '['; q[5] = ']'; q[6] = '\0';
- WRITESHORT (r, d);
- HEX (q+1, p[0]);
- HEX (q+3, p[1]);
- list_out (offset, q);
- }
- }
- else if (typ == OUT_REL2ADR)
- {
- unsigned long d = *(long *)data;
- char q[11];
- unsigned char p[4], *r = p;
- q[0] = '('; q[5] = ')'; q[6] = '\0';
- WRITESHORT (r, d);
- HEX (q+1, p[0]);
- HEX (q+3, p[1]);
- list_out (offset, q);
- }
- else if (typ == OUT_REL4ADR)
- {
- unsigned long d = *(long *)data;
- char q[11];
- unsigned char p[4], *r = p;
- q[0] = '('; q[9] = ')'; q[10] = '\0';
- WRITELONG (r, d);
- HEX (q+1, p[0]);
- HEX (q+3, p[1]);
- HEX (q+5, p[2]);
- HEX (q+7, p[3]);
- list_out (offset, q);
- }
- else if (typ == OUT_RESERVE)
- {
- char q[20];
- snprintf(q, sizeof(q), "<res %08lX>", size);
- list_out (offset, q);
+ if (typ == OUT_RAWDATA) {
+ unsigned char const *p = data;
+ char q[3];
+ while (size--) {
+ HEX(q, *p);
+ q[2] = '\0';
+ list_out(offset++, q);
+ p++;
+ }
+ } else if (typ == OUT_ADDRESS) {
+ unsigned long d = *(long *)data;
+ char q[11];
+ unsigned char p[4], *r = p;
+ if (size == 4) {
+ q[0] = '[';
+ q[9] = ']';
+ q[10] = '\0';
+ WRITELONG(r, d);
+ HEX(q + 1, p[0]);
+ HEX(q + 3, p[1]);
+ HEX(q + 5, p[2]);
+ HEX(q + 7, p[3]);
+ list_out(offset, q);
+ } else {
+ q[0] = '[';
+ q[5] = ']';
+ q[6] = '\0';
+ WRITESHORT(r, d);
+ HEX(q + 1, p[0]);
+ HEX(q + 3, p[1]);
+ list_out(offset, q);
+ }
+ } else if (typ == OUT_REL2ADR) {
+ unsigned long d = *(long *)data;
+ char q[11];
+ unsigned char p[4], *r = p;
+ q[0] = '(';
+ q[5] = ')';
+ q[6] = '\0';
+ WRITESHORT(r, d);
+ HEX(q + 1, p[0]);
+ HEX(q + 3, p[1]);
+ list_out(offset, q);
+ } else if (typ == OUT_REL4ADR) {
+ unsigned long d = *(long *)data;
+ char q[11];
+ unsigned char p[4], *r = p;
+ q[0] = '(';
+ q[9] = ')';
+ q[10] = '\0';
+ WRITELONG(r, d);
+ HEX(q + 1, p[0]);
+ HEX(q + 3, p[1]);
+ HEX(q + 5, p[2]);
+ HEX(q + 7, p[3]);
+ list_out(offset, q);
+ } else if (typ == OUT_RESERVE) {
+ char q[20];
+ snprintf(q, sizeof(q), "<res %08lX>", size);
+ list_out(offset, q);
}
}
-static void list_line (int type, char *line)
+static void list_line(int type, char *line)
{
if (!listp)
- return;
- if (user_nolist){ /* fbk - 9/2/00 */
+ return;
+ if (user_nolist) { /* fbk - 9/2/00 */
listlineno++;
return;
}
- if (mistack && mistack->inhibiting)
- {
- if (type == LIST_MACRO)
- return;
- else { /* pop the m i stack */
- MacroInhibit *temp = mistack;
- mistack = temp->next;
- nasm_free (temp);
- }
+ if (mistack && mistack->inhibiting) {
+ if (type == LIST_MACRO)
+ return;
+ else { /* pop the m i stack */
+ MacroInhibit *temp = mistack;
+ mistack = temp->next;
+ nasm_free(temp);
+ }
}
list_emit();
listlinep = TRUE;
- strncpy (listline, line, LIST_MAX_LEN-1);
- listline[LIST_MAX_LEN-1] = '\0';
+ strncpy(listline, line, LIST_MAX_LEN - 1);
+ listline[LIST_MAX_LEN - 1] = '\0';
listlevel_e = listlevel;
}
-static void list_uplevel (int type)
+static void list_uplevel(int type)
{
if (!listp)
- return;
- if (type == LIST_INCBIN || type == LIST_TIMES)
- {
- suppress |= (type == LIST_INCBIN ? 1 : 2);
- list_out (listoffset, type == LIST_INCBIN ? "<incbin>" : "<rept>");
- return;
+ return;
+ if (type == LIST_INCBIN || type == LIST_TIMES) {
+ suppress |= (type == LIST_INCBIN ? 1 : 2);
+ list_out(listoffset, type == LIST_INCBIN ? "<incbin>" : "<rept>");
+ return;
}
listlevel++;
- if (mistack && mistack->inhibiting && type == LIST_INCLUDE)
- {
- MacroInhibit *temp = nasm_malloc(sizeof(MacroInhibit));
- temp->next = mistack;
- temp->level = listlevel;
- temp->inhibiting = FALSE;
- mistack = temp;
- }
- else if (type == LIST_MACRO_NOLIST)
- {
- MacroInhibit *temp = nasm_malloc(sizeof(MacroInhibit));
- temp->next = mistack;
- temp->level = listlevel;
- temp->inhibiting = TRUE;
- mistack = temp;
+ if (mistack && mistack->inhibiting && type == LIST_INCLUDE) {
+ MacroInhibit *temp = nasm_malloc(sizeof(MacroInhibit));
+ temp->next = mistack;
+ temp->level = listlevel;
+ temp->inhibiting = FALSE;
+ mistack = temp;
+ } else if (type == LIST_MACRO_NOLIST) {
+ MacroInhibit *temp = nasm_malloc(sizeof(MacroInhibit));
+ temp->next = mistack;
+ temp->level = listlevel;
+ temp->inhibiting = TRUE;
+ mistack = temp;
}
}
-static void list_downlevel (int type)
+static void list_downlevel(int type)
{
if (!listp)
- return;
+ return;
- if (type == LIST_INCBIN || type == LIST_TIMES)
- {
- suppress &= ~(type == LIST_INCBIN ? 1 : 2);
- return;
+ if (type == LIST_INCBIN || type == LIST_TIMES) {
+ suppress &= ~(type == LIST_INCBIN ? 1 : 2);
+ return;
}
listlevel--;
- while (mistack && mistack->level > listlevel)
- {
- MacroInhibit *temp = mistack;
- mistack = temp->next;
- nasm_free (temp);
+ while (mistack && mistack->level > listlevel) {
+ MacroInhibit *temp = mistack;
+ mistack = temp->next;
+ nasm_free(temp);
}
}
View Lorry Controller Status