increase Cycles after every Instruction

de/darkress/pic16f84sim/Main.java

@@ -2,28 +2,22 @@ package de.darkress.pic16f84sim;
 
 import de.darkress.pic16f84sim.commands.Command;
 import de.darkress.pic16f84sim.decoder.CommandDecoder;
-import de.darkress.pic16f84sim.microcontroller.Cycles;
 import de.darkress.pic16f84sim.microcontroller.Memory;
 import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
-import de.darkress.pic16f84sim.parser.Parser;
 
-import java.util.concurrent.TimeUnit;
+import java.util.ArrayList;
 
 class Main
 {
-    public static void main(String[] args) throws InterruptedException {
+    public static void main(String[] args) {
 
-        Command[] program = Parser.parser("de/darkress/pic16f84sim/TPicSim101.LST");
+        ArrayList<Command> program = new ArrayList<>();
-        /*for(int i = 0; i < instructions.size(); i++)
+        Memory.workingRegister = 0x01;
+        Memory.setRegister(0x14, 0xA7); //240 << 224
+        program.add(CommandDecoder.decode(0x1C94));
+        for(int i = 0; i < program.size(); i++)
         {
-            program.add(CommandDecoder.decode(instructions.get(i)));
+            program.get(ProgramCounter.getPc()).execute();
-        }*/
-
-        while(ProgramCounter.getPc() < 1024)
-        {
-            program[ProgramCounter.getPc()].execute();
-            System.out.println(Memory.workingRegister + " " + Cycles.getCycles());
-            System.out.println(Memory.getPCLATH() + " " + Memory.getPCL() + "\n");
         }
     }
 }

de/darkress/pic16f84sim/microcontroller/Memory.java

@@ -62,6 +62,7 @@ public class Memory
         if(address == 0x2) //Check if PCL is destination
         {
             ProgramCounter.loadPc();
+            Cycles.addToCycles(1);
         }
     }
 

de/darkress/pic16f84sim/parser/Parser.java

@@ -1,8 +1,5 @@
 package de.darkress.pic16f84sim.parser;
 
-import de.darkress.pic16f84sim.commands.Command;
-import de.darkress.pic16f84sim.decoder.CommandDecoder;
-
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
@@ -11,9 +8,9 @@ import java.util.Scanner;
 
 public class Parser
 {
-    public static Command[] parser(String filePath)
+    public static List<Integer> parser(String filePath)
     {
-        ArrayList<String> instructions = new ArrayList<>();
+        ArrayList<Integer> program = new ArrayList<>();
         try {
             File file = new File(filePath);
             Scanner scanner = new Scanner(file);
@@ -22,10 +19,8 @@ public class Parser
                 if(!data.startsWith(" "))
                 {
                     String commandAndParametersString = "0x" + data.split(" ")[1];
-                    String instructionAddress = "0x" + data.split(" ")[0];
+                    int commandAndParameters = Integer.decode(commandAndParametersString);
-                    //int commandAndParameters = Integer.decode(commandAndParametersString);
+                    program.add(commandAndParameters);
-                    //program.add(commandAndParameters);
-                    instructions.add(instructionAddress + ", " + commandAndParametersString);
                 }
             }
             scanner.close();
@@ -33,16 +28,6 @@ public class Parser
             System.out.println("An error occurred.");
             e.printStackTrace();
         }
-
-        Command[] program = new Command[1024];
-
-        for(int i = 0; i < instructions.size(); i++)
-        {
-            int instructionAddress = Integer.decode(instructions.get(i).split(", ")[0]);
-            int instruction = Integer.decode(instructions.get(i).split(", ")[1]);
-            program[instructionAddress] = CommandDecoder.decode(instruction);
-        }
-
         return program;
     }
 }