Compare commits

...

3 Commits

Author SHA1 Message Date
Darkress
f0f6179059 implemented Retlw instruction 2023-05-31 01:43:48 +02:00
darkress
eed0b2e3eb implemented return instruction; Fixed Bug in Stack.pop() (#4)
Co-authored-by: Darkress <30271678+DarkressX@users.noreply.github.com>
Reviewed-on: darkress/pic16f84-sim#4
2023-05-31 01:30:20 +02:00
darkress
666cc2881b callInstruction (#3)
Co-authored-by: Darkress <30271678+DarkressX@users.noreply.github.com>
Reviewed-on: darkress/pic16f84-sim#3
2023-05-30 01:19:58 +02:00
8 changed files with 75 additions and 20 deletions

View File

@@ -12,14 +12,14 @@ class Main
public static void main(String[] args) {
ArrayList<Command> program = new ArrayList<>();
Memory.workingRegister = 0xAA;
int input1 = 0x2FFF;
program.add(CommandDecoder.decode(input1));
Memory.setPCLATH(0xFF);
program.get(0).execute();
//ProgramCounter.incPC();
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();
}
}
}

View File

@@ -0,0 +1,21 @@
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);
}
}

View File

@@ -1,6 +1,5 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
public class Goto extends CommandUtils implements Command
@@ -15,6 +14,6 @@ public class Goto extends CommandUtils implements Command
@Override
public void execute()
{
ProgramCounter.setPcForGotoCall(literal);
ProgramCounter.setPcFrom11BitLiteral(literal);
}
}

View File

@@ -0,0 +1,24 @@
package de.darkress.pic16f84sim.commands;
import de.darkress.pic16f84sim.microcontroller.Memory;
import de.darkress.pic16f84sim.microcontroller.ProgramCounter;
import de.darkress.pic16f84sim.microcontroller.Stack;
public class Retlw extends CommandUtils implements Command
{
private final int literal;
public Retlw(int input)
{
literal = input & 0x00FF;
}
@Override
public void execute()
{
Memory.workingRegister = literal;
ProgramCounter.setPcFrom11BitLiteral(Stack.pop());
//TODO: This may need some rework since it does not really load all 13 Bit into the PC. Only 8 Bit are
// effectively set
}
}

View File

@@ -0,0 +1,15 @@
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());
//TODO: This may need some rework since it does not really load all 13 Bit into the PC. Only 8 Bit are
// effectively set
}
}

View File

@@ -100,8 +100,7 @@ public class CommandDecoder
switch(input & 0x3800)
{
case 0x2000:
//call();
break;
return new Call(input);
case 0x2800:
return new Goto(input);
}
@@ -111,8 +110,7 @@ public class CommandDecoder
case 0x3000:
return new Movlw(input);
case 0x3400:
//retlw();
break;
return new Retlw(input);
}
if ((input | 0x0060) == 0x0060)
@@ -132,8 +130,7 @@ public class CommandDecoder
if (input == 0x0008)
{
//return();
//This is the function name. Do not mistake this for a normal return!
return new Return();
}
if (input == 0x0063)

View File

@@ -11,7 +11,7 @@ public class ProgramCounter
return pc;
}
public static void setPcForGotoCall(int data)
public static void setPcFrom11BitLiteral(int data)
{
int pcl = data & 0x00FF;
int pch = Memory.getPCLATH();

View File

@@ -14,9 +14,8 @@ public class Stack
public static int pop()
{
int tmp = stack[stackPointer];
pointPrevious();
return tmp;
return stack[stackPointer];
}
public static int peek()