From 33c15fd03279a986643a73e9c6cf2a1848701253 Mon Sep 17 00:00:00 2001 From: PsiFunction Date: Mon, 2 Sep 2024 17:22:30 +0300 Subject: [PATCH 1/4] + initial support for fp operand --- src/libtriton/arch/arm/aarch64/aarch64Cpu.cpp | 66 ++++++++++++++++++- src/testers/aarch64/unicorn_test_aarch64.py | 3 + 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/src/libtriton/arch/arm/aarch64/aarch64Cpu.cpp b/src/libtriton/arch/arm/aarch64/aarch64Cpu.cpp index 18dfd437b..dd68b5cc6 100644 --- a/src/libtriton/arch/arm/aarch64/aarch64Cpu.cpp +++ b/src/libtriton/arch/arm/aarch64/aarch64Cpu.cpp @@ -523,8 +523,72 @@ namespace triton { break; } + case triton::extlibs::capstone::ARM64_OP_FP: { + if (size == 0) { + throw triton::exceptions::Disassembly("Aarch64Cpu::disassembly(): Cannot correctly decode FP operand"); + } + + auto encode_fp_imm = [size](double fp_value) { + static_assert(sizeof(float) == sizeof(triton::uint32), "Unexpected float type size"); + static_assert(sizeof(double) == sizeof(triton::uint64), "Unexpected double type size"); + + auto IEEE754_f32_to_f16 = [](float value) -> uint16_t { + uint32_t f; + std::memcpy(&f, &value, sizeof(uint32_t)); + uint16_t sign = (f >> 16) & 0x8000; + int16_t exponent = ((f >> 23) & 0xff) - 127 + 15; + uint16_t mantissa = (f >> 13) & 0x3ff; + + if (exponent <= 0) { + if (exponent < -10) { + return sign; + } + mantissa = (mantissa | 0x400) >> (1 - exponent); + return sign | mantissa; + } else if (exponent == 0xff - (127 - 15)) { + if (mantissa) { + return sign | 0x7fff; + } else { + return sign | 0x7c00; + } + } else if (exponent > 30) { + return sign | 0x7c00; + } + return sign | (exponent << 10) | mantissa; + }; + + if (size == sizeof(double)) { + triton::uint64 result; + std:memcpy(&result, &fp_value, sizeof(double)); + return result; + } + else if (size == sizeof(float)) { + float converted = static_cast(fp_value); + triton::uint32 conv_repr; + std::memcpy(&conv_repr, &converted, sizeof(float)); + // just zero extended value + return static_cast(conv_repr); + } + else if (size == 2) { // half-precision + float value = static_cast(fp_value); + return static_cast(IEEE754_f32_to_f16(value)); + } + + throw triton::exceptions::Disassembly("AArch64Cpu::disassembly(): Invalid operand."); + }; + + Immediate imm{encode_fp_imm(op->fp), size}; + + /* Set Shift type and value */ + imm.setShiftType(this->capstoneShiftToTritonShift(op->shift.type)); + imm.setShiftValue(op->shift.value); + + inst.operands.push_back(triton::arch::OperandWrapper(imm)); + } + break; + default: - /* NOTE: FP, CIMM, and missing one are not supported yet. */ + /* NOTE: CIMM, and missing one are not supported yet. */ throw triton::exceptions::Disassembly("AArch64Cpu::disassembly(): Invalid operand."); } // switch } // for operand diff --git a/src/testers/aarch64/unicorn_test_aarch64.py b/src/testers/aarch64/unicorn_test_aarch64.py index 39f354c14..b8ee8b150 100644 --- a/src/testers/aarch64/unicorn_test_aarch64.py +++ b/src/testers/aarch64/unicorn_test_aarch64.py @@ -2156,6 +2156,9 @@ #(b"\x00\x00\xaf\x9e", "fmov v0.D[1], x0"), # working on capstone next branch (b"\x40\x03\x67\x9e", "fmov d0, x26"), (b"\x02\x00\x66\x9e", "fmov x2, d0"), + (b"\x04\x90\xe0\x1e", "fmov h4, #2.5"), + (b"\x00\x10\x20\x1e", "fmov s0, #2.0"), + (b"\x03\x10\x2e\x1e", "fmov s3, #1.0"), ] def emu_with_unicorn(opcode, istate): From 381bda73e42db25e0dc8af459c1ffe38bd1d02b8 Mon Sep 17 00:00:00 2001 From: PsiFunction Date: Mon, 2 Sep 2024 18:24:39 +0300 Subject: [PATCH 2/4] + fix unicorn cpu exceptions in tests on f16 aarch64 feature --- src/testers/aarch64/unicorn_test_aarch64.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/testers/aarch64/unicorn_test_aarch64.py b/src/testers/aarch64/unicorn_test_aarch64.py index b8ee8b150..51b0f2ad1 100644 --- a/src/testers/aarch64/unicorn_test_aarch64.py +++ b/src/testers/aarch64/unicorn_test_aarch64.py @@ -2156,9 +2156,9 @@ #(b"\x00\x00\xaf\x9e", "fmov v0.D[1], x0"), # working on capstone next branch (b"\x40\x03\x67\x9e", "fmov d0, x26"), (b"\x02\x00\x66\x9e", "fmov x2, d0"), - (b"\x04\x90\xe0\x1e", "fmov h4, #2.5"), (b"\x00\x10\x20\x1e", "fmov s0, #2.0"), (b"\x03\x10\x2e\x1e", "fmov s3, #1.0"), + #(b"\x04\x90\xe0\x1e", "fmov h4, #2.5"), # unicorn not implement f16 ops ] def emu_with_unicorn(opcode, istate): From 9887eb7271a35bed399e0db121ead49cbebedf0c Mon Sep 17 00:00:00 2001 From: PsiFunction Date: Tue, 3 Sep 2024 09:26:31 +0300 Subject: [PATCH 3/4] + typo, 64-bit fmov test --- src/libtriton/arch/arm/aarch64/aarch64Cpu.cpp | 2 +- src/testers/aarch64/unicorn_test_aarch64.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libtriton/arch/arm/aarch64/aarch64Cpu.cpp b/src/libtriton/arch/arm/aarch64/aarch64Cpu.cpp index c592d748a..d35fb47b2 100644 --- a/src/libtriton/arch/arm/aarch64/aarch64Cpu.cpp +++ b/src/libtriton/arch/arm/aarch64/aarch64Cpu.cpp @@ -567,7 +567,7 @@ namespace triton { if (size == sizeof(double)) { triton::uint64 result; - std:memcpy(&result, &fp_value, sizeof(double)); + std::memcpy(&result, &fp_value, sizeof(double)); return result; } else if (size == sizeof(float)) { diff --git a/src/testers/aarch64/unicorn_test_aarch64.py b/src/testers/aarch64/unicorn_test_aarch64.py index 51b0f2ad1..f78d8fab7 100644 --- a/src/testers/aarch64/unicorn_test_aarch64.py +++ b/src/testers/aarch64/unicorn_test_aarch64.py @@ -2158,6 +2158,7 @@ (b"\x02\x00\x66\x9e", "fmov x2, d0"), (b"\x00\x10\x20\x1e", "fmov s0, #2.0"), (b"\x03\x10\x2e\x1e", "fmov s3, #1.0"), + (b"\x01\x90\x61\x1e", "fmov d1, #3.5"), #(b"\x04\x90\xe0\x1e", "fmov h4, #2.5"), # unicorn not implement f16 ops ] From 2f912069664a9a8b30a6fe9cfbe0bbb605af02c3 Mon Sep 17 00:00:00 2001 From: PsiFunction Date: Thu, 5 Sep 2024 12:23:49 +0300 Subject: [PATCH 4/4] + move fp operand feature to Imm ctor --- src/libtriton/CMakeLists.txt | 6 +++ src/libtriton/arch/arm/aarch64/aarch64Cpu.cpp | 51 +------------------ src/libtriton/arch/immediate.cpp | 45 +++++++++++++++- src/libtriton/includes/triton/coreUtils.hpp | 14 +++++ src/libtriton/includes/triton/immediate.hpp | 3 ++ src/libtriton/includes/triton/softfloat.hpp | 34 +++++++++++++ src/libtriton/utils/softfloat.cpp | 42 +++++++++++++++ 7 files changed, 144 insertions(+), 51 deletions(-) create mode 100644 src/libtriton/includes/triton/softfloat.hpp create mode 100644 src/libtriton/utils/softfloat.cpp diff --git a/src/libtriton/CMakeLists.txt b/src/libtriton/CMakeLists.txt index f8b664618..dc82de0cc 100644 --- a/src/libtriton/CMakeLists.txt +++ b/src/libtriton/CMakeLists.txt @@ -69,6 +69,7 @@ set(LIBTRITON_SOURCE_FILES stubs/x8664-ms-libc.cpp stubs/x8664-systemv-libc.cpp utils/coreUtils.cpp + utils/softfloat.cpp ) # Define all header files @@ -106,6 +107,7 @@ set(LIBTRITON_HEADER_FILES includes/triton/comparableFunctor.hpp includes/triton/context.hpp includes/triton/coreUtils.hpp + includes/triton/softfloat.hpp includes/triton/cpuInterface.hpp includes/triton/cpuSize.hpp includes/triton/dllexport.hpp @@ -157,6 +159,10 @@ set(LIBTRITON_HEADER_FILES includes/triton/z3ToTriton.hpp ) +set_source_files_properties(utils/softfloat.cpp PROPERTIES COMPILE_DEFINITIONS + ${CMAKE_CXX_BYTE_ORDER} +) + # Define all resource files set(LIBTRITON_RESOURCE_FILES includes/triton/version.hpp.in diff --git a/src/libtriton/arch/arm/aarch64/aarch64Cpu.cpp b/src/libtriton/arch/arm/aarch64/aarch64Cpu.cpp index d35fb47b2..e42f2c610 100644 --- a/src/libtriton/arch/arm/aarch64/aarch64Cpu.cpp +++ b/src/libtriton/arch/arm/aarch64/aarch64Cpu.cpp @@ -536,56 +536,7 @@ namespace triton { throw triton::exceptions::Disassembly("Aarch64Cpu::disassembly(): Cannot correctly decode FP operand"); } - auto encode_fp_imm = [size](double fp_value) { - static_assert(sizeof(float) == sizeof(triton::uint32), "Unexpected float type size"); - static_assert(sizeof(double) == sizeof(triton::uint64), "Unexpected double type size"); - - auto IEEE754_f32_to_f16 = [](float value) -> uint16_t { - uint32_t f; - std::memcpy(&f, &value, sizeof(uint32_t)); - uint16_t sign = (f >> 16) & 0x8000; - int16_t exponent = ((f >> 23) & 0xff) - 127 + 15; - uint16_t mantissa = (f >> 13) & 0x3ff; - - if (exponent <= 0) { - if (exponent < -10) { - return sign; - } - mantissa = (mantissa | 0x400) >> (1 - exponent); - return sign | mantissa; - } else if (exponent == 0xff - (127 - 15)) { - if (mantissa) { - return sign | 0x7fff; - } else { - return sign | 0x7c00; - } - } else if (exponent > 30) { - return sign | 0x7c00; - } - return sign | (exponent << 10) | mantissa; - }; - - if (size == sizeof(double)) { - triton::uint64 result; - std::memcpy(&result, &fp_value, sizeof(double)); - return result; - } - else if (size == sizeof(float)) { - float converted = static_cast(fp_value); - triton::uint32 conv_repr; - std::memcpy(&conv_repr, &converted, sizeof(float)); - // just zero extended value - return static_cast(conv_repr); - } - else if (size == 2) { // half-precision - float value = static_cast(fp_value); - return static_cast(IEEE754_f32_to_f16(value)); - } - - throw triton::exceptions::Disassembly("AArch64Cpu::disassembly(): Invalid operand."); - }; - - Immediate imm{encode_fp_imm(op->fp), size}; + Immediate imm{op->fp, size, this->getEndianness()}; /* Set Shift type and value */ imm.setShiftType(this->capstoneShiftToTritonShift(op->shift.type)); diff --git a/src/libtriton/arch/immediate.cpp b/src/libtriton/arch/immediate.cpp index 301e25a8f..a3493d2cc 100644 --- a/src/libtriton/arch/immediate.cpp +++ b/src/libtriton/arch/immediate.cpp @@ -5,10 +5,17 @@ ** This program is under the terms of the Apache License 2.0. */ +#include #include #include -#include +#include +#include +#ifdef LITTLE_ENDIAN // provided by CMake +constexpr auto sys_endianness = triton::arch::LE_ENDIANNESS; +#else +constexpr auto sys_endianness = triton::arch::BE_ENDIANNESS; +#endif namespace triton { @@ -23,6 +30,42 @@ namespace triton { this->setValue(value, size); } + Immediate::Immediate(double value, triton::uint32 size /* bytes */, triton::arch::endianness_e platform_endianness) { + triton::uint64 imm_value; + + auto need_swap = sys_endianness != platform_endianness; + + if (size == sizeof(double)) { + static_assert(sizeof(double) == sizeof(triton::uint64), + "Unexpected double type size"); + std::memcpy(&imm_value, &value, sizeof(double)); + if (need_swap) { + imm_value = utils::byteswap(imm_value); + } + } + else if (size == sizeof(float)) { // single-precision + float fvalue = static_cast(value); + triton::uint32 repr; + static_assert(sizeof(float) == sizeof(uint32_t), + "Unexpected float type size"); + std::memcpy(&repr, &fvalue, sizeof(float)); + + imm_value = need_swap ? static_cast(utils::byteswap(repr)) + : static_cast(repr); + } else if (size == 2) { // half-precision + float fvalue = static_cast(value); + triton::uint16 repr = sf::f32_to_f16(fvalue); + imm_value = need_swap ? static_cast(utils::byteswap(repr)) + : static_cast(repr); + + } + else { + throw triton::exceptions::Immediate("Immediate::Immediate(double): Invalid encoding size."); + } + + this->setValue(imm_value, size); + } + Immediate::Immediate(const Immediate& other) : BitsVector(other), diff --git a/src/libtriton/includes/triton/coreUtils.hpp b/src/libtriton/includes/triton/coreUtils.hpp index 9fdec4d62..660523cb9 100644 --- a/src/libtriton/includes/triton/coreUtils.hpp +++ b/src/libtriton/includes/triton/coreUtils.hpp @@ -10,6 +10,7 @@ #include #include +#include #include #include @@ -81,6 +82,19 @@ namespace triton { template <> TRITON_EXPORT triton::uint80 cast(const triton::uint512& value); template <> TRITON_EXPORT triton::uint512 cast(const triton::uint80& value); + template + std::enable_if_t< + std::is_unsigned_v, + T> + byteswap(T value) { + std::array repr; + std::memcpy(&repr, &value, sizeof(value)); + std::reverse(repr.begin(), repr.end()); + T result; + std::memcpy(&result, &repr, sizeof(result)); + return result; + } + /*! @} End of utils namespace */ }; /*! @} End of triton namespace */ diff --git a/src/libtriton/includes/triton/immediate.hpp b/src/libtriton/includes/triton/immediate.hpp index 9db4a9301..29f94a9c5 100644 --- a/src/libtriton/includes/triton/immediate.hpp +++ b/src/libtriton/includes/triton/immediate.hpp @@ -50,6 +50,9 @@ namespace triton { //! Constructor. TRITON_EXPORT Immediate(triton::uint64 value, triton::uint32 size /* bytes*/); + //! Constructor. + TRITON_EXPORT Immediate(double value, triton::uint32 size /* bytes */, triton::arch::endianness_e platform_endianness); + //! Constructor by copy. TRITON_EXPORT Immediate(const Immediate& other); diff --git a/src/libtriton/includes/triton/softfloat.hpp b/src/libtriton/includes/triton/softfloat.hpp new file mode 100644 index 000000000..6c47fa127 --- /dev/null +++ b/src/libtriton/includes/triton/softfloat.hpp @@ -0,0 +1,34 @@ +//! \file +/* +** Copyright (C) - Triton +** +** This program is under the terms of the Apache License 2.0. +*/ + +#ifndef TRITON_SOFTFLOAT_HPP +#define TRITON_SOFTFLOAT_HPP + +#include + +//! The Triton namespace +namespace triton { +/*! + * \addtogroup triton + * @{ + */ + //! The Softfloat namespace + namespace sf { + /*! + * \ingroup triton + * \addtogroup softfloat + * @{ + */ + + //! Cast 32-bit floating point value to 16-bit according to IEEE-754 + auto f32_to_f16(float value) -> uint16_t; + + } + +} + +#endif /* TRITON_SOFTFLOAT_HPP */ \ No newline at end of file diff --git a/src/libtriton/utils/softfloat.cpp b/src/libtriton/utils/softfloat.cpp new file mode 100644 index 000000000..8781b5d4a --- /dev/null +++ b/src/libtriton/utils/softfloat.cpp @@ -0,0 +1,42 @@ +//! \file +/* +** Copyright (C) - Triton +** +** This program is under the terms of the Apache License 2.0. +*/ + +#include + +#include + +namespace triton { + namespace sf { + + auto f32_to_f16(float value) -> uint16_t { + uint32_t f; + static_assert(sizeof(float) == sizeof(uint32_t), + "Unexpected float type size"); + std::memcpy(&f, &value, sizeof(uint32_t)); + uint16_t sign = (f >> 16) & 0x8000; + int16_t exponent = ((f >> 23) & 0xff) - 127 + 15; + uint16_t mantissa = (f >> 13) & 0x3ff; + if (exponent <= 0) { + if (exponent < -10) { + return sign; + } + mantissa = (mantissa | 0x400) >> (1 - exponent); + return sign | mantissa; + } else if (exponent == 0xff - (127 - 15)) { + if (mantissa) { + return sign | 0x7fff; + } else { + return sign | 0x7c00; + } + } else if (exponent > 30) { + return sign | 0x7c00; + } + return sign | (exponent << 10) | mantissa; + } + + } /* sf namespace */ +} /* triton namespace */ \ No newline at end of file