From fa5d00521b90583939282f5668b88f77f49d157f Mon Sep 17 00:00:00 2001 From: gingerBill Date: Mon, 4 Feb 2019 12:15:51 +0000 Subject: [PATCH] Remove `inline` from many of the mem.* procedures --- core/mem/mem.odin | 10 +++++----- src/big_int.cpp | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/core/mem/mem.odin b/core/mem/mem.odin index 5f9bd6848..3e49e8b4d 100644 --- a/core/mem/mem.odin +++ b/core/mem/mem.odin @@ -9,7 +9,7 @@ swap :: proc{swap16, swap32, swap64}; -set :: inline proc "contextless" (data: rawptr, value: byte, len: int) -> rawptr { +set :: proc "contextless" (data: rawptr, value: byte, len: int) -> rawptr { if data == nil do return nil; if len < 0 do return data; foreign _ { @@ -30,14 +30,14 @@ zero :: inline proc "contextless" (data: rawptr, len: int) -> rawptr { zero_item :: inline proc "contextless" (item: $P/^$T) { set(item, 0, size_of(T)); } -zero_slice :: inline proc "contextless" (data: $T/[]$E) { +zero_slice :: proc "contextless" (data: $T/[]$E) { if n := len(data); n > 0 { zero(&data[0], size_of(E)*n); } } -copy :: inline proc "contextless" (dst, src: rawptr, len: int) -> rawptr { +copy :: proc "contextless" (dst, src: rawptr, len: int) -> rawptr { if src == nil do return dst; // NOTE(bill): This _must_ be implemented like C's memmove foreign _ { @@ -52,7 +52,7 @@ copy :: inline proc "contextless" (dst, src: rawptr, len: int) -> rawptr { llvm_memmove(dst, src, len, 1, false); return dst; } -copy_non_overlapping :: inline proc "contextless" (dst, src: rawptr, len: int) -> rawptr { +copy_non_overlapping :: proc "contextless" (dst, src: rawptr, len: int) -> rawptr { if src == nil do return dst; // NOTE(bill): This _must_ be implemented like C's memcpy foreign _ { @@ -71,7 +71,7 @@ compare :: inline proc "contextless" (a, b: []byte) -> int { return compare_byte_ptrs(&a[0], &b[0], min(len(a), len(b))); } compare_byte_ptrs :: proc "contextless" (a, b: ^byte, n: int) -> int #no_bounds_check { - ptr_idx :: inline proc(ptr: $P/^$T, n: int) -> T { + ptr_idx :: proc(ptr: $P/^$T, n: int) -> T { return ptr_offset(ptr, n)^; } diff --git a/src/big_int.cpp b/src/big_int.cpp index f6b9b2eca..dc3d50589 100644 --- a/src/big_int.cpp +++ b/src/big_int.cpp @@ -441,7 +441,6 @@ void big_int_add(BigInt *dst, BigInt const *x, BigInt const *y) { u64 first_word = dst->d.word; big_int_alloc(dst, 0, gb_max(x->len, y->len)+1); - GB_ASSERT(dst->len > 1); dst->d.words[0] = first_word; i32 i = 1;