Skip to content
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

Jump to bottom

Implement OP_WITHIN opcode #28

Closed
wants to merge 10 commits into from
Closed

Implement OP_WITHIN opcode #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5cb66db
implement greater than
supreme2580 Jul 25, 2024
20f2e13
formatting
supreme2580 Jul 25, 2024
62f8808
op_within
supreme2580 Jul 25, 2024
5c5995e
formatting
supreme2580 Jul 25, 2024
235d58e
renamed variables
supreme2580 Jul 25, 2024
f4bde7c
rearranged
supreme2580 Jul 25, 2024
0db9527
op_code greaterthan
supreme2580 Jul 26, 2024
51ca4fc
conflict resolution
supreme2580 Jul 26, 2024
0996527
opcode_within
supreme2580 Jul 26, 2024
b1ac568
fixed minor issue
supreme2580 Jul 26, 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
2 changes: 2 additions & 0 deletions src/compiler.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ pub impl CompilerTraitImpl of CompilerTrait {
opcodes.insert('OP_DEPTH', Opcode::OP_DEPTH);
opcodes.insert('OP_1ADD', Opcode::OP_1ADD);
opcodes.insert('OP_ADD', Opcode::OP_ADD);
opcodes.insert('OP_GREATERTHAN', Opcode::OP_GREATERTHAN);
opcodes.insert('OP_MAX', Opcode::OP_MAX);
opcodes.insert('OP_WITHIN', Opcode::OP_WITHIN);
Compiler { opcodes }
}

Expand Down
26 changes: 25 additions & 1 deletion src/opcodes/opcodes.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ pub mod Opcode {
pub const OP_DEPTH: u8 = 116;
pub const OP_1ADD: u8 = 139;
pub const OP_ADD: u8 = 147;
pub const OP_GREATERTHAN: u8 = 160;
pub const OP_MAX: u8 = 164;
pub const OP_WITHIN: u8 = 165;

use shinigami::engine::Engine;
use shinigami::stack::ScriptStackTrait;
Expand Down Expand Up @@ -186,11 +188,12 @@ pub mod Opcode {
157 => not_implemented(ref engine),
158 => not_implemented(ref engine),
159 => not_implemented(ref engine),
160 => not_implemented(ref engine),
160 => opcode_great_than(ref engine),
161 => not_implemented(ref engine),
162 => not_implemented(ref engine),
163 => not_implemented(ref engine),
164 => opcode_max(ref engine),
165 => opcode_within(ref engine),
_ => not_implemented(ref engine)
}
}
Expand Down Expand Up @@ -225,6 +228,16 @@ pub mod Opcode {
panic!("Opcode not implemented");
}

fn opcode_great_than(ref engine: Engine) {
let a = engine.dstack.pop_int();
let b = engine.dstack.pop_int();
engine.dstack.push_int(if b > a {
1
} else {
0
});
}

fn opcode_max(ref engine: Engine) {
let a = engine.dstack.pop_int();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be prefered to make the variable naming here more explicit, like min_value, max_value, ...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will rename the variables now

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi I just pushed an update to rename the variables to be more explicit

let b = engine.dstack.pop_int();
Expand All @@ -234,4 +247,15 @@ pub mod Opcode {
b
});
}

fn opcode_within(ref engine: Engine) {
let max = engine.dstack.pop_int();
let min = engine.dstack.pop_int();
let value = engine.dstack.pop_int();
engine.dstack.push_int(if value >= min && value < max {
1
} else {
0
});
}
}
37 changes: 37 additions & 0 deletions src/opcodes/tests/test_opcodes.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,24 @@ fn test_op_add() {
assert_eq!(dstack, expected_stack.span(), "Stack is not equal to expected");
}

#[test]
fn test_op_greater_than() {
let program = "OP_1 OP_0 OP_GREATERTHAN";
let mut compiler = CompilerTraitImpl::new();
let bytecode = compiler.compile(program);
let mut engine = EngineTraitImpl::new(bytecode);
let _ = engine.step();
let _ = engine.step();
let res = engine.step();
assert!(res, "Execution of run failed");

let dstack = engine.get_dstack();
assert_eq!(dstack.len(), 1, "Stack length is not 1");

let expected_stack = array!["\0\0\0\0\0\0\0\x01"];
assert_eq!(dstack, expected_stack.span(), "Stack is not equal to expected");
}

#[test]
fn test_op_max() {
let program = "OP_1 OP_0 OP_MAX";
Expand All @@ -70,6 +88,25 @@ fn test_op_max() {
assert_eq!(dstack, expected_stack.span(), "Stack is not equal to expected");
}

#[test]
fn test_op_within() {
let program = "OP_1 OP_0 OP_1 OP_WITHIN";
let mut compiler = CompilerTraitImpl::new();
let bytecode = compiler.compile(program);
let mut engine = EngineTraitImpl::new(bytecode);
let _ = engine.step();
let _ = engine.step();
let _ = engine.step();
let res = engine.step();
assert!(res, "Execution of run failed");

let dstack = engine.get_dstack();
assert_eq!(dstack.len(), 1, "Stack length is not 1");

let expected_stack = array!["\0\0\0\0\0\0\0\0"];
assert_eq!(dstack, expected_stack.span(), "Stack is not equal to expected");
}

fn test_op_depth_empty_stack() {
let program = "OP_DEPTH";
let mut compiler = CompilerTraitImpl::new();
Expand Down