fixes to ssat missing code

Author: kernelwernel

cmake/flags.cmake

@@ -31,6 +31,10 @@ set(MSVC_CXX_FLAGS
 
 
 set(CLANG_CXX_FLAGS
+    -Werror
+    -Wall
+    -Wextra
+    -Wunused
     -Wnon-virtual-dtor
     -Wold-style-cast
     -Wcast-align
@@ -77,11 +81,7 @@ set(LINUX_RELEASE_CXX_FLAGS
     -march=native
     -mtune=native
     # -fno-omit-frame-pointer for llvm-bolt
-    -Wall
-    -Werror
-    -Wextra
     #-Wshadow
-    -Wunused
     -Wno-unused-parameter # TEMPORARY
     -Wno-return-type # TEMPORARY
     -Wno-unused-variable # TEMPORARY
@@ -98,10 +98,6 @@ set(LINUX_EMBEDDED_CXX_FLAGS
 set(LINUX_DEBUG_CXX_FLAGS
     -g
     -O0
-    -Werror
-    -Wall
-    -Wextra
-    -Wunused
     #-fsanitize=address,undefined,nullability
 
     # for prototyping purposes, should be removed one day

llarm-asm/src/assemble/arm/encoders/special_grouping.cpp

@@ -197,18 +197,23 @@ u32 generators::saturate_instructions(const arm_id id, const operand_struct& arg
 
 
 u32 generators::ssat_instruction(const arm_id id, const operand_struct& args) {
-//    // Fixed bits: 27-25=011, 24-21=0101, 5=1, 4=1
-//    u32 binary = 0b0000'0110'1010'0000'0000'0000'0011'0000;
-//
-//    llarm::util::swap_bits(binary, 28, 31, args.cond);
-//    llarm::util::swap_bits(binary, 16, 20, args.first_int - 1); // sat_imm encoded as immed-1
-//    llarm::util::swap_bits(binary, 12, 15, args.first_reg);     // Rd
-//    llarm::util::swap_bits(binary, 7, 11, args.second_int);     // shift_imm
-//    llarm::util::swap_bits(binary, 0, 3, args.second_reg);      // Rm
-//
-//    return binary;
-
-    // TODO
+    if (id == arm_id::SSAT16) {
+        u32 binary = 0b0000'0110'1010'0000'0000'1111'0011'0000;
+        llarm::util::swap_bits(binary, 28, 31, args.cond);
+        llarm::util::swap_bits(binary, 16, 19, args.first_int - 1); // sat_imm
+        llarm::util::swap_bits(binary, 12, 15, args.first_reg);     // Rd
+        llarm::util::swap_bits(binary, 0, 3, args.second_reg);      // Rm
+        return binary;
+    }
+
+    u32 binary = 0b0000'0110'1010'0000'0000'0000'0001'0000;
+    llarm::util::swap_bits(binary, 28, 31, args.cond);
+    llarm::util::swap_bits(binary, 16, 20, args.first_int - 1);                   // sat_imm
+    llarm::util::swap_bits(binary, 12, 15, args.first_reg);                        // Rd
+    llarm::util::swap_bits(binary, 7, 11, args.second_int);                        // shift_imm
+    llarm::util::modify_bit(binary, 6, args.shifter == shifter_id::USAT_ASR);     // sh
+    llarm::util::swap_bits(binary, 0, 3, args.second_reg);                         // Rm
+    return binary;
 }
 
 

llarm-asm/src/identifiers/string_shifters.cpp

@@ -295,7 +295,7 @@ shifter_id ident::string_shifters::vfp_mul_instruction(const lexemes_t& lexemes,
 }
 
 
-shifter_id ident::string_shifters::usat_instruction(const lexemes_t& lexemes) {
+shifter_id ident::string_shifters::sat_instruction(const lexemes_t& lexemes) {
     using namespace interpreter;
 
     // no shifter
@@ -403,7 +403,8 @@ shifter_id ident::string_shifters::identify_shifter(const lexemes_t& lexemes, co
         case arm_id::FLDS: return shifter_id::VFP_LS_MUL_SPECIAL;
         case arm_id::FSTD: return shifter_id::VFP_LS_MUL_SPECIAL;
         case arm_id::FSTS: return shifter_id::VFP_LS_MUL_SPECIAL;
-        case arm_id::USAT: return usat_instruction(lexemes);
+        case arm_id::USAT: return sat_instruction(lexemes);
+        case arm_id::SSAT: return sat_instruction(lexemes);
         default: return shifter_id::NONE;
     }
 }

llarm-asm/src/identifiers/string_shifters.hpp

@@ -12,7 +12,7 @@ namespace internal::ident::string_shifters {
     shifter_id ls_mul_instruction(const sv mnemonic);
     shifter_id ls_coproc_instruction(const lexemes_t& lexemes);
     shifter_id vfp_mul_instruction(const lexemes_t& lexemes, const sv mnemonic);
-    shifter_id usat_instruction(const lexemes_t& lexemes);
+    shifter_id sat_instruction(const lexemes_t& lexemes);
 
     // PLD has an exception to its addressing mode format
     shifter_id ls_instruction_PLD(const lexemes_t& lexemes);