Commit 0df0aa83 authored by Eduardo Souza's avatar Eduardo Souza

Applying rustfmt. Add mu-aot-llvm as library.

parent e81762ca
Pipeline #5661 failed with stages
in 46 minutes and 10 seconds
......@@ -39,7 +39,7 @@ else
source $CARGO_HOME/env # Set up $PATH appropriately
export LD_LIBRARY_PATH=$(echo $LD_LIBRARY_PATH | sed 's!/mu-impl-fast/target/[^/]*/deps/!/REMOVED/!g') # Delete any existing zebu's (so they don't accidently get used)
export LD_LIBRARY_PATH=./emit:$MU_ZEBU/target/$ZEBU_BUILD/deps/:$CI_HOME/antlr4/usr/local/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=./emit:$MU_ZEBU/target/$ZEBU_BUILD/deps/:$MU_LLVM_ZEBU/target/debug/deps/:$CI_HOME/antlr4/usr/local/lib:$LD_LIBRARY_PATH
export CC=clang
export CXX=clang++
......
......@@ -1650,7 +1650,8 @@ pub unsafe fn gen_instr_get_field_iref(
name.as_str().as_ptr() as *const c_char
);
// when getting a field of a global variable that is a pointer, do an addrspacecast
// when getting a field of a global variable that is a pointer, do an
// addrspacecast
let is_global = LLVMIsAGlobalObject(*ptr);
let is_global = LLVMPrintValueToString(is_global);
let is_global = CString::from_raw(is_global);
......@@ -1716,7 +1717,8 @@ pub unsafe fn gen_instr_get_element_iref(
name.as_str().as_ptr() as *const c_char
);
// when getting an element of a global variable that is a pointer, do an addrspacecast
// when getting an element of a global variable that is a pointer, do an
// addrspacecast
let is_global = LLVMIsAGlobalObject(*ptr);
let is_global = LLVMPrintValueToString(is_global);
let is_global = CString::from_raw(is_global);
......
......@@ -961,7 +961,8 @@ unsafe fn create_llvm_function_type(
) -> LLVMTypeRef {
let mut llvm_arg_types = vec![];
for arg_ty in &function_sig.arg_tys {
llvm_arg_types.push(gen_llvm_type_global(llvm_internal_context, arg_ty));
llvm_arg_types
.push(gen_llvm_type_global(llvm_internal_context, arg_ty));
}
let mut llvm_ret_types = vec![];
......
......@@ -1273,10 +1273,10 @@ fn store_funcref() -> VM {
const_alloc_local (alloc_size_const_local)
);
// ssa! ((vm, current_tester_v1) <uptr_funcref_foo> alloc_ref_fn);
// inst! ((vm, current_tester_v1) blk_entry_bitcast:
// alloc_ref_fn = CONVOP (ConvOp::REFCAST) <u64_ref uptr_funcref_foo> alloc_ref
// );
// ssa! ((vm, current_tester_v1) <uptr_funcref_foo> alloc_ref_fn);
// inst! ((vm, current_tester_v1) blk_entry_bitcast:
// alloc_ref_fn = CONVOP (ConvOp::REFCAST) <u64_ref uptr_funcref_foo>
// alloc_ref );
/*
Run the test function on the object allocated in the previous instruction
......@@ -1307,14 +1307,14 @@ fn store_funcref() -> VM {
);
define_block!((vm, current_tester_v1) blk_entry() {
blk_entry_alloc,
// blk_entry_bitcast,
blk_entry_call,
blk_entry_cmp,
blk_entry_inst_select,
blk_entry_inst_ret,
blk_entry_inst_exit
});
blk_entry_alloc,
// blk_entry_bitcast,
blk_entry_call,
blk_entry_cmp,
blk_entry_inst_select,
blk_entry_inst_ret,
blk_entry_inst_exit
});
define_func_ver!((vm) current_tester_v1 (entry: blk_entry) {
blk_entry
......
......@@ -399,7 +399,8 @@ fn create_catch_exception_and_add(vm: &VM, throw_exception: MuEntityHeader) {
// FIXME TEST FAILS WHEN CONSIDERING GC AND ADDRSPACES
//#[test]
//fn test_exception_throw_catch_twice() {
// build_and_run_llvm_test!(catch_twice AND throw_exception, catch_twice_test1, throw_catch_twice);
// build_and_run_llvm_test!(catch_twice AND throw_exception,
// catch_twice_test1, throw_catch_twice);
//}
fn throw_catch_twice() -> VM {
......
......@@ -1327,22 +1327,22 @@ fn global_point_persisted_obj_gc(vm: &VM) {
);
define_block! ((vm, global_point_persisted_obj_gc_v1) blk_entry() {
blk_entry_getiref,
// blk_entry_getfieldiref,
blk_entry_getfieldiref2,
blk_entry_load_t2,
blk_entry_getiref_t2,
blk_entry_getfieldiref2_t2,
blk_entry_new,
blk_entry_write_const,
blk_entry_write,
blk_entry_ccall,
blk_entry_call,
blk_entry_load,
blk_entry_load_val2,
blk_entry_new_b,
blk_entry_exit, blk_entry_ret
});
blk_entry_getiref,
// blk_entry_getfieldiref,
blk_entry_getfieldiref2,
blk_entry_load_t2,
blk_entry_getiref_t2,
blk_entry_getfieldiref2_t2,
blk_entry_new,
blk_entry_write_const,
blk_entry_write,
blk_entry_ccall,
blk_entry_call,
blk_entry_load,
blk_entry_load_val2,
blk_entry_new_b,
blk_entry_exit, blk_entry_ret
});
define_func_ver!((vm) global_point_persisted_obj_gc_v1 (entry: blk_entry) {
blk_entry
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment