diff options
| author | gingerBill <bill@gingerbill.org> | 2022-06-02 12:10:43 +0100 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2022-06-02 12:10:43 +0100 |
| commit | bb7f291f5fa9d412d5ff15b8de4a46b6ad2704e2 (patch) | |
| tree | ea937bb951f272a956c19661372ff161c3292101 | |
| parent | ba5f7c4e2af5c82c220b7e1796fde2f026ce4208 (diff) | |
Remove `simd_rem`; Disallow `simd_div` for integers
| -rw-r--r-- | core/intrinsics/intrinsics.odin | 3 | ||||
| -rw-r--r-- | core/simd/simd.odin | 3 | ||||
| -rw-r--r-- | src/check_builtin.cpp | 9 | ||||
| -rw-r--r-- | src/check_expr.cpp | 6 |
4 files changed, 15 insertions, 6 deletions
diff --git a/core/intrinsics/intrinsics.odin b/core/intrinsics/intrinsics.odin index 9994a1914..22b5d953d 100644 --- a/core/intrinsics/intrinsics.odin +++ b/core/intrinsics/intrinsics.odin @@ -194,8 +194,7 @@ constant_utf16_cstring :: proc($literal: string) -> [^]u16 --- simd_add :: proc(a, b: #simd[N]T) -> #simd[N]T --- simd_sub :: proc(a, b: #simd[N]T) -> #simd[N]T --- simd_mul :: proc(a, b: #simd[N]T) -> #simd[N]T --- -simd_div :: proc(a, b: #simd[N]T) -> #simd[N]T --- -simd_rem :: proc(a, b: #simd[N]T) -> #simd[N]T --- +simd_div :: proc(a, b: #simd[N]T) -> #simd[N]T where type_is_float(T) --- // Keeps Odin's Behaviour // (x << y) if y <= mask else 0 diff --git a/core/simd/simd.odin b/core/simd/simd.odin index 390ff377a..a0a4df28d 100644 --- a/core/simd/simd.odin +++ b/core/simd/simd.odin @@ -61,8 +61,7 @@ b64x8 :: #simd[8]b64 add :: intrinsics.simd_add sub :: intrinsics.simd_sub mul :: intrinsics.simd_mul -div :: intrinsics.simd_div -rem :: intrinsics.simd_rem // integers only +div :: intrinsics.simd_div // floats only // Keeps Odin's Behaviour // (x << y) if y <= mask else 0 diff --git a/src/check_builtin.cpp b/src/check_builtin.cpp index 92e3987a0..8108604ba 100644 --- a/src/check_builtin.cpp +++ b/src/check_builtin.cpp @@ -452,6 +452,13 @@ bool check_builtin_simd_operation(CheckerContext *c, Operand *operand, Ast *call return false; } + if (id == BuiltinProc_simd_div && is_type_integer(elem)) { + gbString xs = type_to_string(x.type); + error(x.expr, "'%.*s' is not supported for integer elements, got '%s'", LIT(builtin_name), xs); + gb_string_free(xs); + // don't return + } + operand->mode = Addressing_Value; operand->type = x.type; return true; @@ -460,7 +467,6 @@ bool check_builtin_simd_operation(CheckerContext *c, Operand *operand, Ast *call // Integer only case BuiltinProc_simd_add_sat: case BuiltinProc_simd_sub_sat: - case BuiltinProc_simd_rem: case BuiltinProc_simd_and: case BuiltinProc_simd_or: case BuiltinProc_simd_xor: @@ -492,7 +498,6 @@ bool check_builtin_simd_operation(CheckerContext *c, Operand *operand, Ast *call switch (id) { case BuiltinProc_simd_add_sat: case BuiltinProc_simd_sub_sat: - case BuiltinProc_simd_rem: if (!is_type_integer(elem)) { gbString xs = type_to_string(x.type); error(x.expr, "'%.*s' expected a #simd type with an integer element, got '%s'", LIT(builtin_name), xs); diff --git a/src/check_expr.cpp b/src/check_expr.cpp index f954f1583..58972d2cf 100644 --- a/src/check_expr.cpp +++ b/src/check_expr.cpp @@ -1618,6 +1618,9 @@ bool check_binary_op(CheckerContext *c, Operand *o, Token op) { if (is_type_matrix(main_type)) { error(op, "Operator '%.*s' is only allowed with matrix types", LIT(op.string)); return false; + } else if (is_type_simd_vector(main_type) && is_type_integer(type)) { + error(op, "Operator '%.*s' is only allowed with #simd types with integer elements", LIT(op.string)); + return false; } /*fallthrough*/ case Token_Mul: @@ -1669,6 +1672,9 @@ bool check_binary_op(CheckerContext *c, Operand *o, Token op) { if (!is_type_integer(type)) { error(op, "Operator '%.*s' is only allowed with integers", LIT(op.string)); return false; + } else if (is_type_simd_vector(main_type)) { + error(op, "Operator '%.*s' is only allowed with #simd types with integer elements", LIT(op.string)); + return false; } break; |