From cc04c3e826fb8a30ac0a6c270a6fae7d7e94a6ae Mon Sep 17 00:00:00 2001
From: thrust26 <tjentzsch@yahoo.de>
Date: Tue, 17 Oct 2017 19:07:15 +0200
Subject: [PATCH] missing "Start" label in disassembly fixed negative block
 cycle count displayed correctly

---
 src/debugger/CartDebug.cxx | 9 ++-------
 src/debugger/DiStella.cxx  | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/debugger/CartDebug.cxx b/src/debugger/CartDebug.cxx
index 45e18ccfc..0884948c0 100644
--- a/src/debugger/CartDebug.cxx
+++ b/src/debugger/CartDebug.cxx
@@ -686,9 +686,6 @@ string CartDebug::loadListFile()
   // The default naming/location for list files is the ROM dir based on the
   // actual ROM filename
 
-  myUserAddresses.clear();
-  myUserLabels.clear();
-
   if(myListFile == "")
   {
     FilesystemNode lst(myOSystem.romFile().getPathWithExt("") + ".lst");
@@ -703,8 +700,6 @@ string CartDebug::loadListFile()
   if(!in.is_open())
     return DebuggerParser::red("list file '" + node.getShortPath() + "' not readable");
 
-  //myUserCLabels.clear();
-
   while(!in.eof())
   {
     string line, addr_s;
@@ -765,8 +760,8 @@ string CartDebug::loadSymbolFile()
   if(!in.is_open())
     return DebuggerParser::red("symbol file '" + node.getShortPath() + "' not readable");
 
-  //myUserAddresses.clear();
-  //myUserLabels.clear();
+  myUserAddresses.clear();
+  myUserLabels.clear();
 
   while(!in.eof())
   {
diff --git a/src/debugger/DiStella.cxx b/src/debugger/DiStella.cxx
index c9c470185..f253e9997 100644
--- a/src/debugger/DiStella.cxx
+++ b/src/debugger/DiStella.cxx
@@ -107,7 +107,7 @@ void DiStella::disasm(uInt32 distart, int pass)
 
   uInt8 opcode, d1;
   uInt16 ad;
-  uInt32 cycles = 0;
+  Int32 cycles = 0;
   AddressingMode addrMode;
   int labelFound = 0;
   stringstream nextLine, nextLineBytes;