From 9f15ad4795caddeecc95073120d5a1056ca2bb8a Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Tue, 27 Dec 2022 18:26:29 -0500 Subject: [PATCH] simplify by using a custom constructor --- lib/lepton/src/CompiledExpression.cpp | 7 +++---- lib/lepton/src/CompiledVectorExpression.cpp | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/lepton/src/CompiledExpression.cpp b/lib/lepton/src/CompiledExpression.cpp index b3a1fadf41..622c1c2ecf 100644 --- a/lib/lepton/src/CompiledExpression.cpp +++ b/lib/lepton/src/CompiledExpression.cpp @@ -515,7 +515,8 @@ void CompiledExpression::generateTwoArgCall(a64::Compiler& c, arm::Vec& dest, ar } #else -union int64_vs_double { +union int64_to_double { + int64_to_double(int64_t _i) { i = _i; } int64_t i; double d; }; @@ -568,9 +569,7 @@ void CompiledExpression::generateJitCode() { else if (op.getId() == Operation::DELTA) value = 1.0; else if (op.getId() == Operation::ABS) { - int64_vs_double mask; - mask.i = 0x7FFFFFFFFFFFFFFF; - value = mask.d; + value = int64_to_double(0x7FFFFFFFFFFFFFFF).d; } else if (op.getId() == Operation::POWER_CONSTANT) { if (stepGroup[step] == -1) diff --git a/lib/lepton/src/CompiledVectorExpression.cpp b/lib/lepton/src/CompiledVectorExpression.cpp index 85b492bb3c..2e560d2051 100644 --- a/lib/lepton/src/CompiledVectorExpression.cpp +++ b/lib/lepton/src/CompiledVectorExpression.cpp @@ -573,7 +573,8 @@ void CompiledVectorExpression::generateTwoArgCall(a64::Compiler& c, arm::Vec& de } #else -union int_vs_float { +union int_to_float { + int_to_float(int _i) { i = _i; } int i; float f; }; @@ -629,9 +630,7 @@ void CompiledVectorExpression::generateJitCode() { else if (op.getId() == Operation::DELTA) value = 1.0; else if (op.getId() == Operation::ABS) { - int_vs_float mask; - mask.i = 0x7FFFFFFF; - value = mask.f; + value = int_to_float(0x7FFFFFFF).f; } else if (op.getId() == Operation::POWER_CONSTANT) { if (stepGroup[step] == -1)