ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wasm intrinsics; fix len for strings and slices

Browse Source
This commit is contained in:
gingerBill
2023-06-06 23:11:42 +01:00
parent 1c2a30d7e9
commit ca6cef9a7d
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/llvm_backend_proc.cpp
+6 -6
View File
@@ -2890,7 +2890,7 @@ gb_internal lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValu
{ {
char const *name = "llvm.wasm.memory.grow"; char const *name = "llvm.wasm.memory.grow";
LLVMTypeRef types[1] = { LLVMTypeRef types[1] = {
lb_type(p->module, t_uintptr), lb_type(p->module, t_i32),
}; };
LLVMValueRef args[2] = {}; LLVMValueRef args[2] = {};
@@ -2898,24 +2898,24 @@ gb_internal lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValu
args[1] = lb_emit_conv(p, lb_build_expr(p, ce->args[1]), t_uintptr).value; args[1] = lb_emit_conv(p, lb_build_expr(p, ce->args[1]), t_uintptr).value;
lbValue res = {}; lbValue res = {};
res.type = tv.type; res.type = t_i32;
res.value = lb_call_intrinsic(p, name, args, gb_count_of(args), types, gb_count_of(types)); res.value = lb_call_intrinsic(p, name, args, gb_count_of(args), types, gb_count_of(types));
return res; return lb_emit_conv(p, res, tv.type);
} }
case BuiltinProc_wasm_memory_size: case BuiltinProc_wasm_memory_size:
{ {
char const *name = "llvm.wasm.memory.size"; char const *name = "llvm.wasm.memory.size";
LLVMTypeRef types[1] = { LLVMTypeRef types[1] = {
lb_type(p->module, t_uintptr), lb_type(p->module, t_i32),
}; };
LLVMValueRef args[1] = {}; LLVMValueRef args[1] = {};
args[0] = lb_emit_conv(p, lb_build_expr(p, ce->args[0]), t_uintptr).value; args[0] = lb_emit_conv(p, lb_build_expr(p, ce->args[0]), t_uintptr).value;
lbValue res = {}; lbValue res = {};
res.type = tv.type; res.type = t_i32;
res.value = lb_call_intrinsic(p, name, args, gb_count_of(args), types, gb_count_of(types)); res.value = lb_call_intrinsic(p, name, args, gb_count_of(args), types, gb_count_of(types));
return res; return lb_emit_conv(p, res, tv.type);
} }
case BuiltinProc_wasm_memory_atomic_wait32: case BuiltinProc_wasm_memory_atomic_wait32:
src/llvm_backend_utility.cpp
+5
View File
@@ -932,6 +932,11 @@ gb_internal i32 lb_convert_struct_index(lbModule *m, Type *t, i32 index) {
return field_remapping[index]; return field_remapping[index];
} else if (build_context.ptr_size != build_context.int_size) { } else if (build_context.ptr_size != build_context.int_size) {
switch (t->kind) { switch (t->kind) {
case Type_Basic:
if (t->Basic.kind != Basic_string) {
break;
}
/*fallthrough*/
case Type_Slice: case Type_Slice:
GB_ASSERT(build_context.ptr_size*2 == build_context.int_size); GB_ASSERT(build_context.ptr_size*2 == build_context.int_size);
switch (index) { switch (index) {