Modified text output from "RUNV" to

1. Dump register values changed in hex (X2) format
2. Use the layout for the commands similar to the "D"-Dissasemble command.

Remember, command "!" turns on and off listing of memory and instruction details

Author: RonnyA

Program.cs

@@ -169,10 +169,10 @@ static void Main(string[] args)
 
                         case "R":
                         case "RUN":
-                            currentAddress = s8d.Run();
+                            currentAddress = s8d.Run(true, false,showAddress);
                             break;
                         case "RUNV":
-                            currentAddress = s8d.Run(true, true);
+                            currentAddress = s8d.Run(true, true, showAddress);
                             break;
 
                         case "REGS":

S8CPU.cs

@@ -174,13 +174,13 @@ public void ResetRegs()
             state.stdout = "";
         }
 
-        public void Run(bool verbose = false)
+        public void Run(bool verbose = false,bool showaddress=false)        
         {
             ResetRegs();
-            RunUntil(state.memoryUsed, verbose);
+            RunUntil(state.memoryUsed, verbose, showaddress);
         }
 
-        internal bool RunUntil(int stop_pc_at, bool verbose = false)
+        internal bool RunUntil(int stop_pc_at, bool verbose = false, bool showaddress=false)
         {
 
             if (state.memoryUsed == 0)
@@ -208,7 +208,7 @@ internal bool RunUntil(int stop_pc_at, bool verbose = false)
                 S8Instruction s8 = new S8Instruction(opcode, param);
                 state.pc += 2;
 
-                if (!ExecuteInstruction(s8, verbose))
+                if (!ExecuteInstruction(s8, verbose, showaddress))
                 {
                     state.crashed = true;                    
                 }
@@ -226,9 +226,9 @@ public bool Step(int steps=1)
         }
 
 
-        public bool ExecuteInstruction(S8Instruction instr, bool verbose = false)
+        public bool ExecuteInstruction(S8Instruction instr, bool verbose = false, bool showaddress=false)
         {
-            if (verbose) VerboseLogLine(instr);
+            if (verbose) VerboseLogLine(instr, showaddress);
              // HALT
             if (instr.operationClass == 0x0) return false;
 
@@ -379,12 +379,12 @@ public bool ExecuteInstruction(S8Instruction instr, bool verbose = false)
         }
 
         public byte[] prevRegs = new byte[16];
-        private void VerboseLogLine(S8Instruction instr)
+        private void VerboseLogLine(S8Instruction instr, bool showaddress)
         {
             var regs = GetChangedRegs();
             if (!string.IsNullOrEmpty(regs)) Console.WriteLine(regs);
-            instr.DecodeInstruction();
-            Console.WriteLine(instr.DecodedInstruction);
+            instr.DecodeInstruction();            
+            Console.WriteLine(instr.Instruction2Text(state.pc, showaddress));
             prevRegs = (byte[])state.regs.Clone();
         }
 
@@ -394,7 +394,7 @@ private string GetChangedRegs()
             for (int i = 0; i < 15; i++)
             {
                 if (prevRegs[i] != state.regs[i])
-                    changed += $"[r{i}: {prevRegs[i]} -> {state.regs[i]}]";
+                    changed += $"[r{i}: 0x{prevRegs[i]:X2} -> 0x{state.regs[i]:X2}]"; // #TODO Make it hex -> "X2"
             }
             return changed;
         }

S8Dissasembler.cs

@@ -146,49 +146,58 @@ public int Dissasemble(int start, int length, bool showAddress = false, bool all
             }
 
             while (currentAddress < endAddress)
-            {
-                string sHexAddress = currentAddress.ToString("X3");
+            {                
 
                 byte opcode = bytes[currentAddress++];
                 byte param = bytes[currentAddress++];
 
-                s8i = new S8Instruction(opcode, param);
+                s8i = new S8Instruction(opcode, param);                
                 s8i.DecodeInstruction();
 
-                if (s8i.ValidInstruction)
-                {
-                    if (!showAddress)
-                        Console.WriteLine("a" + sHexAddress + ":");
-                }
-                else
-                {
-                    if (!showAddress)
-                        Console.WriteLine("m" + sHexAddress + ":");
-                }
 
-                if (showAddress)
-                {
-                    string sOpcode = opcode.ToString("X2");
-                    string sParam = param.ToString("X2");
-                    Console.Write("A[" + sHexAddress + "] | I[" + sOpcode + " " + sParam + "] ");
-                }
+                Console.WriteLine(s8i.Instruction2Text(currentAddress, showAddress));
 
 
+            }
+            return currentAddress;
 
+        }
 
