diff scan.c @ 14:84c0facfc43c

Merge changes from upstream v0.1.4.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 14 Oct 2021 01:38:52 +0300
parents fe4d840c13eb
children a2a81589380d
line wrap: on
line diff
--- a/scan.c	Fri Oct 08 02:40:00 2021 +0300
+++ b/scan.c	Thu Oct 14 01:38:52 2021 +0300
@@ -1,7 +1,8 @@
 /*\
- *  dxa v0.1.1 -- symbolic 65xx disassembler
+ *  dxa -- symbolic 65xx disassembler
  *
  *  Copyright (C) 1993, 1994 Marko M\"akel\"a
+ *  Copyright (C) 2019 Cameron Kaiser
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -17,16 +18,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *  Contacting the author:
- *
- *   Via Internet E-mail:
- *      <Marko.Makela@FTP.FUNET.FI>
- *
- *   Via Snail Mail:
- *      Marko M\"akel\"a
- *      Sillitie 10 A
- *      FIN-01480 VANTAA
- *      Finland
 \*/
 
 #define _SCAN_C_
@@ -42,6 +33,8 @@
   opcodes *instr;
 
   unsigned int size, counter;
+  if (fVerbose)
+    fprintf(stderr, "\n%s: scanning sure section $%04x", prog, scanstart);
 
   for (address = scanstart;; address += size) {
     if (GetMemFlag (address)) /* rest of routine not valid */
@@ -588,7 +581,7 @@
 			(unsigned int)entry->address);
 		return 1;
 	}
-    entry = FindNextEntryType (NULL, ~0, RTN_SURE);
+    entry = FindNextEntryType (NULL, ~0, RTN_SURE); // valgrind fart
     DeleteEntry (entry);
   }
 
@@ -801,7 +794,7 @@
       }
 
     if (fVerbose)
-      fprintf (stderr, "\r%s: scanning at %X", prog, address);
+      fprintf (stderr, "\n%s: scanning at $%04x", prog, address);
 
     if (!ScanPotential (address)) {
       while ((entry = FindNextEntryType (NULL, ~RTN_B_TEMPORARY,