Browse Source

Fix atomic.odin

gingerBill 6 years ago
parent
commit
72f4186b21
4 changed files with 15 additions and 19 deletions
  1. 12 15
      core/sync/atomic.odin
  2. 1 2
      src/checker.cpp
  3. 1 1
      src/checker.hpp
  4. 1 1
      src/ir.cpp

+ 12 - 15
core/sync/atomic.odin

@@ -22,7 +22,7 @@ strongest_failure_ordering :: inline proc "contextless" (order: Ordering) -> Ord
 	return Relaxed;
 }
 
-fence :: proc "contextless" (order: Ordering) {
+fence :: inline proc "contextless" (order: Ordering) {
 	using Ordering;
 	#complete switch order {
 	case Relaxed:                 panic("there is no such thing as a relaxed fence");
@@ -35,7 +35,7 @@ fence :: proc "contextless" (order: Ordering) {
 }
 
 
-atomic_store :: proc "contextless" (dst: ^$T, val: T, order: Ordering) {
+atomic_store :: inline proc "contextless" (dst: ^$T, val: T, order: Ordering) {
 	using Ordering;
 	#complete switch order {
 	case Relaxed:                 intrinsics.atomic_store_relaxed(dst, val);
@@ -47,7 +47,7 @@ atomic_store :: proc "contextless" (dst: ^$T, val: T, order: Ordering) {
 	}
 }
 
-atomic_load :: proc "contextless" (dst: ^$T, order: Ordering) -> T {
+atomic_load :: inline proc "contextless" (dst: ^$T, order: Ordering) -> T {
 	using Ordering;
 	#complete switch order {
 	case Relaxed:                 return intrinsics.atomic_load_relaxed(dst);
@@ -60,7 +60,7 @@ atomic_load :: proc "contextless" (dst: ^$T, order: Ordering) -> T {
 	return T{};
 }
 
-atomic_swap :: proc "contextless" (dst: ^$T, val: T, order: Ordering) -> T {
+atomic_swap :: inline proc "contextless" (dst: ^$T, val: T, order: Ordering) -> T {
 	using Ordering;
 	#complete switch order {
 	case Relaxed:                 return intrinsics.atomic_xchg_relaxed(dst, val);
@@ -73,12 +73,11 @@ atomic_swap :: proc "contextless" (dst: ^$T, val: T, order: Ordering) -> T {
 	return T{};
 }
 
-atomic_compare_exchange :: proc "contextless" (dst: ^$T, old, new: T, success, failure: Ordering) -> (val: T, ok: bool) {
+atomic_compare_exchange :: inline proc "contextless" (dst: ^$T, old, new: T, success, failure: Ordering) -> (val: T, ok: bool) {
 	using Ordering;
 	switch failure {
 	case Relaxed:
 		switch success {
-		case Release:                 return intrinsics.atomic_cxchg_rel_failrelaxed(dst, old, new);
 		case Relaxed:                 return intrinsics.atomic_cxchg_relaxed(dst, old, new);
 		case Acquire:                 return intrinsics.atomic_cxchg_acq_failrelaxed(dst, old, new);
 		case Acquire_Release:         return intrinsics.atomic_cxchg_acqrel_failrelaxed(dst, old, new);
@@ -88,8 +87,6 @@ atomic_compare_exchange :: proc "contextless" (dst: ^$T, old, new: T, success, f
 	case Acquire:
 		switch success {
 		case Acquire:                 return intrinsics.atomic_cxchg_acq(dst, old, new);
-		case Acquire_Release:         return intrinsics.atomic_cxchg_acqrel_failacq(dst, old, new);
-		case Sequentially_Consistent: return intrinsics.atomic_acqrel_failacq(dst, old, new);
 		case: panic("an unknown ordering combination");
 		}
 	case Sequentially_Consistent:
@@ -102,12 +99,12 @@ atomic_compare_exchange :: proc "contextless" (dst: ^$T, old, new: T, success, f
 	case Release:
 		panic("there is not such thing as an release failure ordering");
 	}
-
 	return T{}, false;
+
 }
 
 
-atomic_add :: proc "contextless" (dst: ^$T, val: T, order: Ordering) -> T {
+atomic_add :: inline proc "contextless" (dst: ^$T, val: T, order: Ordering) -> T {
 	using Ordering;
 	#complete switch order {
 	case Relaxed:                 return intrinsics.atomic_add_relaxed(dst, val);
@@ -120,7 +117,7 @@ atomic_add :: proc "contextless" (dst: ^$T, val: T, order: Ordering) -> T {
 	return T{};
 }
 
-atomic_sub :: proc "contextless" (dst: ^$T, val: T, order: Ordering) -> T {
+atomic_sub :: inline proc "contextless" (dst: ^$T, val: T, order: Ordering) -> T {
 	using Ordering;
 	#complete switch order {
 	case Relaxed:                 return intrinsics.atomic_sub_relaxed(dst, val);
@@ -133,7 +130,7 @@ atomic_sub :: proc "contextless" (dst: ^$T, val: T, order: Ordering) -> T {
 	return T{};
 }
 
-atomic_and :: proc "contextless" (dst: ^$T, val: T, order: Ordering) -> T {
+atomic_and :: inline proc "contextless" (dst: ^$T, val: T, order: Ordering) -> T {
 	using Ordering;
 	#complete switch order {
 	case Relaxed:                 return intrinsics.atomic_and_relaxed(dst, val);
@@ -146,7 +143,7 @@ atomic_and :: proc "contextless" (dst: ^$T, val: T, order: Ordering) -> T {
 	return T{};
 }
 
-atomic_nand :: proc "contextless" (dst: ^$T, val: T, order: Ordering) -> T {
+atomic_nand :: inline proc "contextless" (dst: ^$T, val: T, order: Ordering) -> T {
 	using Ordering;
 	#complete switch order {
 	case Relaxed:                 return intrinsics.atomic_nand_relaxed(dst, val);
@@ -159,7 +156,7 @@ atomic_nand :: proc "contextless" (dst: ^$T, val: T, order: Ordering) -> T {
 	return T{};
 }
 
-atomic_or :: proc "contextless" (dst: ^$T, val: T, order: Ordering) -> T {
+atomic_or :: inline proc "contextless" (dst: ^$T, val: T, order: Ordering) -> T {
 	using Ordering;
 	#complete switch order {
 	case Relaxed:                 return intrinsics.atomic_or_relaxed(dst, val);
@@ -172,7 +169,7 @@ atomic_or :: proc "contextless" (dst: ^$T, val: T, order: Ordering) -> T {
 	return T{};
 }
 
-atomic_xor :: proc "contextless" (dst: ^$T, val: T, order: Ordering) -> T {
+atomic_xor :: inline proc "contextless" (dst: ^$T, val: T, order: Ordering) -> T {
 	using Ordering;
 	#complete switch order {
 	case Relaxed:                 return intrinsics.atomic_xor_relaxed(dst, val);

+ 1 - 2
src/checker.cpp

@@ -714,8 +714,7 @@ Entity *implicit_entity_of_node(Ast *clause) {
 	return nullptr;
 }
 
-// Will return nullptr if not found
-Entity *entity_of_node(CheckerInfo *i, Ast *expr) {
+Entity *entity_of_node(Ast *expr) {
 	expr = unparen_expr(expr);
 	switch (expr->kind) {
 	case_ast_node(ident, Ident, expr);

+ 1 - 1
src/checker.hpp

@@ -512,7 +512,7 @@ AstFile *    ast_file_of_filename   (CheckerInfo *i, String   filename);
 isize        type_info_index        (CheckerInfo *i, Type *   type, bool error_on_failure = true);
 
 // Will return nullptr if not found
-Entity *entity_of_node(CheckerInfo *i, Ast *expr);
+Entity *entity_of_node(Ast *expr);
 
 
 Entity *scope_lookup_current(Scope *s, String name);

+ 1 - 1
src/ir.cpp

@@ -5282,7 +5282,7 @@ irValue *ir_build_expr_internal(irProcedure *proc, Ast *expr) {
 
 		Ast *p = unparen_expr(ce->proc);
 		if (proc_mode == Addressing_Builtin) {
-			Entity *e = entity_of_ident(p);
+			Entity *e = entity_of_node(p);
 			BuiltinProcId id = BuiltinProc_Invalid;
 			if (e != nullptr) {
 				id = cast(BuiltinProcId)e->Builtin.id;