-                if (s8i.ValidInstruction)
-                {
-                    Console.WriteLine(s8i.DecodedInstruction);
-                }
-                else
-                {
-                    string data = ".DATA 0x" + opcode.ToString("X2");
-                    Console.WriteLine(data + " ; " + s8i.ErrorMessage);
-                }
+        /*
+        internal void PrettyPrintInstruction(S8Instruction s8i, int currentAddress,bool showAddress)
+        {
+            string sHexAddress = currentAddress.ToString("X3");
+
+            if (s8i.ValidInstruction)
+            {
+                if (!showAddress)
+                    Console.WriteLine("a" + sHexAddress + ":");
+            }
+            else
+            {
+                if (!showAddress)
+                    Console.WriteLine("m" + sHexAddress + ":");
             }
-            return currentAddress;
 
+            if (showAddress)
+            {
+                string sOpcode = s8i.Opcode.ToString("X2");
+                string sParam = s8i.Param.ToString("X2");
+                Console.Write("A[" + sHexAddress + "] | I[" + sOpcode + " " + sParam + "] ");
+            }
+
+
+            if (s8i.ValidInstruction)
+            {
+                Console.WriteLine(s8i.DecodedInstruction);
+            }
+            else
+            {
+                string data = ".DATA 0x" + s8i.Opcode.ToString("X2");
+                Console.WriteLine(data + " ; " + s8i.ErrorMessage);
+            }
         }
+        */
 
         internal int SetPC(int start, bool allowOutsideLoadedMemory = false)
         {
@@ -244,12 +253,12 @@ public int GetMaxTicks()
 
 
 
-        public int Run(bool ShowOppgulp = true, bool verbose = false)
+        public int Run(bool ShowOppgulp = true, bool verbose = false, bool showaddress=false)
         {
             var stopwatch = new Stopwatch();
             stopwatch.Start();
 
-            cpu.Run(verbose);
+            cpu.Run(verbose, showaddress);
 
             stopwatch.Stop();
             var elapsed_time = stopwatch.ElapsedMilliseconds;

S8Instruction.cs

@@ -10,6 +10,12 @@ namespace S8Debugger
 {
     public class S8Instruction
     {
+
+        // Helper bytes to keep the original values that created the Instruction
+        public byte Opcode;
+        public byte Param; 
+
+        // decoded fields from opcode + param
         public int operationClass;
         public int operation;
         public int address;
@@ -29,6 +35,10 @@ public void init(byte opcode, byte param)
         {
             ValidInstruction = false;
 
+            Opcode = opcode;
+            Param = param;
+
+
             int instruction = opcode | (param << 8);
 
             operationClass = instruction & 0xf;
@@ -242,9 +252,45 @@ public void DecodeInstruction()
 
             }
 
+            
         }
 
+        public string Instruction2Text(int currentAddress, bool showAddress)
+        {
+            string sHexAddress = currentAddress.ToString("X3");
+            string outStr = string.Empty;
+
+            if (ValidInstruction)
+            {
+                if (!showAddress)
+                    outStr += "a" + sHexAddress + ": \r\n";
+            }
+            else
+            {
+                if (!showAddress)
+                    outStr += "m" + sHexAddress + ": \r\n";
+            }
+
+            if (showAddress)
+            {
+                string sOpcode = Opcode.ToString("X2");
+                string sParam = Param.ToString("X2");
+                outStr += "A[" + sHexAddress + "] | I[" + sOpcode + " " + sParam + "] ";
+            }
+
+
+            if (ValidInstruction)
+            {
+                outStr += DecodedInstruction;
+            }
+            else
+            {
+                string data = ".DATA 0x" + Opcode.ToString("X2");
+                outStr += data + " ; " + ErrorMessage;
+            }
 
+            return outStr;
+        }
 
     };
 }