Mercurial > hg > index.cgi
view lwasm/list.c @ 273:1409debcb1a0
Fix crash on listing when nested noexpand macros are used
Macros flagged noexpand were causing a segfault during listing. The problem
was incorrect accounting for nesting levels for noexpand macros causing the
listing handler to fall off the end of the program in certain circumstances
and in other circumstances it would fail to suppress expansion. Both the
segfault in the case of misbehaviour and the misbhaviour itself are
corrected with this update.
If you do not use nested noexpand macros, this bug has no effect.
author | William Astle <lost@l-w.ca> |
---|---|
date | Sat, 25 May 2013 13:35:46 -0600 |
parents | e09985968e64 |
children | dc763f806dc4 |
line wrap: on
line source
/* list.c Copyright © 2010 William Astle This file is part of LWTOOLS. LWTOOLS 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 of the License, or (at your option) any later version. This program 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 this program. If not, see <http://www.gnu.org/licenses/>. */ #include <stdio.h> #include <string.h> #include <lw_alloc.h> #include <lw_string.h> #include "lwasm.h" #include "instab.h" void list_symbols(asmstate_t *as, FILE *of); /* Do listing */ void do_list(asmstate_t *as) { line_t *cl, *nl, *nl2; FILE *of = NULL; int i; unsigned char *obytes = NULL; int obytelen = 0; char *tc; if (!(as -> flags & FLAG_LIST)) return; if (as -> list_file) { if (strcmp(as -> list_file, "-") == 0) { of = stdout; } else of = fopen(as -> list_file, "w"); } else of = stdout; if (!of) { fprintf(stderr, "Cannot open list file; list not generated\n"); return; } for (cl = as -> line_head; cl; cl = nl) { nl = cl -> next; if (CURPRAGMA(cl, PRAGMA_NOLIST)) { if (cl -> outputl <= 0) continue; } if (cl -> noexpand_start) { obytelen = 0; int nc = 0; for (nl = cl; nl; nl = nl -> next) { if (nl -> noexpand_start) nc += nl -> noexpand_start; if (nl -> noexpand_end) nc -= nl -> noexpand_end; if (nl -> outputl > 0) obytelen += nl -> outputl; if (nl -> warn) { lwasm_error_t *e; for (e = nl -> warn; e; e = e -> next) { printf("Warning: %s\n", e -> mess); } } if (nc == 0) break; } obytes = lw_alloc(obytelen); nc = 0; for (nl2 = cl; ; nl2 = nl2 -> next) { int i; for (i = 0; i < nl2 -> outputl; i++) { obytes[nc++] = nl2 -> output[i]; } if (nc >= obytelen) break; } if (nl) nl = nl -> next; } else { if (cl -> warn) { lwasm_error_t *e; for (e = cl -> warn; e; e = e -> next) { printf("Warning: %s\n", e -> mess); } } obytelen = cl -> outputl; if (obytelen > 0) { obytes = lw_alloc(obytelen); memmove(obytes, cl -> output, cl -> outputl); } } if ((cl -> len < 1 && cl -> dlen < 1) && obytelen < 1) { if (cl -> soff >= 0) { fprintf(of, "%04Xs ", cl -> soff & 0xffff); } else if (cl -> dshow >= 0) { if (cl -> dsize == 1) { fprintf(of, " %02X ", cl -> dshow & 0xff); } else { fprintf(of, " %04X ", cl -> dshow & 0xff); } } else if (cl -> dptr) { lw_expr_t te; te = lw_expr_copy(cl -> dptr -> value); as -> exportcheck = 1; as -> csect = cl -> csect; lwasm_reduce_expr(as, te); as -> exportcheck = 0; if (lw_expr_istype(te, lw_expr_type_int)) { fprintf(of, " %04X ", lw_expr_intval(te) & 0xffff); } else { fprintf(of, " ???? "); } lw_expr_destroy(te); } else { fprintf(of, " "); } } else { lw_expr_t te; if (instab[cl -> insn].flags & lwasm_insn_setdata) te = lw_expr_copy(cl -> daddr); else te = lw_expr_copy(cl -> addr); as -> exportcheck = 1; as -> csect = cl -> csect; lwasm_reduce_expr(as, te); as -> exportcheck = 0; // fprintf(of, "%s\n", lw_expr_print(te)); fprintf(of, "%04X%c", lw_expr_intval(te) & 0xffff, ((cl -> inmod || (cl -> dlen != cl -> len)) && instab[cl -> insn].flags & lwasm_insn_setdata) ? '.' : ' '); lw_expr_destroy(te); for (i = 0; i < obytelen && i < 8; i++) { fprintf(of, "%02X", obytes[i]); } for (; i < 8; i++) { fprintf(of, " "); } fprintf(of, " "); } /* the 32.32 below is deliberately chosen so that the start of the line text is at a multiple of 8 from the start of the list line */ fprintf(of, "(%32.32s):%05d ", cl -> linespec, cl -> lineno); i = 0; for (tc = cl -> ltext; *tc; tc++) { if ((*tc) == '\t') { if (i % 8 == 0) { i += 8; fprintf(of, " "); } else { while (i % 8) { fputc(' ', of); i++; } } } else { fputc(*tc, of); i++; } } fputc('\n', of); if (obytelen > 8) { for (i = 8; i < obytelen; i++) { if (i % 8 == 0) { if (i != 8) fprintf(of, "\n "); else fprintf(of, " "); } fprintf(of, "%02X", obytes[i]); } if (i > 8) fprintf(of, "\n"); } lw_free(obytes); obytes = NULL; } if ((as -> flags & FLAG_SYMBOLS)) list_symbols(as, of); }