aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorgingerBill <bill@gingerbill.org>2021-04-25 20:03:05 +0100
committergingerBill <bill@gingerbill.org>2021-04-25 20:03:05 +0100
commitcb2e6ea31db90ca80314e5ff8ce8f43371fade7c (patch)
treea58df81b7254167e96492a9229402833a96fc715 /core
parent74c683e908fb0fec6c85de099fbbda400d9d6fbe (diff)
Remove `use_llvm_api` related checks and other related things
Diffstat (limited to 'core')
-rw-r--r--core/runtime/internal.odin40
-rw-r--r--core/sys/cpu/cpu.odin2
2 files changed, 10 insertions, 32 deletions
diff --git a/core/runtime/internal.odin b/core/runtime/internal.odin
index 3c05fb6a7..e2f8c7287 100644
--- a/core/runtime/internal.odin
+++ b/core/runtime/internal.odin
@@ -107,22 +107,12 @@ mem_copy :: proc "contextless" (dst, src: rawptr, len: int) -> rawptr {
}
// NOTE(bill): This _must_ be implemented like C's memmove
foreign _ {
- when ODIN_USE_LLVM_API {
- when size_of(rawptr) == 8 {
- @(link_name="llvm.memmove.p0i8.p0i8.i64")
- llvm_memmove :: proc "none" (dst, src: rawptr, len: int, is_volatile: bool = false) ---;
- } else {
- @(link_name="llvm.memmove.p0i8.p0i8.i32")
- llvm_memmove :: proc "none" (dst, src: rawptr, len: int, is_volatile: bool = false) ---;
- }
+ when size_of(rawptr) == 8 {
+ @(link_name="llvm.memmove.p0i8.p0i8.i64")
+ llvm_memmove :: proc "none" (dst, src: rawptr, len: int, is_volatile: bool = false) ---;
} else {
- when size_of(rawptr) == 8 {
- @(link_name="llvm.memmove.p0i8.p0i8.i64")
- llvm_memmove :: proc "none" (dst, src: rawptr, len: int, align: i32 = 1, is_volatile: bool = false) ---;
- } else {
- @(link_name="llvm.memmove.p0i8.p0i8.i32")
- llvm_memmove :: proc "none" (dst, src: rawptr, len: int, align: i32 = 1, is_volatile: bool = false) ---;
- }
+ @(link_name="llvm.memmove.p0i8.p0i8.i32")
+ llvm_memmove :: proc "none" (dst, src: rawptr, len: int, is_volatile: bool = false) ---;
}
}
llvm_memmove(dst, src, len);
@@ -135,22 +125,12 @@ mem_copy_non_overlapping :: proc "contextless" (dst, src: rawptr, len: int) -> r
}
// NOTE(bill): This _must_ be implemented like C's memcpy
foreign _ {
- when ODIN_USE_LLVM_API {
- when size_of(rawptr) == 8 {
- @(link_name="llvm.memcpy.p0i8.p0i8.i64")
- llvm_memcpy :: proc "none" (dst, src: rawptr, len: int, is_volatile: bool = false) ---;
- } else {
- @(link_name="llvm.memcpy.p0i8.p0i8.i32")
- llvm_memcpy :: proc "none" (dst, src: rawptr, len: int, is_volatile: bool = false) ---;
- }
+ when size_of(rawptr) == 8 {
+ @(link_name="llvm.memcpy.p0i8.p0i8.i64")
+ llvm_memcpy :: proc "none" (dst, src: rawptr, len: int, is_volatile: bool = false) ---;
} else {
- when size_of(rawptr) == 8 {
- @(link_name="llvm.memcpy.p0i8.p0i8.i64")
- llvm_memcpy :: proc "none" (dst, src: rawptr, len: int, align: i32 = 1, is_volatile: bool = false) ---;
- } else {
- @(link_name="llvm.memcpy.p0i8.p0i8.i32")
- llvm_memcpy :: proc "none" (dst, src: rawptr, len: int, align: i32 = 1, is_volatile: bool = false) ---;
- }
+ @(link_name="llvm.memcpy.p0i8.p0i8.i32")
+ llvm_memcpy :: proc "none" (dst, src: rawptr, len: int, is_volatile: bool = false) ---;
}
}
llvm_memcpy(dst, src, len);
diff --git a/core/sys/cpu/cpu.odin b/core/sys/cpu/cpu.odin
index b6f770aed..b99fe01d8 100644
--- a/core/sys/cpu/cpu.odin
+++ b/core/sys/cpu/cpu.odin
@@ -1,7 +1,5 @@
package sys_cpu
-#assert(ODIN_USE_LLVM_API);
-
Cache_Line_Pad :: struct {_: [_cache_line_size]byte};
initialized: bool;