Skip to content

Remove support for handles and resources #346

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
alexcrichton merged 3 commits into from
Oct 5, 2022
Merged

Remove support for handles and resources #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c902c5a
Remove support for handles and resources
alexcrichton Oct 4, 2022
5094ee0
Remove resources from the demo
alexcrichton Oct 4, 2022
35bde8a
Fix rebase conflict
alexcrichton Oct 5, 2022
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
10 changes: 0 additions & 10 deletions crates/bindgen-core/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ pub trait Generator {
);
fn type_union(&mut self, iface: &Interface, id: TypeId, name: &str, union: &Union, docs: &Docs);
fn type_enum(&mut self, iface: &Interface, id: TypeId, name: &str, enum_: &Enum, docs: &Docs);
fn type_resource(&mut self, iface: &Interface, ty: ResourceId);
fn type_alias(&mut self, iface: &Interface, id: TypeId, name: &str, ty: &Type, docs: &Docs);
fn type_list(&mut self, iface: &Interface, id: TypeId, name: &str, ty: &Type, docs: &Docs);
fn type_builtin(&mut self, iface: &Interface, id: TypeId, name: &str, ty: &Type, docs: &Docs);
Expand Down Expand Up @@ -131,10 +130,6 @@ pub trait Generator {
}
}

for (id, _resource) in iface.resources.iter() {
self.type_resource(iface, id);
}

self.preprocess_functions(iface, dir);

for f in iface.functions.iter() {
Expand Down Expand Up @@ -181,17 +176,13 @@ pub struct TypeInfo {

/// Whether or not this type (transitively) has a list.
pub has_list: bool,

/// Whether or not this type (transitively) has a handle.
pub has_handle: bool,
}

impl std::ops::BitOrAssign for TypeInfo {
fn bitor_assign(&mut self, rhs: Self) {
self.param |= rhs.param;
self.result |= rhs.result;
self.has_list |= rhs.has_list;
self.has_handle |= rhs.has_handle;
}
}

Expand Down Expand Up @@ -271,7 +262,6 @@ impl Types {
pub fn type_info(&mut self, iface: &Interface, ty: &Type) -> TypeInfo {
let mut info = TypeInfo::default();
match ty {
Type::Handle(_) => info.has_handle = true,
Type::String => info.has_list = true,
Type::Id(id) => return self.type_id_info(iface, *id),
_ => {}
Expand Down
109 changes: 0 additions & 109 deletions crates/gen-guest-c/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,6 @@ impl C {
Type::S64 => self.src.h("int64_t"),
Type::Float32 => self.src.h("float"),
Type::Float64 => self.src.h("double"),
Type::Handle(id) => {
self.print_namespace(iface);
self.src.h(&iface.resources[*id].name.to_snake_case());
self.src.h("_t");
}
Type::String => {
self.print_namespace(iface);
self.src.h("string_t");
Expand Down Expand Up @@ -285,7 +280,6 @@ impl C {
Type::S64 => self.src.h("s64"),
Type::Float32 => self.src.h("float32"),
Type::Float64 => self.src.h("float64"),
Type::Handle(id) => self.src.h(&iface.resources[*id].name.to_snake_case()),
Type::String => self.src.h("string"),
Type::Id(id) => {
let ty = &iface.types[*id];
Expand Down Expand Up @@ -579,7 +573,6 @@ impl C {
let id = match ty {
Type::Id(id) => *id,
Type::String => return true,
Type::Handle(_) => return true,
_ => return false,
};
match &iface.types[id].kind {
Expand Down Expand Up @@ -945,10 +938,6 @@ impl Generator for C {
self.types.insert(id, mem::replace(&mut self.src.h, prev));
}

fn type_resource(&mut self, iface: &Interface, ty: ResourceId) {
drop((iface, ty));
}

fn type_alias(&mut self, iface: &Interface, id: TypeId, name: &str, ty: &Type, docs: &Docs) {
let prev = mem::take(&mut self.src.h);
self.docs(docs);
Expand Down Expand Up @@ -1178,90 +1167,6 @@ impl Generator for C {

self.print_intrinsics();

for (_, resource) in iface.resources.iter() {
let ns = iface.name.to_snake_case();
let name = resource.name.to_snake_case();
uwrite!(
self.src.h,
"
typedef struct {{
uint32_t idx;
}} {ns}_{name}_t;
void {ns}_{name}_free({ns}_{name}_t *ptr);
{ns}_{name}_t {ns}_{name}_clone({ns}_{name}_t *ptr);
",
ns = ns,
name = name,
);
uwrite!(
self.src.c,
"
__attribute__((import_module(\"canonical_abi\"), import_name(\"resource_drop_{name_orig}\")))
void __resource_{name}_drop(uint32_t idx);

void {ns}_{name}_free({ns}_{name}_t *ptr) {{
__resource_{name}_drop(ptr->idx);
}}

__attribute__((import_module(\"canonical_abi\"), import_name(\"resource_clone_{name_orig}\")))
uint32_t __resource_{name}_clone(uint32_t idx);

{ns}_{name}_t {ns}_{name}_clone({ns}_{name}_t *ptr) {{
return ({ns}_{name}_t){{__resource_{name}_clone(ptr->idx)}};
}}
",
ns = ns,
name = name,
name_orig = resource.name,
);

// Exported resources have more capabilities, they can create new
// resources and get the private value that it was created with.
// Furthermore we also define the destructor which delegates to the
// actual user-defined destructor, if any.
if !self.in_import {
uwrite!(
self.src.h,
"\
{ns}_{name}_t {ns}_{name}_new(void *data);
void* {ns}_{name}_get({ns}_{name}_t *ptr);

__attribute__((weak))
void {ns}_{name}_dtor(void *data);
",
ns = ns,
name = name,
);
uwrite!(
self.src.c,
"
__attribute__((import_module(\"canonical_abi\"), import_name(\"resource_new_{name_orig}\")))
uint32_t __resource_{name}_new(uint32_t val);

{ns}_{name}_t {ns}_{name}_new(void *data) {{
return ({ns}_{name}_t){{__resource_{name}_new((uint32_t) data)}};
}}

__attribute__((import_module(\"canonical_abi\"), import_name(\"resource_get_{name_orig}\")))
uint32_t __resource_{name}_get(uint32_t idx);

void* {ns}_{name}_get({ns}_{name}_t *ptr) {{
return (void*) __resource_{name}_get(ptr->idx);
}}

__attribute__((export_name(\"canonical_abi_drop_{name_orig}\")))
void __resource_{name}_dtor(uint32_t val) {{
if ({ns}_{name}_dtor)
{ns}_{name}_dtor((void*) val);
}}
",
ns = ns,
name = name,
name_orig = resource.name,
);
}
}

// Continuously generate anonymous types while we continue to find more
//
// First we take care of the public set of anonymous types. This will
Expand Down Expand Up @@ -1595,20 +1500,6 @@ impl Bindgen for FunctionBindgen<'_> {
results.push(operands[0].clone());
}

Instruction::I32FromOwnedHandle { .. } | Instruction::I32FromBorrowedHandle { .. } => {
results.push(format!("({}).idx", operands[0]));
}

Instruction::HandleBorrowedFromI32 { ty, .. }
| Instruction::HandleOwnedFromI32 { ty, .. } => {
results.push(format!(
"({}_{}_t){{ {} }}",
iface.name.to_snake_case(),
iface.resources[*ty].name.to_snake_case(),
operands[0],
));
}

Instruction::RecordLower { record, .. } => {
let op = &operands[0];
for f in record.fields.iter() {
Expand Down
Loading