Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
856 changes: 664 additions & 192 deletions bitcoin-script-riscv/src/riscv/challenges.rs

Large diffs are not rendered by default.

11 changes: 4 additions & 7 deletions bitcoin-script-riscv/src/riscv/instructions_load.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use bitcoin_script_stack::{stack::{StackTracker, StackVariable}};
use bitcoin_script_stack::stack::{StackTracker, StackVariable};
use bitvmx_cpu_definitions::memory::{MemoryAccessType, MemoryWitness};
use riscv_decode::Instruction::{self, *};

Expand Down Expand Up @@ -130,7 +130,7 @@ pub fn op_load_micro_0_missaligned(
MemoryAccessType::Register,
),
);

let (nibs, max_extra, prepad, unsigned) = match instruction {
Lb(_) => (2, 0, 6, false),
Lh(_) => (4, 2, 4, false),
Expand Down Expand Up @@ -240,7 +240,7 @@ pub fn op_load_micro_0_aligned(
let write_addr = number_u32_partial(&mut if_false, base_register_address, 6);
if_false.move_var(rd);
if_false.join(write_addr);

//calculate the byte to be stored (with proper bit extension)
if_false.move_var(trace_read.read_2_value);
if_false.move_var(alignment); //restore alignment
Expand All @@ -259,10 +259,7 @@ pub fn op_load_micro_0_aligned(
if_is_register_zero,
if_false,
4,
vec![
(8, "write_add".to_string()),
(8, "write_value".to_string()),
],
vec![(8, "write_add".to_string()), (8, "write_value".to_string())],
0,
);

Expand Down
5 changes: 4 additions & 1 deletion bitcoin-script-riscv/src/riscv/memory_alignment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ pub fn verify_alignment(stack: &mut StackTracker, mem_address: StackVariable) {
stack.drop(lower_half_nibble_table);
}

pub fn clear_least_significant_bit(stack: &mut StackTracker, mem_address: StackVariable) -> StackVariable {
pub fn clear_least_significant_bit(
stack: &mut StackTracker,
mem_address: StackVariable,
) -> StackVariable {
let parts = stack.explode(mem_address);
let table = load_clear_lsb_table(stack);

Expand Down
Loading