M-Labs/nac3
M-Labs/nac3
8
1
Fork 13
Code Issues 94 Pull Requests 6 Releases Wiki Activity

Final changes based on feedback and running cargo clippy --tests

Browse Source
This commit is contained in:
ram 2025-02-10 03:00:11 +00:00
parent dabd99c637
commit 0aa9847a50
1 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
nac3artiq/src/codegen.rs
View File

@ -842,9 +842,10 @@ pub fn rpc_codegen_callback_fn<'ctx>(
} else { } else {
let tag_len = tag.len(); let tag_len = tag.len();
let arr_ty = int8.array_type(tag_len as u32); let arr_ty = int8.array_type(tag_len as u32);
let tag_const = int8 let tag_const = int8.const_array(
.const_array(&tag.iter().map(|&b| int8.const_int(b as u64, false)).collect::<Vec<_>>()); &tag.iter().map(|&b| int8.const_int(u64::from(b), false)).collect::<Vec<_>>(),
let arr_gv = ctx.module.add_global(arr_ty, None, &format!("{}.arr", hash)); );
let arr_gv = ctx.module.add_global(arr_ty, None, &format!("{hash}.arr"));
arr_gv.set_linkage(Linkage::Private); arr_gv.set_linkage(Linkage::Private);
arr_gv.set_initializer(&tag_const); arr_gv.set_initializer(&tag_const);
@ -878,10 +879,10 @@ pub fn rpc_codegen_callback_fn<'ctx>(
.args .args
.iter() .iter()
.position(|arg| arg.name == kw_name) .position(|arg| arg.name == kw_name)
.ok_or_else(|| format!("Unknown keyword argument '{}'", kw_name))?; .ok_or_else(|| format!("Unknown keyword argument '{kw_name}'"))?;
if param_map[param_pos].is_some() { if param_map[param_pos].is_some() {
return Err(format!("Multiple values for argument '{}'", kw_name)); return Err(format!("Multiple values for argument '{kw_name}'"));
} }
param_map[param_pos] = Some(val_enum); param_map[param_pos] = Some(val_enum);
} else { } else {
@ -927,7 +928,7 @@ pub fn rpc_codegen_callback_fn<'ctx>(
ctx.builder.build_gep( ctx.builder.build_gep(
arg_array, arg_array,
&[i32_ty.const_int(i as u64, false)], &[i32_ty.const_int(i as u64, false)],
&format!("rpc.arg_slot_{}", i), &format!("rpc.arg_slot_{i}"),
) )
} }
.unwrap(); .unwrap();
@ -959,33 +960,28 @@ pub fn rpc_codegen_callback_fn<'ctx>(
.unwrap(); .unwrap();
call_stackrestore(ctx, stackptr); call_stackrestore(ctx, stackptr);
return Ok(None); return Ok(None);
} else {
let rpc_send = ctx.module.get_function("rpc_send").unwrap_or_else(|| {
ctx.module.add_function(
"rpc_send",
ctx.ctx.void_type().fn_type(
&[
int32.into(),
tag_ptr_type.into(),
ptr_type.ptr_type(AddressSpace::default()).into(),
],
false,
),
None,
)
});
ctx.builder
.build_call(
rpc_send,
&[service_id.into(), tag_ptr.into(), arg_array.into()],
"rpc.send",
)
.unwrap();
call_stackrestore(ctx, stackptr);
let maybe_ret = format_rpc_ret(generator, ctx, fun.0.ret);
Ok(maybe_ret)
} }
let rpc_send = ctx.module.get_function("rpc_send").unwrap_or_else(|| {
ctx.module.add_function(
"rpc_send",
ctx.ctx.void_type().fn_type(
&[
int32.into(),
tag_ptr_type.into(),
ptr_type.ptr_type(AddressSpace::default()).into(),
],
false,
),
None,
)
});
ctx.builder
.build_call(rpc_send, &[service_id.into(), tag_ptr.into(), arg_array.into()], "rpc.send")
.unwrap();
call_stackrestore(ctx, stackptr);
let maybe_ret = format_rpc_ret(generator, ctx, fun.0.ret);
Ok(maybe_ret)
} }
pub fn attributes_writeback<'ctx>( pub fn attributes_writeback<'ctx>(
@ -1074,7 +1070,7 @@ pub fn attributes_writeback<'ctx>(
if *is_method { if *is_method {
continue; continue;
} }
if gen_rpc_tag(ctx, *field_ty, &mut scratch_buffer).is_ok() { if gen_rpc_tag(ctx, *field_ty, false, &mut scratch_buffer).is_ok() {
fields.push(name.to_string()); fields.push(name.to_string());
let (index, _) = ctx.get_attr_index(ty, *name); let (index, _) = ctx.get_attr_index(ty, *name);
values.push(( values.push((