ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-01 04:10:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

context.allocator = a; Remove __ from runtime procs; improve division for complex numbers

Browse Source
This commit is contained in:
gingerBill
2018-09-15 10:14:24 +01:00
parent f1e1814ff9
commit 5bdb424c6b
8 changed files with 212 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/runtime/core.odin
+1 -1
View File
@@ -331,7 +331,7 @@ init_global_temporary_allocator :: proc(data: []byte, backup_allocator := contex
default_assertion_failure_proc :: proc(prefix, message: string, loc: Source_Code_Location) {
fd := os.stderr;
__print_caller_location(fd, loc);
print_caller_location(fd, loc);
os.write_string(fd, " ");
os.write_string(fd, prefix);
if len(message) > 0 {
core/runtime/internal.odin
+120 -83
View File
@@ -5,7 +5,7 @@ import "core:os"
import "core:unicode/utf8"
__print_u64 :: proc(fd: os.Handle, u: u64) {
print_u64 :: proc(fd: os.Handle, u: u64) {
digits := "0123456789";
a: [129]byte;
@@ -20,7 +20,7 @@ __print_u64 :: proc(fd: os.Handle, u: u64) {
os.write(fd, a[i:]);
}
__print_i64 :: proc(fd: os.Handle, u: i64) {
print_i64 :: proc(fd: os.Handle, u: i64) {
digits := "0123456789";
neg := u < 0;
@@ -41,19 +41,19 @@ __print_i64 :: proc(fd: os.Handle, u: i64) {
os.write(fd, a[i:]);
}
__print_caller_location :: proc(fd: os.Handle, using loc: Source_Code_Location) {
print_caller_location :: proc(fd: os.Handle, using loc: Source_Code_Location) {
os.write_string(fd, file_path);
os.write_byte(fd, '(');
__print_u64(fd, u64(line));
print_u64(fd, u64(line));
os.write_byte(fd, ':');
__print_u64(fd, u64(column));
print_u64(fd, u64(column));
os.write_byte(fd, ')');
}
__print_typeid :: proc(fd: os.Handle, id: typeid) {
print_typeid :: proc(fd: os.Handle, id: typeid) {
ti := type_info_of(id);
__print_type(fd, ti);
print_type(fd, ti);
}
__print_type :: proc(fd: os.Handle, ti: ^Type_Info) {
print_type :: proc(fd: os.Handle, ti: ^Type_Info) {
if ti == nil {
os.write_string(fd, "nil");
return;
@@ -70,16 +70,16 @@ __print_type :: proc(fd: os.Handle, ti: ^Type_Info) {
case uintptr: os.write_string(fd, "uintptr");
case:
os.write_byte(fd, info.signed ? 'i' : 'u');
__print_u64(fd, u64(8*ti.size));
print_u64(fd, u64(8*ti.size));
}
case Type_Info_Rune:
os.write_string(fd, "rune");
case Type_Info_Float:
os.write_byte(fd, 'f');
__print_u64(fd, u64(8*ti.size));
print_u64(fd, u64(8*ti.size));
case Type_Info_Complex:
os.write_string(fd, "complex");
__print_u64(fd, u64(8*ti.size));
print_u64(fd, u64(8*ti.size));
case Type_Info_String:
os.write_string(fd, "string");
case Type_Info_Boolean:
@@ -88,7 +88,7 @@ __print_type :: proc(fd: os.Handle, ti: ^Type_Info) {
case bool: os.write_string(fd, "bool");
case:
os.write_byte(fd, 'b');
__print_u64(fd, u64(8*ti.size));
print_u64(fd, u64(8*ti.size));
}
case Type_Info_Any:
os.write_string(fd, "any");
@@ -100,7 +100,7 @@ __print_type :: proc(fd: os.Handle, ti: ^Type_Info) {
os.write_string(fd, "rawptr");
} else {
os.write_string(fd, "^");
__print_type(fd, info.elem);
print_type(fd, info.elem);
}
case Type_Info_Procedure:
os.write_string(fd, "proc");
@@ -111,13 +111,13 @@ __print_type :: proc(fd: os.Handle, ti: ^Type_Info) {
os.write_string(fd, "(");
for t, i in t.types {
if i > 0 do os.write_string(fd, ", ");
__print_type(fd, t);
print_type(fd, t);
}
os.write_string(fd, ")");
}
if info.results != nil {
os.write_string(fd, " -> ");
__print_type(fd, info.results);
print_type(fd, info.results);
}
case Type_Info_Tuple:
count := len(info.names);
@@ -131,27 +131,27 @@ __print_type :: proc(fd: os.Handle, ti: ^Type_Info) {
os.write_string(fd, name);
os.write_string(fd, ": ");
}
__print_type(fd, t);
print_type(fd, t);
}
if count != 1 do os.write_string(fd, ")");
case Type_Info_Array:
os.write_string(fd, "[");
__print_u64(fd, u64(info.count));
print_u64(fd, u64(info.count));
os.write_string(fd, "]");
__print_type(fd, info.elem);
print_type(fd, info.elem);
case Type_Info_Dynamic_Array:
os.write_string(fd, "[dynamic]");
__print_type(fd, info.elem);
print_type(fd, info.elem);
case Type_Info_Slice:
os.write_string(fd, "[]");
__print_type(fd, info.elem);
print_type(fd, info.elem);
case Type_Info_Map:
os.write_string(fd, "map[");
__print_type(fd, info.key);
print_type(fd, info.key);
os.write_byte(fd, ']');
__print_type(fd, info.value);
print_type(fd, info.value);
case Type_Info_Struct:
os.write_string(fd, "struct ");
@@ -159,7 +159,7 @@ __print_type :: proc(fd: os.Handle, ti: ^Type_Info) {
if info.is_raw_union do os.write_string(fd, "#raw_union ");
if info.custom_align {
os.write_string(fd, "#align ");
__print_u64(fd, u64(ti.align));
print_u64(fd, u64(ti.align));
os.write_byte(fd, ' ');
}
os.write_byte(fd, '{');
@@ -167,7 +167,7 @@ __print_type :: proc(fd: os.Handle, ti: ^Type_Info) {
if i > 0 do os.write_string(fd, ", ");
os.write_string(fd, name);
os.write_string(fd, ": ");
__print_type(fd, info.types[i]);
print_type(fd, info.types[i]);
}
os.write_byte(fd, '}');
@@ -175,13 +175,13 @@ __print_type :: proc(fd: os.Handle, ti: ^Type_Info) {
os.write_string(fd, "union {");
for variant, i in info.variants {
if i > 0 do os.write_string(fd, ", ");
__print_type(fd, variant);
print_type(fd, variant);
}
os.write_string(fd, "}");
case Type_Info_Enum:
os.write_string(fd, "enum ");
__print_type(fd, info.base);
print_type(fd, info.base);
os.write_string(fd, " {");
for name, i in info.names {
if i > 0 do os.write_string(fd, ", ");
@@ -193,7 +193,7 @@ __print_type :: proc(fd: os.Handle, ti: ^Type_Info) {
os.write_string(fd, "bit_field ");
if ti.align != 1 {
os.write_string(fd, "#align ");
__print_u64(fd, u64(ti.align));
print_u64(fd, u64(ti.align));
os.write_byte(fd, ' ');
}
os.write_string(fd, " {");
@@ -201,32 +201,32 @@ __print_type :: proc(fd: os.Handle, ti: ^Type_Info) {
if i > 0 do os.write_string(fd, ", ");
os.write_string(fd, name);
os.write_string(fd, ": ");
__print_u64(fd, u64(info.bits[i]));
print_u64(fd, u64(info.bits[i]));
}
os.write_string(fd, "}");
}
}
__string_eq :: proc "contextless" (a, b: string) -> bool {
string_eq :: proc "contextless" (a, b: string) -> bool {
switch {
case len(a) != len(b): return false;
case len(a) == 0: return true;
case &a[0] == &b[0]: return true;
}
return __string_cmp(a, b) == 0;
return string_cmp(a, b) == 0;
}
__string_cmp :: proc "contextless" (a, b: string) -> int {
string_cmp :: proc "contextless" (a, b: string) -> int {
return mem.compare_byte_ptrs(&a[0], &b[0], min(len(a), len(b)));
}
__string_ne :: inline proc "contextless" (a, b: string) -> bool { return !__string_eq(a, b); }
__string_lt :: inline proc "contextless" (a, b: string) -> bool { return __string_cmp(a, b) < 0; }
__string_gt :: inline proc "contextless" (a, b: string) -> bool { return __string_cmp(a, b) > 0; }
__string_le :: inline proc "contextless" (a, b: string) -> bool { return __string_cmp(a, b) <= 0; }
__string_ge :: inline proc "contextless" (a, b: string) -> bool { return __string_cmp(a, b) >= 0; }
string_ne :: inline proc "contextless" (a, b: string) -> bool { return !string_eq(a, b); }
string_lt :: inline proc "contextless" (a, b: string) -> bool { return string_cmp(a, b) < 0; }
string_gt :: inline proc "contextless" (a, b: string) -> bool { return string_cmp(a, b) > 0; }
string_le :: inline proc "contextless" (a, b: string) -> bool { return string_cmp(a, b) <= 0; }
string_ge :: inline proc "contextless" (a, b: string) -> bool { return string_cmp(a, b) >= 0; }
__cstring_len :: proc "contextless" (s: cstring) -> int {
cstring_len :: proc "contextless" (s: cstring) -> int {
n := 0;
for p := (^byte)(s); p != nil && p^ != 0; p = mem.ptr_offset(p, 1) {
n += 1;
@@ -234,30 +234,30 @@ __cstring_len :: proc "contextless" (s: cstring) -> int {
return n;
}
__cstring_to_string :: proc "contextless" (s: cstring) -> string {
cstring_to_string :: proc "contextless" (s: cstring) -> string {
if s == nil do return "";
ptr := (^byte)(s);
n := __cstring_len(s);
n := cstring_len(s);
return transmute(string)mem.Raw_String{ptr, n};
}
__complex64_eq :: inline proc "contextless" (a, b: complex64) -> bool { return real(a) == real(b) && imag(a) == imag(b); }
__complex64_ne :: inline proc "contextless" (a, b: complex64) -> bool { return real(a) != real(b) || imag(a) != imag(b); }
complex64_eq :: inline proc "contextless" (a, b: complex64) -> bool { return real(a) == real(b) && imag(a) == imag(b); }
complex64_ne :: inline proc "contextless" (a, b: complex64) -> bool { return real(a) != real(b) || imag(a) != imag(b); }
__complex128_eq :: inline proc "contextless" (a, b: complex128) -> bool { return real(a) == real(b) && imag(a) == imag(b); }
__complex128_ne :: inline proc "contextless" (a, b: complex128) -> bool { return real(a) != real(b) || imag(a) != imag(b); }
complex128_eq :: inline proc "contextless" (a, b: complex128) -> bool { return real(a) == real(b) && imag(a) == imag(b); }
complex128_ne :: inline proc "contextless" (a, b: complex128) -> bool { return real(a) != real(b) || imag(a) != imag(b); }
bounds_check_error :: proc "contextless" (file: string, line, column: int, index, count: int) {
if 0 <= index && index < count do return;
fd := os.stderr;
__print_caller_location(fd, Source_Code_Location{file, line, column, ""});
print_caller_location(fd, Source_Code_Location{file, line, column, ""});
os.write_string(fd, " Index ");
__print_i64(fd, i64(index));
print_i64(fd, i64(index));
os.write_string(fd, " is out of bounds range 0:");
__print_i64(fd, i64(count));
print_i64(fd, i64(count));
os.write_byte(fd, '\n');
debug_trap();
}
@@ -267,13 +267,13 @@ slice_expr_error :: proc "contextless" (file: string, line, column: int, lo, hi:
fd := os.stderr;
__print_caller_location(fd, Source_Code_Location{file, line, column, ""});
print_caller_location(fd, Source_Code_Location{file, line, column, ""});
os.write_string(fd, " Invalid slice indices: ");
__print_i64(fd, i64(lo));
print_i64(fd, i64(lo));
os.write_string(fd, ":");
__print_i64(fd, i64(hi));
print_i64(fd, i64(hi));
os.write_string(fd, ":");
__print_i64(fd, i64(len));
print_i64(fd, i64(len));
os.write_byte(fd, '\n');
debug_trap();
}
@@ -282,13 +282,13 @@ dynamic_array_expr_error :: proc "contextless" (file: string, line, column: int,
if 0 <= low && low <= high && high <= max do return;
fd := os.stderr;
__print_caller_location(fd, Source_Code_Location{file, line, column, ""});
print_caller_location(fd, Source_Code_Location{file, line, column, ""});
os.write_string(fd, " Invalid dynamic array values: ");
__print_i64(fd, i64(low));
print_i64(fd, i64(low));
os.write_string(fd, ":");
__print_i64(fd, i64(high));
print_i64(fd, i64(high));
os.write_string(fd, ":");
__print_i64(fd, i64(max));
print_i64(fd, i64(max));
os.write_byte(fd, '\n');
debug_trap();
}
@@ -298,16 +298,16 @@ type_assertion_check :: proc "contextless" (ok: bool, file: string, line, column
if ok do return;
fd := os.stderr;
__print_caller_location(fd, Source_Code_Location{file, line, column, ""});
print_caller_location(fd, Source_Code_Location{file, line, column, ""});
os.write_string(fd, " Invalid type assertion from ");
__print_typeid(fd, from);
print_typeid(fd, from);
os.write_string(fd, " to ");
__print_typeid(fd, to);
print_typeid(fd, to);
os.write_byte(fd, '\n');
debug_trap();
}
__string_decode_rune :: inline proc "contextless" (s: string) -> (rune, int) {
string_decode_rune :: inline proc "contextless" (s: string) -> (rune, int) {
return utf8.decode_rune_from_string(s);
}
@@ -328,9 +328,9 @@ make_slice_error_loc :: inline proc "contextless" (using loc := #caller_location
if 0 <= len do return;
fd := os.stderr;
__print_caller_location(fd, loc);
print_caller_location(fd, loc);
os.write_string(fd, " Invalid slice length for make: ");
__print_i64(fd, i64(len));
print_i64(fd, i64(len));
os.write_byte(fd, '\n');
debug_trap();
}
@@ -339,11 +339,11 @@ make_dynamic_array_error_loc :: inline proc "contextless" (using loc := #caller_
if 0 <= len && len <= cap do return;
fd := os.stderr;
__print_caller_location(fd, loc);
print_caller_location(fd, loc);
os.write_string(fd, " Invalid dynamic array parameters for make: ");
__print_i64(fd, i64(len));
print_i64(fd, i64(len));
os.write_byte(fd, ':');
__print_i64(fd, i64(cap));
print_i64(fd, i64(cap));
os.write_byte(fd, '\n');
debug_trap();
}
@@ -352,9 +352,9 @@ make_map_expr_error_loc :: inline proc "contextless" (using loc := #caller_locat
if 0 <= cap do return;
fd := os.stderr;
__print_caller_location(fd, loc);
print_caller_location(fd, loc);
os.write_string(fd, " Invalid map capacity for make: ");
__print_i64(fd, i64(cap));
print_i64(fd, i64(cap));
os.write_byte(fd, '\n');
debug_trap();
}
@@ -364,64 +364,101 @@ make_map_expr_error_loc :: inline proc "contextless" (using loc := #caller_locat
@(default_calling_convention = "c")
foreign {
@(link_name="llvm.sqrt.f32") __sqrt_f32 :: proc(x: f32) -> f32 ---
@(link_name="llvm.sqrt.f64") __sqrt_f64 :: proc(x: f64) -> f64 ---
@(link_name="llvm.sqrt.f32") sqrt_f32 :: proc(x: f32) -> f32 ---
@(link_name="llvm.sqrt.f64") sqrt_f64 :: proc(x: f64) -> f64 ---
@(link_name="llvm.sin.f32") __sin_f32 :: proc(θ: f32) -> f32 ---
@(link_name="llvm.sin.f64") __sin_f64 :: proc(θ: f64) -> f64 ---
@(link_name="llvm.sin.f32") sin_f32 :: proc(θ: f32) -> f32 ---
@(link_name="llvm.sin.f64") sin_f64 :: proc(θ: f64) -> f64 ---
@(link_name="llvm.cos.f32") __cos_f32 :: proc(θ: f32) -> f32 ---
@(link_name="llvm.cos.f64") __cos_f64 :: proc(θ: f64) -> f64 ---
@(link_name="llvm.cos.f32") cos_f32 :: proc(θ: f32) -> f32 ---
@(link_name="llvm.cos.f64") cos_f64 :: proc(θ: f64) -> f64 ---
@(link_name="llvm.pow.f32") __pow_f32 :: proc(x, power: f32) -> f32 ---
@(link_name="llvm.pow.f64") __pow_f64 :: proc(x, power: f64) -> f64 ---
@(link_name="llvm.pow.f32") pow_f32 :: proc(x, power: f32) -> f32 ---
@(link_name="llvm.pow.f64") pow_f64 :: proc(x, power: f64) -> f64 ---
@(link_name="llvm.fmuladd.f32") fmuladd32 :: proc(a, b, c: f32) -> f32 ---
@(link_name="llvm.fmuladd.f64") fmuladd64 :: proc(a, b, c: f64) -> f64 ---
}
__abs_f32 :: inline proc "contextless" (x: f32) -> f32 {
abs_f32 :: inline proc "contextless" (x: f32) -> f32 {
foreign {
@(link_name="llvm.fabs.f32") _abs :: proc "c" (x: f32) -> f32 ---
}
return _abs(x);
}
__abs_f64 :: inline proc "contextless" (x: f64) -> f64 {
abs_f64 :: inline proc "contextless" (x: f64) -> f64 {
foreign {
@(link_name="llvm.fabs.f64") _abs :: proc "c" (x: f64) -> f64 ---
}
return _abs(x);
}
__min_f32 :: proc(a, b: f32) -> f32 {
min_f32 :: proc(a, b: f32) -> f32 {
foreign {
@(link_name="llvm.minnum.f32") _min :: proc "c" (a, b: f32) -> f32 ---
}
return _min(a, b);
}
__min_f64 :: proc(a, b: f64) -> f64 {
min_f64 :: proc(a, b: f64) -> f64 {
foreign {
@(link_name="llvm.minnum.f64") _min :: proc "c" (a, b: f64) -> f64 ---
}
return _min(a, b);
}
__max_f32 :: proc(a, b: f32) -> f32 {
max_f32 :: proc(a, b: f32) -> f32 {
foreign {
@(link_name="llvm.maxnum.f32") _max :: proc "c" (a, b: f32) -> f32 ---
}
return _max(a, b);
}
__max_f64 :: proc(a, b: f64) -> f64 {
max_f64 :: proc(a, b: f64) -> f64 {
foreign {
@(link_name="llvm.maxnum.f64") _max :: proc "c" (a, b: f64) -> f64 ---
}
return _max(a, b);
}
__abs_complex64 :: inline proc "contextless" (x: complex64) -> f32 {
abs_complex64 :: inline proc "contextless" (x: complex64) -> f32 {
r, i := real(x), imag(x);
return __sqrt_f32(r*r + i*i);
return sqrt_f32(r*r + i*i);
}
__abs_complex128 :: inline proc "contextless" (x: complex128) -> f64 {
abs_complex128 :: inline proc "contextless" (x: complex128) -> f64 {
r, i := real(x), imag(x);
return __sqrt_f64(r*r + i*i);
return sqrt_f64(r*r + i*i);
}
quo_complex64 :: proc(n, m: complex64) -> complex64 {
e, f: f32;
if abs(real(m)) >= abs(imag(m)) {
ratio := imag(m) / real(m);
denom := real(m) + ratio*imag(m);
e = (real(n) + imag(n)*ratio) / denom;
f = (imag(n) - real(n)*ratio) / denom;
} else {
ratio := real(m) / imag(m);
denom := imag(m) + ratio*real(m);
e = (real(n)*ratio + imag(n)) / denom;
f = (imag(n)*ratio - real(n)) / denom;
}
return complex(e, f);
}
quo_complex128 :: proc(n, m: complex128) -> complex128 {
e, f: f64;
if abs(real(m)) >= abs(imag(m)) {
ratio := imag(m) / real(m);
denom := real(m) + ratio*imag(m);
e = (real(n) + imag(n)*ratio) / denom;
f = (imag(n) - real(n)*ratio) / denom;
} else {
ratio := real(m) / imag(m);
denom := imag(m) + ratio*real(m);
e = (real(n)*ratio + imag(n)) / denom;
f = (imag(n)*ratio - real(n)) / denom;
}
return complex(e, f);
}