pr 27
This commit is contained in:
@@ -47,7 +47,7 @@ pub fn lower_function(core_func: &ir_core::Function) -> Result<ir_vm::Function>
|
||||
|
||||
for instr in &block.instrs {
|
||||
let kind = match instr {
|
||||
ir_core::Instr::PushConst(id) => ir_vm::InstrKind::PushConst(*id),
|
||||
ir_core::Instr::PushConst(id) => ir_vm::InstrKind::PushConst(ir_vm::ConstId(id.0)),
|
||||
ir_core::Instr::Call(func_id, arg_count) => ir_vm::InstrKind::Call {
|
||||
func_id: *func_id,
|
||||
arg_count: *arg_count
|
||||
@@ -71,15 +71,27 @@ pub fn lower_function(core_func: &ir_core::Function) -> Result<ir_vm::Function>
|
||||
ir_core::Instr::And => ir_vm::InstrKind::And,
|
||||
ir_core::Instr::Or => ir_vm::InstrKind::Or,
|
||||
ir_core::Instr::Not => ir_vm::InstrKind::Not,
|
||||
ir_core::Instr::Alloc { .. } => ir_vm::InstrKind::Alloc,
|
||||
ir_core::Instr::BeginPeek { .. } |
|
||||
ir_core::Instr::BeginBorrow { .. } |
|
||||
ir_core::Instr::BeginMutate { .. } => ir_vm::InstrKind::LoadRef(0),
|
||||
ir_core::Instr::EndPeek |
|
||||
ir_core::Instr::EndBorrow |
|
||||
ir_core::Instr::EndMutate => ir_vm::InstrKind::Nop,
|
||||
ir_core::Instr::LoadRef(offset) => ir_vm::InstrKind::LoadRef(*offset),
|
||||
ir_core::Instr::StoreRef(offset) => ir_vm::InstrKind::StoreRef(*offset),
|
||||
ir_core::Instr::Alloc { ty, slots } => ir_vm::InstrKind::Alloc {
|
||||
type_id: ir_vm::TypeId(ty.0),
|
||||
slots: *slots
|
||||
},
|
||||
ir_core::Instr::BeginPeek { .. } => {
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::GateBeginPeek, None));
|
||||
ir_vm::InstrKind::GateLoad { offset: 0 }
|
||||
}
|
||||
ir_core::Instr::BeginBorrow { .. } => {
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::GateBeginBorrow, None));
|
||||
ir_vm::InstrKind::GateLoad { offset: 0 }
|
||||
}
|
||||
ir_core::Instr::BeginMutate { .. } => {
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::GateBeginMutate, None));
|
||||
ir_vm::InstrKind::GateLoad { offset: 0 }
|
||||
}
|
||||
ir_core::Instr::EndPeek => ir_vm::InstrKind::GateEndPeek,
|
||||
ir_core::Instr::EndBorrow => ir_vm::InstrKind::GateEndBorrow,
|
||||
ir_core::Instr::EndMutate => ir_vm::InstrKind::GateEndMutate,
|
||||
ir_core::Instr::LoadRef(offset) => ir_vm::InstrKind::GateLoad { offset: *offset },
|
||||
ir_core::Instr::StoreRef(offset) => ir_vm::InstrKind::GateStore { offset: *offset },
|
||||
ir_core::Instr::Free => ir_vm::InstrKind::Nop,
|
||||
};
|
||||
vm_func.body.push(ir_vm::Instruction::new(kind, None));
|
||||
@@ -133,7 +145,8 @@ fn lower_type(ty: &ir_core::Type) -> ir_vm::Type {
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::ir_core;
|
||||
use crate::ir_core::*;
|
||||
use crate::ir_core::{Block, Instr, Terminator, ConstantValue, Program, ConstPool};
|
||||
use crate::ir_core::ids::{FunctionId, ConstId as CoreConstId};
|
||||
use crate::ir_vm::*;
|
||||
|
||||
#[test]
|
||||
@@ -154,7 +167,7 @@ mod tests {
|
||||
Block {
|
||||
id: 0,
|
||||
instrs: vec![
|
||||
Instr::PushConst(ConstId(0)),
|
||||
Instr::PushConst(CoreConstId(0)),
|
||||
Instr::Call(FunctionId(2), 1),
|
||||
],
|
||||
terminator: Terminator::Jump(1),
|
||||
|
||||
Reference in New Issue
Block a user