Skip to content

Jm/more examples #17

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

Merged
jmecom merged 2 commits into from
Dec 28, 2025
Merged

Jm/more examples #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
080bede
Add intrinsic registry and implement string starts_with
Dec 28, 2025
87070de
Refine intrinsics layout and ResultString handling
Dec 28, 2025
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
170 changes: 81 additions & 89 deletions capc/src/codegen/emit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@ use super::{
use super::layout::{align_to, resolve_struct_layout, type_layout_for_abi};
use super::sig_to_clif;

#[derive(Copy, Clone, Debug)]
struct ResultStringSlots {
slot_ptr: ir::StackSlot,
slot_len: ir::StackSlot,
slot_err: ir::StackSlot,
ptr_align: u32,
len_align: u32,
err_align: u32,
}


/// Emit a single HIR statement.
pub(super) fn emit_hir_stmt(
Expand Down Expand Up @@ -607,39 +617,15 @@ fn emit_hir_expr_inner(
}

// Handle result out-parameters (same logic as AST version)
let mut out_slots = None;
let mut out_slots: Option<ResultStringSlots> = None;
let mut result_out = None;
let abi_sig = info.abi_sig.as_ref().unwrap_or(&info.sig);

if abi_sig.ret == AbiType::ResultString {
let ptr_ty = module.isa().pointer_type();
let ptr_align = ptr_ty.bytes() as u32;
let len_bytes = result_string_len_bytes();
let len_align = len_bytes;
let err_align = 4u32;

let slot_ptr = builder.create_sized_stack_slot(ir::StackSlotData::new(
ir::StackSlotKind::ExplicitSlot,
aligned_slot_size(ptr_ty.bytes() as u32, ptr_align),
));
let slot_len = builder.create_sized_stack_slot(ir::StackSlotData::new(
ir::StackSlotKind::ExplicitSlot,
aligned_slot_size(len_bytes, len_align),
));
let slot_err = builder.create_sized_stack_slot(ir::StackSlotData::new(
ir::StackSlotKind::ExplicitSlot,
aligned_slot_size(4, err_align),
));

let ptr_ptr = aligned_stack_addr(builder, slot_ptr, ptr_align, ptr_ty);
let len_ptr = aligned_stack_addr(builder, slot_len, len_align, ptr_ty);
let err_ptr = aligned_stack_addr(builder, slot_err, err_align, ptr_ty);

args.push(ptr_ptr);
args.push(len_ptr);
args.push(err_ptr);

out_slots = Some((slot_ptr, slot_len, slot_err));
let slots = result_string_slots(builder, ptr_ty);
push_result_string_out_params(builder, ptr_ty, &slots, &mut args);
out_slots = Some(slots);
}

if let AbiType::ResultOut(ok_ty, err_ty) = &abi_sig.ret {
Expand Down Expand Up @@ -698,25 +684,10 @@ fn emit_hir_expr_inner(
let tag = results
.get(0)
.ok_or_else(|| CodegenError::Codegen("missing result tag".to_string()))?;
let (slot_ptr, slot_len, slot_err) =
let slots =
out_slots.ok_or_else(|| CodegenError::Codegen("missing slots".to_string()))?;
let ptr_ty = module.isa().pointer_type();
let ptr_align = ptr_ty.bytes() as u32;
let len_align = result_string_len_bytes();
let err_align = 4u32;
let ptr_addr = aligned_stack_addr(builder, slot_ptr, ptr_align, ptr_ty);
let len_addr = aligned_stack_addr(builder, slot_len, len_align, ptr_ty);
let err_addr = aligned_stack_addr(builder, slot_err, err_align, ptr_ty);
let ptr =
builder
.ins()
.load(module.isa().pointer_type(), MemFlags::new(), ptr_addr, 0);
let len = builder
.ins()
.load(ir::types::I64, MemFlags::new(), len_addr, 0);
let err = builder
.ins()
.load(ir::types::I32, MemFlags::new(), err_addr, 0);
let (ptr, len, err) = read_result_string_slots(builder, ptr_ty, &slots);
match &info.sig.ret {
AbiType::Result(ok_ty, err_ty) => {
if **ok_ty != AbiType::String || **err_ty != AbiType::I32 {
Expand Down Expand Up @@ -1495,6 +1466,65 @@ fn result_string_len_bytes() -> u32 {
8
}

fn result_string_slots(builder: &mut FunctionBuilder, ptr_ty: Type) -> ResultStringSlots {
let ptr_align = ptr_ty.bytes() as u32;
let len_bytes = result_string_len_bytes();
let len_align = len_bytes;
let err_align = 4u32;
let slot_ptr = builder.create_sized_stack_slot(ir::StackSlotData::new(
ir::StackSlotKind::ExplicitSlot,
aligned_slot_size(ptr_ty.bytes() as u32, ptr_align),
));
let slot_len = builder.create_sized_stack_slot(ir::StackSlotData::new(
ir::StackSlotKind::ExplicitSlot,
aligned_slot_size(len_bytes, len_align),
));
let slot_err = builder.create_sized_stack_slot(ir::StackSlotData::new(
ir::StackSlotKind::ExplicitSlot,
aligned_slot_size(4, err_align),
));
ResultStringSlots {
slot_ptr,
slot_len,
slot_err,
ptr_align,
len_align,
err_align,
}
}

fn push_result_string_out_params(
builder: &mut FunctionBuilder,
ptr_ty: Type,
slots: &ResultStringSlots,
args: &mut Vec<Value>,
) {
let ptr_ptr = aligned_stack_addr(builder, slots.slot_ptr, slots.ptr_align, ptr_ty);
let len_ptr = aligned_stack_addr(builder, slots.slot_len, slots.len_align, ptr_ty);
let err_ptr = aligned_stack_addr(builder, slots.slot_err, slots.err_align, ptr_ty);
args.push(ptr_ptr);
args.push(len_ptr);
args.push(err_ptr);
}

fn read_result_string_slots(
builder: &mut FunctionBuilder,
ptr_ty: Type,
slots: &ResultStringSlots,
) -> (Value, Value, Value) {
let ptr_addr = aligned_stack_addr(builder, slots.slot_ptr, slots.ptr_align, ptr_ty);
let len_addr = aligned_stack_addr(builder, slots.slot_len, slots.len_align, ptr_ty);
let err_addr = aligned_stack_addr(builder, slots.slot_err, slots.err_align, ptr_ty);
let ptr = builder.ins().load(ptr_ty, MemFlags::new(), ptr_addr, 0);
let len = builder
.ins()
.load(ir::types::I64, MemFlags::new(), len_addr, 0);
let err = builder
.ins()
.load(ir::types::I32, MemFlags::new(), err_addr, 0);
(ptr, len, err)
}

/// Compute pointer/len offsets for the string layout.
fn string_offsets(ptr_ty: Type) -> (u32, u32) {
let ptr_size = ptr_ty.bytes() as u32;
Expand Down Expand Up @@ -2293,37 +2323,14 @@ pub(super) fn emit_runtime_wrapper_call(
) -> Result<ValueRepr, CodegenError> {
ensure_abi_sig_handled(info)?;
let abi_sig = info.abi_sig.as_ref().unwrap_or(&info.sig);
let mut out_slots = None;
let mut out_slots: Option<ResultStringSlots> = None;
let mut result_out = None;

if abi_sig.ret == AbiType::ResultString {
let ptr_ty = module.isa().pointer_type();
let ptr_align = ptr_ty.bytes() as u32;
let len_bytes = result_string_len_bytes();
let len_align = len_bytes;
let err_align = 4u32;
let slot_ptr = builder.create_sized_stack_slot(ir::StackSlotData::new(
ir::StackSlotKind::ExplicitSlot,
aligned_slot_size(ptr_ty.bytes(), ptr_align),
));
let slot_len = builder.create_sized_stack_slot(ir::StackSlotData::new(
ir::StackSlotKind::ExplicitSlot,
aligned_slot_size(len_bytes, len_align),
));
let slot_err = builder.create_sized_stack_slot(ir::StackSlotData::new(
ir::StackSlotKind::ExplicitSlot,
aligned_slot_size(4, err_align),
));

let ptr_ptr = aligned_stack_addr(builder, slot_ptr, ptr_align, ptr_ty);
let len_ptr = aligned_stack_addr(builder, slot_len, len_align, ptr_ty);
let err_ptr = aligned_stack_addr(builder, slot_err, err_align, ptr_ty);

args.push(ptr_ptr);
args.push(len_ptr);
args.push(err_ptr);

out_slots = Some((slot_ptr, slot_len, slot_err));
let slots = result_string_slots(builder, ptr_ty);
push_result_string_out_params(builder, ptr_ty, &slots, &mut args);
out_slots = Some(slots);
}

if let AbiType::ResultOut(ok_ty, err_ty) = &abi_sig.ret {
Expand Down Expand Up @@ -2375,24 +2382,9 @@ pub(super) fn emit_runtime_wrapper_call(
let tag = results
.get(0)
.ok_or_else(|| CodegenError::Codegen("missing result tag".to_string()))?;
let (slot_ptr, slot_len, slot_err) =
out_slots.ok_or_else(|| CodegenError::Codegen("missing slots".to_string()))?;
let slots = out_slots.ok_or_else(|| CodegenError::Codegen("missing slots".to_string()))?;
let ptr_ty = module.isa().pointer_type();
let ptr_align = ptr_ty.bytes() as u32;
let len_align = result_string_len_bytes();
let err_align = 4u32;
let ptr_addr = aligned_stack_addr(builder, slot_ptr, ptr_align, ptr_ty);
let len_addr = aligned_stack_addr(builder, slot_len, len_align, ptr_ty);
let err_addr = aligned_stack_addr(builder, slot_err, err_align, ptr_ty);
let ptr = builder
.ins()
.load(module.isa().pointer_type(), MemFlags::new(), ptr_addr, 0);
let len = builder
.ins()
.load(ir::types::I64, MemFlags::new(), len_addr, 0);
let err = builder
.ins()
.load(ir::types::I32, MemFlags::new(), err_addr, 0);
let (ptr, len, err) = read_result_string_slots(builder, ptr_ty, &slots);
match &info.sig.ret {
AbiType::Result(ok_ty, err_ty) => {
if **ok_ty != AbiType::String || **err_ty != AbiType::I32 {
Expand Down
Loading
Loading