Compare commits
1 Commits
returnInst
...
gotoInstru
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e58624dacd |
@@ -12,14 +12,14 @@ class Main
|
||||
public static void main(String[] args) {
|
||||
|
||||
ArrayList<Command> program = new ArrayList<>();
|
||||
int input1 = 0x27FF;
|
||||
program.add(CommandDecoder.decode(0x3011));
|
||||
program.add(CommandDecoder.decode(0x2003));
|
||||
program.add(CommandDecoder.decode(0x3022));
|
||||
program.add(CommandDecoder.decode(0x0008));
|
||||
while(true)
|
||||
{
|
||||
program.get(ProgramCounter.getPc()).execute();
|
||||
}
|
||||
Memory.workingRegister = 0xAA;
|
||||
int input1 = 0x2FFF;
|
||||
program.add(CommandDecoder.decode(input1));
|
||||
|
||||
Memory.setPCLATH(0xFF);
|
||||
program.get(0).execute();
|
||||
|
||||
//ProgramCounter.incPC();
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
package de.darkress.pic16f84sim.commands;
|
||||
|
||||
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
|
||||
import de.darkress.pic16f84sim.microcontroller.Stack;
|
||||
|
||||
public class Call extends CommandUtils implements Command
|
||||
{
|
||||
private final int literal;
|
||||
|
||||
public Call(int input)
|
||||
{
|
||||
literal = input & 0x07FF;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute()
|
||||
{
|
||||
Stack.push(ProgramCounter.getPc() + 1);
|
||||
ProgramCounter.setPcFrom11BitLiteral(literal);
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package de.darkress.pic16f84sim.commands;
|
||||
|
||||
import de.darkress.pic16f84sim.microcontroller.Memory;
|
||||
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
|
||||
|
||||
public class Goto extends CommandUtils implements Command
|
||||
@@ -14,6 +15,6 @@ public class Goto extends CommandUtils implements Command
|
||||
@Override
|
||||
public void execute()
|
||||
{
|
||||
ProgramCounter.setPcFrom11BitLiteral(literal);
|
||||
ProgramCounter.setPcForGotoCall(literal);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
package de.darkress.pic16f84sim.commands;
|
||||
|
||||
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
|
||||
import de.darkress.pic16f84sim.microcontroller.Stack;
|
||||
|
||||
public class Return extends CommandUtils implements Command
|
||||
{
|
||||
@Override
|
||||
public void execute()
|
||||
{
|
||||
ProgramCounter.setPcFrom11BitLiteral(Stack.pop());
|
||||
}
|
||||
}
|
||||
@@ -100,7 +100,8 @@ public class CommandDecoder
|
||||
switch(input & 0x3800)
|
||||
{
|
||||
case 0x2000:
|
||||
return new Call(input);
|
||||
//call();
|
||||
break;
|
||||
case 0x2800:
|
||||
return new Goto(input);
|
||||
}
|
||||
@@ -131,7 +132,8 @@ public class CommandDecoder
|
||||
|
||||
if (input == 0x0008)
|
||||
{
|
||||
return new Return();
|
||||
//return();
|
||||
//This is the function name. Do not mistake this for a normal return!
|
||||
}
|
||||
|
||||
if (input == 0x0063)
|
||||
|
||||
@@ -11,7 +11,7 @@ public class ProgramCounter
|
||||
return pc;
|
||||
}
|
||||
|
||||
public static void setPcFrom11BitLiteral(int data)
|
||||
public static void setPcForGotoCall(int data)
|
||||
{
|
||||
int pcl = data & 0x00FF;
|
||||
int pch = Memory.getPCLATH();
|
||||
|
||||
@@ -14,8 +14,9 @@ public class Stack
|
||||
|
||||
public static int pop()
|
||||
{
|
||||
int tmp = stack[stackPointer];
|
||||
pointPrevious();
|
||||
return stack[stackPointer];
|
||||
return tmp;
|
||||
}
|
||||
|
||||
public static int peek()
|
||||
|
||||
Reference in New Issue
Block a user