authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-07-27 18:07:30-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-07-27 18:07:30-04:00
loge5beca886ddf3138351765e1239b626e7bd612c6
tree7d1f7e1b026a6a9c35895171eca4f8914b70d1d6
parente491c381896b6f36366bf554f149f79d5be8f9dd

suspend checks the cancel bit

1 files changed, 8 insertions(+), 0 deletions(-)

src/ir.cpp+8
...@@ -6907,16 +6907,24 @@ static IrInstruction *ir_gen_suspend(IrBuilder *irb, Scope *parent_scope, AstNod...@@ -6907,16 +6907,24 @@ static IrInstruction *ir_gen_suspend(IrBuilder *irb, Scope *parent_scope, AstNod
6907 IrBasicBlock *cleanup_block = ir_create_basic_block(irb, parent_scope, "SuspendCleanup");6907 IrBasicBlock *cleanup_block = ir_create_basic_block(irb, parent_scope, "SuspendCleanup");
6908 IrBasicBlock *resume_block = ir_create_basic_block(irb, parent_scope, "SuspendResume");6908 IrBasicBlock *resume_block = ir_create_basic_block(irb, parent_scope, "SuspendResume");
6909 IrBasicBlock *suspended_block = ir_create_basic_block(irb, parent_scope, "AlreadySuspended");6909 IrBasicBlock *suspended_block = ir_create_basic_block(irb, parent_scope, "AlreadySuspended");
6910 IrBasicBlock *not_canceled_block = ir_create_basic_block(irb, parent_scope, "NotCanceled");
6910 IrBasicBlock *not_suspended_block = ir_create_basic_block(irb, parent_scope, "NotAlreadySuspended");6911 IrBasicBlock *not_suspended_block = ir_create_basic_block(irb, parent_scope, "NotAlreadySuspended");
69116912
6912 IrInstruction *const_bool_false = ir_build_const_bool(irb, parent_scope, node, false);6913 IrInstruction *const_bool_false = ir_build_const_bool(irb, parent_scope, node, false);
6913 IrInstruction *usize_type_val = ir_build_const_type(irb, parent_scope, node, irb->codegen->builtin_types.entry_usize);6914 IrInstruction *usize_type_val = ir_build_const_type(irb, parent_scope, node, irb->codegen->builtin_types.entry_usize);
6915 IrInstruction *is_canceled_mask = ir_build_const_usize(irb, parent_scope, node, 0x1); // 0b001
6914 IrInstruction *is_suspended_mask = ir_build_const_usize(irb, parent_scope, node, 0x2); // 0b0106916 IrInstruction *is_suspended_mask = ir_build_const_usize(irb, parent_scope, node, 0x2); // 0b010
6915 IrInstruction *zero = ir_build_const_usize(irb, parent_scope, node, 0);6917 IrInstruction *zero = ir_build_const_usize(irb, parent_scope, node, 0);
69166918
6917 IrInstruction *prev_atomic_value = ir_build_atomic_rmw(irb, parent_scope, node,6919 IrInstruction *prev_atomic_value = ir_build_atomic_rmw(irb, parent_scope, node,
6918 usize_type_val, irb->exec->atomic_state_field_ptr, nullptr, is_suspended_mask, nullptr,6920 usize_type_val, irb->exec->atomic_state_field_ptr, nullptr, is_suspended_mask, nullptr,
6919 AtomicRmwOp_or, AtomicOrderSeqCst);6921 AtomicRmwOp_or, AtomicOrderSeqCst);
6922
6923 IrInstruction *is_canceled_value = ir_build_bin_op(irb, parent_scope, node, IrBinOpBinAnd, prev_atomic_value, is_canceled_mask, false);
6924 IrInstruction *is_canceled_bool = ir_build_bin_op(irb, parent_scope, node, IrBinOpCmpNotEq, is_canceled_value, zero, false);
6925 ir_build_cond_br(irb, parent_scope, node, is_canceled_bool, cleanup_block, not_canceled_block, const_bool_false);
6926
6927 ir_set_cursor_at_end_and_append_block(irb, not_canceled_block);
6920 IrInstruction *is_suspended_value = ir_build_bin_op(irb, parent_scope, node, IrBinOpBinAnd, prev_atomic_value, is_suspended_mask, false);6928 IrInstruction *is_suspended_value = ir_build_bin_op(irb, parent_scope, node, IrBinOpBinAnd, prev_atomic_value, is_suspended_mask, false);
6921 IrInstruction *is_suspended_bool = ir_build_bin_op(irb, parent_scope, node, IrBinOpCmpNotEq, is_suspended_value, zero, false);6929 IrInstruction *is_suspended_bool = ir_build_bin_op(irb, parent_scope, node, IrBinOpCmpNotEq, is_suspended_value, zero, false);
6922 ir_build_cond_br(irb, parent_scope, node, is_suspended_bool, suspended_block, not_suspended_block, const_bool_false);6930 ir_build_cond_br(irb, parent_scope, node, is_suspended_bool, suspended_block, not_suspended_block, const_bool_false);