Skip to content

implement dup instructions #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Aug 11, 2024
Merged

implement dup instructions #47

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
759eb28
feat: implement dup_x1 instruction
itsu-dev Aug 11, 2024
585ea73
feat: implement dup_x2 instruction
itsu-dev Aug 11, 2024
879b2f9
refactor: dup_x1
itsu-dev Aug 11, 2024
5483669
feat: implement dup_2 instruction
itsu-dev Aug 11, 2024
2fec33f
feat: implement dup2_x1 instruction
itsu-dev Aug 11, 2024
9b6fa77
feat: implement dup2_x1 instruction
itsu-dev Aug 11, 2024
77d056b
feat: implement dup2_x2 instruction
itsu-dev Aug 11, 2024
8e82f91
refactor: remove redundant comment
itsu-dev Aug 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
194 changes: 192 additions & 2 deletions src/execution/interpreter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ pub enum Value {
Reference(Option<usize>),
}

impl Value {
pub fn is_category_1(&self) -> bool {
match self {
Value::Boolean(_) | Value::Byte(_) | Value::Char(_) | Value::Short(_) | Value::Int(_) | Value::Float(_) | Value::Reference(_) => true,
_ => false,
}
}
}

pub enum ValueType {
Boolean,
Byte,
Expand Down Expand Up @@ -944,7 +953,188 @@ pub fn interpret(thread: &mut Thread, frame: Rc<Mutex<StackFrame>>, class: Rc<Ru
push!(value2);
}

// TODO: Dup Instructions
Some(Opcode::DupX1) => {
let value1 = pop!().unwrap();
let value2 = pop!().unwrap();

if !value1.is_category_1() || !value2.is_category_1() {
error!("Invalid operand types for DupX1");
panic!();
}

let cloned_value1 = value1.clone();
push!(cloned_value1);
push!(value2);
push!(value1);
}

Some(Opcode::DupX2) => {
let value1 = pop!().unwrap();
let value2 = pop!().unwrap();
let value3 = pop!();

// form1
if let Some(value3) = value3 {
if value1.is_category_1() && value2.is_category_1() && value3.is_category_1() {
let cloned_value1 = value1.clone();
push!(cloned_value1);
push!(value3);
push!(value2);
push!(value1);
break;
}
}

if let Some(value3) = value3 {
push!(value3);
}

// form2
if value1.is_category_1() && !value2.is_category_1() {
let cloned_value1 = value1.clone();
push!(cloned_value1);
push!(value2);
push!(value1);
break;
}

error!("Invalid operand types for DupX2");
panic!();
}

Some(Opcode::Dup2) => {
let value1 = pop!().unwrap();
let value2 = pop!();

// form1
if let Some(value2) = value2 {
if value1.is_category_1() && value2.is_category_1() {
let cloned_value1 = value1.clone();
let cloned_value2 = value2.clone();
push!(cloned_value2);
push!(cloned_value1);
push!(value2);
push!(value1);
break;
}
}

if let Some(value2) = value2 {
push!(value2);
}

// form2
if !value1.is_category_1() {
let cloned_value1 = value1.clone();
push!(cloned_value1);
push!(value1);
break;
}

error!("Invalid operand types for Dup2");
panic!();
}

Some(Opcode::Dup2X1) => {
let value1 = pop!().unwrap();
let value2 = pop!().unwrap();
let value3 = pop!();

// form1
if let Some(value3) = value3 {
if value1.is_category_1() && value2.is_category_1() && value3.is_category_1() {
let cloned_value1 = value1.clone();
let cloned_value2 = value2.clone();
push!(cloned_value2);
push!(cloned_value1);
push!(value3);
push!(value2);
push!(value1);
break;
}
}

if let Some(value3) = value3 {
push!(value3);
}

// form2
if !value1.is_category_1() && value2.is_category_1() {
let cloned_value1 = value1.clone();
push!(cloned_value1);
push!(value2);
push!(value1);
break;
}

error!("Invalid operand types for Dup2X1");
panic!();
}

Some(Opcode::Dup2X2) => {
let value1 = pop!().unwrap();
let value2 = pop!().unwrap();
let value3 = pop!();
let value4 = pop!();

// form1
if let Some(value4) = value4 {
let value3 = value3.unwrap();
if value1.is_category_1() && value2.is_category_1() && value3.is_category_1() && value4.is_category_1() {
let cloned_value1 = value1.clone();
let cloned_value2 = value2.clone();
push!(cloned_value2);
push!(cloned_value1);
push!(value4);
push!(value3);
push!(value2);
push!(value1);
break;
}
}

if let Some(value4) = value4 {
push!(value4);
}

// form2
if let Some(value3) = value3 {
if !value1.is_category_1() && value2.is_category_1() && value3.is_category_1() {
let cloned_value1 = value1.clone();
push!(cloned_value1);
push!(value3);
push!(value2);
push!(value1);
break;
} else if value1.is_category_1() && value2.is_category_1() && !value3.is_category_1() {
// form3
let cloned_value1 = value1.clone();
let cloned_value2 = value2.clone();
push!(cloned_value2);
push!(cloned_value1);
push!(value3);
push!(value2);
push!(value1);
break;
}
}

if let Some(value3) = value3 {
push!(value3);
}

// form4
if !value1.is_category_1() && !value2.is_category_1() {
let cloned_value1 = value1.clone();
push!(cloned_value1);
push!(value2);
push!(value1);
break;
}

error!("Invalid operand types for Dup2X2");
panic!();
}

Some(Opcode::Swap) => {
let value1 = pop!().unwrap();
Expand Down Expand Up @@ -2091,7 +2281,7 @@ pub fn interpret(thread: &mut Thread, frame: Rc<Mutex<StackFrame>>, class: Rc<Ru

pc += 2;

let count = read_byte!();
let _count = read_byte!();
pc += 1;

let _ = read_byte!();
Expand Down
Loading