language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 21:39:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

wasm_interp: Use an Option instead of separate bool and String

Browse source
This commit is contained in:
Brian Carroll 2022-11-25 01:28:31 +00:00
parent 77ebaba4ff
commit a0fe01dd5f
No known key found for this signature in database
GPG key ID: 5C7B2EC4101703C0
1 changed files with 24 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

45
crates/wasm_interp/src/execute.rs
View file

@ -26,8 +26,7 @@ pub struct ExecutionState<'a> {
pub program_counter: usize, pub program_counter: usize,
block_depth: u32, block_depth: u32,
import_signatures: Vec<'a, u32>, import_signatures: Vec<'a, u32>,
is_debug_mode: bool, debug_string: Option<String>,
debug_string: String,
} }
impl<'a> ExecutionState<'a> { impl<'a> ExecutionState<'a> {
@ -44,8 +43,7 @@ impl<'a> ExecutionState<'a> {
program_counter, program_counter,
block_depth: 0, block_depth: 0,
import_signatures: Vec::new_in(arena), import_signatures: Vec::new_in(arena),
is_debug_mode: false, debug_string: None,
debug_string: String::new(),
} }
} }
@ -105,6 +103,12 @@ impl<'a> ExecutionState<'a> {
&mut program_counter, &mut program_counter,
); );
let debug_string = if is_debug_mode {
Some(String::new())
} else {
None
};
Ok(ExecutionState { Ok(ExecutionState {
memory: Vec::with_capacity_in(mem_bytes as usize, arena), memory: Vec::with_capacity_in(mem_bytes as usize, arena),
call_stack, call_stack,
@ -113,15 +117,14 @@ impl<'a> ExecutionState<'a> {
program_counter, program_counter,
block_depth: 0, block_depth: 0,
import_signatures, import_signatures,
is_debug_mode, debug_string,
debug_string: String::new(),
}) })
} }
fn fetch_immediate_u32(&mut self, module: &WasmModule<'a>) -> u32 { fn fetch_immediate_u32(&mut self, module: &WasmModule<'a>) -> u32 {
let x = u32::parse((), &module.code.bytes, &mut self.program_counter).unwrap(); let x = u32::parse((), &module.code.bytes, &mut self.program_counter).unwrap();
if self.is_debug_mode { if let Some(debug_string) = self.debug_string.as_mut() {
write!(&mut self.debug_string, "{}", x).unwrap(); write!(debug_string, "{}", x).unwrap();
} }
x x
} }
@ -149,9 +152,9 @@ impl<'a> ExecutionState<'a> {
let op_code = OpCode::from(module.code.bytes[self.program_counter]); let op_code = OpCode::from(module.code.bytes[self.program_counter]);
self.program_counter += 1; self.program_counter += 1;
if self.is_debug_mode { if let Some(debug_string) = self.debug_string.as_mut() {
self.debug_string.clear(); debug_string.clear();
write!(&mut self.debug_string, "{:?} ", op_code).unwrap(); write!(debug_string, "{:?} ", op_code).unwrap();
} }
let mut action = Action::Continue; let mut action = Action::Continue;
@ -271,15 +274,15 @@ impl<'a> ExecutionState<'a> {
GROWMEMORY => todo!("{:?} @ {:#x}", op_code, file_offset), GROWMEMORY => todo!("{:?} @ {:#x}", op_code, file_offset),
I32CONST => { I32CONST => {
let value = i32::parse((), &module.code.bytes, &mut self.program_counter).unwrap(); let value = i32::parse((), &module.code.bytes, &mut self.program_counter).unwrap();
if self.is_debug_mode { if let Some(debug_string) = self.debug_string.as_mut() {
write!(&mut self.debug_string, "{}", value).unwrap(); write!(debug_string, "{}", value).unwrap();
} }
self.value_stack.push(Value::I32(value)); self.value_stack.push(Value::I32(value));
} }
I64CONST => { I64CONST => {
let value = i64::parse((), &module.code.bytes, &mut self.program_counter).unwrap(); let value = i64::parse((), &module.code.bytes, &mut self.program_counter).unwrap();
if self.is_debug_mode { if let Some(debug_string) = self.debug_string.as_mut() {
write!(&mut self.debug_string, "{}", value).unwrap(); write!(debug_string, "{}", value).unwrap();
} }
self.value_stack.push(Value::I64(value)); self.value_stack.push(Value::I64(value));
} }
@ -287,8 +290,8 @@ impl<'a> ExecutionState<'a> {
let mut bytes = [0; 4]; let mut bytes = [0; 4];
bytes.copy_from_slice(&module.code.bytes[self.program_counter..][..4]); bytes.copy_from_slice(&module.code.bytes[self.program_counter..][..4]);
let value = f32::from_le_bytes(bytes); let value = f32::from_le_bytes(bytes);
if self.is_debug_mode { if let Some(debug_string) = self.debug_string.as_mut() {
write!(&mut self.debug_string, "{}", value).unwrap(); write!(debug_string, "{}", value).unwrap();
} }
self.value_stack.push(Value::F32(value)); self.value_stack.push(Value::F32(value));
self.program_counter += 4; self.program_counter += 4;
@ -297,8 +300,8 @@ impl<'a> ExecutionState<'a> {
let mut bytes = [0; 8]; let mut bytes = [0; 8];
bytes.copy_from_slice(&module.code.bytes[self.program_counter..][..8]); bytes.copy_from_slice(&module.code.bytes[self.program_counter..][..8]);
let value = f64::from_le_bytes(bytes); let value = f64::from_le_bytes(bytes);
if self.is_debug_mode { if let Some(debug_string) = self.debug_string.as_mut() {
write!(&mut self.debug_string, "{}", value).unwrap(); write!(debug_string, "{}", value).unwrap();
} }
self.value_stack.push(Value::F64(value)); self.value_stack.push(Value::F64(value));
self.program_counter += 8; self.program_counter += 8;
@ -446,10 +449,10 @@ impl<'a> ExecutionState<'a> {
F64REINTERPRETI64 => todo!("{:?} @ {:#x}", op_code, file_offset), F64REINTERPRETI64 => todo!("{:?} @ {:#x}", op_code, file_offset),
} }
if self.is_debug_mode { if let Some(debug_string) = &self.debug_string {
let base = self.call_stack.value_stack_base(); let base = self.call_stack.value_stack_base();
let slice = self.value_stack.get_slice(base as usize); let slice = self.value_stack.get_slice(base as usize);
eprintln!("{:#07x} {:17} {:?}", file_offset, self.debug_string, slice); eprintln!("{:#07x} {:17} {:?}", file_offset, debug_string, slice);
} }
action action