xeos
/
wasmi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean.

This commit is contained in:
Sergey Pepyakin 2019-04-16 16:14:00 +02:00
parent e4dcf553a2
commit e7381bfdde
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/prepare/compile.rs
View File

@ -144,10 +144,10 @@ impl Compiler {
context.step(instruction)?; context.step(instruction)?;
let (if_not, end_label) = { let (if_not, end_label) = {
// TODO: We will have to place this before validation step to ensure that let top_label = self.label_stack.last().expect(
// the block type is indeed if_true. "label_stack should reflect the frame stack;
frame stack is never empty while being processed; qed",
let top_label = self.label_stack.last().unwrap(); );
let (if_not, end_label) = match *top_label { let (if_not, end_label) = match *top_label {
BlockFrameType::IfTrue { if_not, end_label } => (if_not, end_label), BlockFrameType::IfTrue { if_not, end_label } => (if_not, end_label),
_ => panic!("validation ensures that the top frame is actually if_true"), _ => panic!("validation ensures that the top frame is actually if_true"),
@ -187,11 +187,10 @@ impl Compiler {
context.step(instruction)?; context.step(instruction)?;
// let started_with = started_with.expect("validation ensures that it is ok"); let frame_type = self.label_stack.last().cloned().expect(
"label_stack should reflect the frame stack;
// TODO: We will have to place this before validation step to ensure that frame stack is never empty while being processed; qed",
// the block type is indeed if_true. );
let frame_type = self.label_stack.last().cloned().unwrap();
if let BlockFrameType::IfTrue { if_not, .. } = frame_type { if let BlockFrameType::IfTrue { if_not, .. } = frame_type {
// Resolve `if_not` label. If the `if's` condition doesn't hold the control will jump // Resolve `if_not` label. If the `if's` condition doesn't hold the control will jump
@ -206,7 +205,6 @@ impl Compiler {
} }
if let Some(drop_keep) = return_drop_keep { if let Some(drop_keep) = return_drop_keep {
// TODO: The last one.
// It was the last instruction. Emit the explicit return instruction. // It was the last instruction. Emit the explicit return instruction.
let drop_keep = drop_keep.expect("validation should ensure this doesn't fail"); let drop_keep = drop_keep.expect("validation should ensure this doesn't fail");
self.sink.emit(isa::InstructionInternal::Return(drop_keep)); self.sink.emit(isa::InstructionInternal::Return(drop_keep));