Browse Source

Fix `runtime.memset` issue

gingerBill 5 years ago
parent
commit
8b066b2456
2 changed files with 1 additions and 31 deletions
  1. 1 22
      core/mem/mem.odin
  2. 0 9
      core/runtime/internal.odin

+ 1 - 22
core/mem/mem.odin

@@ -3,28 +3,7 @@ package mem
 import "core:runtime"
 import "core:runtime"
 
 
 set :: proc(data: rawptr, value: byte, len: int) -> rawptr {
 set :: proc(data: rawptr, value: byte, len: int) -> rawptr {
-	foreign _ {
-		when ODIN_USE_LLVM_API {
-			when size_of(rawptr) == 8 {
-				@(link_name="llvm.memset.p0i8.i64")
-				memset :: proc(dst: rawptr, val: byte, len: int, is_volatile: bool = false) ---;
-			} else {
-				@(link_name="llvm.memset.p0i8.i32")
-				memset :: proc(dst: rawptr, val: byte, len: int, is_volatile: bool = false) ---;
-			}
-		} else {
-			when size_of(rawptr) == 8 {
-				@(link_name="llvm.memset.p0i8.i64")
-				memset :: proc(dst: rawptr, val: byte, len: int, align: i32 = 1, is_volatile: bool = false) ---;
-			} else {
-				@(link_name="llvm.memset.p0i8.i32")
-				memset :: proc(dst: rawptr, val: byte, len: int, align: i32 = 1, is_volatile: bool = false) ---;
-			}
-		}
-	}
-
-	memset(data, value, len);
-	return data;
+	return runtime.memset(data, i32(value), len);
 }
 }
 zero :: inline proc(data: rawptr, len: int) -> rawptr {
 zero :: inline proc(data: rawptr, len: int) -> rawptr {
 	return set(data, 0, len);
 	return set(data, 0, len);

+ 0 - 9
core/runtime/internal.odin

@@ -70,15 +70,6 @@ align_forward_uintptr :: inline proc(ptr, align: uintptr) -> uintptr {
 mem_zero :: proc "contextless" (data: rawptr, len: int) -> rawptr {
 mem_zero :: proc "contextless" (data: rawptr, len: int) -> rawptr {
 	if data == nil do return nil;
 	if data == nil do return nil;
 	if len < 0 do return data;
 	if len < 0 do return data;
-	when !ODIN_USE_LLVM_API do foreign _ {
-		when size_of(rawptr) == 8 {
-			@(link_name="llvm.memset.p0i8.i64")
-			memset :: proc(dst: rawptr, val: byte, len: int, align: i32 = 1, is_volatile: bool = false) ---;
-		} else {
-			@(link_name="llvm.memset.p0i8.i32")
-			memset :: proc(dst: rawptr, val: byte, len: int, align: i32 = 1, is_volatile: bool = false) ---;
-		}
-	}
 	memset(data, 0, len);
 	memset(data, 0, len);
 	return data;
 	return data;
 }
 }