Compare commits

..

1 Commits

Author SHA1 Message Date
darkress
e3a59af35e Added some more cli output 2023-06-19 10:33:28 +02:00
2 changed files with 7 additions and 18 deletions

View File

@@ -7,13 +7,11 @@ import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
import de.darkress.pic16f84sim.microcontroller.Watchdog; import de.darkress.pic16f84sim.microcontroller.Watchdog;
import de.darkress.pic16f84sim.parser.Parser; import de.darkress.pic16f84sim.parser.Parser;
import java.util.Scanner;
class Main class Main
{ {
public static void main(String[] args) { public static void main(String[] args) {
Command[] program = Parser.parser("de/darkress/pic16f84sim/TestPrograms/TPicSim8.LST"); Command[] program = Parser.parser("de/darkress/pic16f84sim/TestPrograms/TPicSim11.LST");
Memory.initMemory(); Memory.initMemory();
@@ -26,15 +24,7 @@ class Main
String[] instructionName = program[ProgramCounter.getPc()].getClass().toString().split("\\."); String[] instructionName = program[ProgramCounter.getPc()].getClass().toString().split("\\.");
System.out.println("Command: " + instructionName[instructionName.length -1]); System.out.println("Command: " + instructionName[instructionName.length -1]);
program[ProgramCounter.getPc()].execute(); program[ProgramCounter.getPc()].execute();
Cli.showDefaultRegisters(); Cli.showRegisters();
askForInput();
} }
} }
private static void askForInput() {
System.out.println("Wanna give some more input?:");
Scanner scanner = new Scanner(System.in);
String userInput = scanner.nextLine();
if(!(userInput.equals(""))) askForInput();
}
} }

View File

@@ -1,13 +1,10 @@
package de.darkress.pic16f84sim.cli; package de.darkress.pic16f84sim.cli;
import de.darkress.pic16f84sim.microcontroller.Cycles; import de.darkress.pic16f84sim.microcontroller.*;
import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.Stack;
import de.darkress.pic16f84sim.microcontroller.Timer;
public class Cli public class Cli
{ {
public static void showDefaultRegisters() { public static void showRegisters() {
printf(Memory.workingRegister, "W-Reg", true); printf(Memory.workingRegister, "W-Reg", true);
printf(Cycles.getCycles(), "Cycles", false); printf(Cycles.getCycles(), "Cycles", false);
System.out.printf("%n"); System.out.printf("%n");
@@ -28,7 +25,9 @@ public class Cli
System.out.printf("%n"); System.out.printf("%n");
printf(Memory.getRegister(0x0B), "IntCon", true); printf(Memory.getRegister(0x0B), "IntCon", true);
System.out.printf("%n"); System.out.printf("%n");
printf(ProgramCounter.getPc(), "PC", false);
printf(Watchdog.getWatchdogTimer(), "Watchdog", false);
System.out.printf("%n");
} }
private static void printf(int value, String description, boolean hex) { private static void printf(int value, String description, boolean hex) {