diff dump.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 89183953bddc
line wrap: on
line diff
--- a/dump.c	Fri Oct 08 02:40:00 2021 +0300
+++ b/dump.c	Thu Oct 14 01:38:52 2021 +0300
@@ -1,8 +1,8 @@
 /*\
- *  dxa v0.1.3 -- symbolic 65xx disassembler
+ *  dxa -- symbolic 65xx disassembler
  *
  *  Copyright (C) 1993, 1994 Marko M\"akel\"a
- *  Changes for dxa (C) 2004, 2006 Cameron Kaiser
+ *  Changes for dxa (C) 2004-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
@@ -19,18 +19,8 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *  Marko does not maintain dxa, so questions specific to dxa should be
- *  sent to me at ckaiser@floodgap.com . Otherwise,
- *
- *  Contacting the author:
+ *  sent to me at ckaiser@floodgap.com.
  *
- *   Via Internet E-mail:
- *      <Marko.Makela@FTP.FUNET.FI>
- *
- *   Via Snail Mail:
- *      Marko M\"akel\"a
- *      Sillitie 10 A
- *      FIN-01480 VANTAA
- *      Finland
 \*/
 
 #define _DUMP_C_
@@ -116,6 +106,8 @@
 	fprintf(stdout, "%s\t.word $%04x", lineprefix, StartAddress);
 
   fprintf (stdout, "\n%s\t* = $%04x\n\n", lineprefix, StartAddress);
+  if(BasicHeaderLength)
+	fprintf(stdout, "; %d byte BASIC header.\n", BasicHeaderLength);
 
 
   for (address = StartAddress; (ADDR_T)(address - StartAddress) <
@@ -149,20 +141,21 @@
 	}
 
         if (FindNextEntry (NULL, address, ~0, WRN_INSTR_WRITTEN_TO))
-          fprintf (stdout, "%s; Instruction opcode accessed.\n", lineprefix);
+          fprintf (stdout, "%s; Instruction opcode $%04x accessed.\n",
+                   lineprefix, address);
 
         entry = NULL;
 
         while ((entry = FindNextEntry (entry, address + counter, 0, 0)))
           switch (entry->type) {
           case WRN_PARAM_WRITTEN_TO:
-            fprintf (stdout, "%s; Instruction parameter accessed.\n",
-		     lineprefix);
+            fprintf (stdout, "%s; Instruction parameter $%04x accessed.\n",
+		     lineprefix, address + counter);
             break;
 
           case WRN_PARAM_JUMPED_TO:
-            fprintf (stdout, "%s; Instruction parameter jumped to.\n",
-		     lineprefix);
+            fprintf (stdout, "%s; Instruction parameter $%04x jumped to.\n",
+		     lineprefix, address + counter);
             break;
           }
       }