diff --git a/firmware/asm/arm/ffs.S b/firmware/asm/arm/ffs.S index 4e912c5317..b7d4307803 100644 --- a/firmware/asm/arm/ffs.S +++ b/firmware/asm/arm/ffs.S @@ -32,6 +32,7 @@ * 31 - bit 31 is set * 32 - no bits set ****************************************************************************/ + .syntax unified .align 2 .global find_first_set_bit .type find_first_set_bit,%function diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c index 967878b2e4..f4adbe8b33 100644 --- a/firmware/drivers/lcd-16bit.c +++ b/firmware/drivers/lcd-16bit.c @@ -189,6 +189,7 @@ void ICODE_ATTR lcd_bitmap_transparent_part(const fb_data *src, int src_x, { int w, px; asm volatile ( + BEGIN_ARM_ASM_SYNTAX_UNIFIED ".rowstart: \n" "mov %[w], %[width] \n" /* Load width for inner loop */ ".nextpixel: \n" @@ -196,15 +197,16 @@ void ICODE_ATTR lcd_bitmap_transparent_part(const fb_data *src, int src_x, "add %[d], %[d], #2 \n" /* Uncoditionally increment dst */ /* done here for better pipelining */ "cmp %[px], %[fgcolor] \n" /* Compare to foreground color */ - "streqh %[fgpat], [%[d], #-2] \n" /* Store foregroud if match */ + "strheq %[fgpat], [%[d], #-2] \n" /* Store foregroud if match */ "cmpne %[px], %[transcolor] \n" /* Compare to transparent color */ - "strneh %[px], [%[d], #-2] \n" /* Store dst if not transparent */ + "strhne %[px], [%[d], #-2] \n" /* Store dst if not transparent */ "subs %[w], %[w], #1 \n" /* Width counter has run down? */ "bgt .nextpixel \n" /* More in this row? */ "add %[s], %[s], %[sstp], lsl #1 \n" /* Skip over to start of next line */ "add %[d], %[d], %[dstp], lsl #1 \n" "subs %[h], %[h], #1 \n" /* Height counter has run down? */ "bgt .rowstart \n" /* More rows? */ + END_ARM_ASM_SYNTAX_UNIFIED : [w]"=&r"(w), [h]"+&r"(height), [px]"=&r"(px), [s]"+&r"(src), [d]"+&r"(dst) : [width]"r"(width), diff --git a/lib/rbcodec/codecs/demac/libdemac/predictor-arm.S b/lib/rbcodec/codecs/demac/libdemac/predictor-arm.S index 92a78ed9b4..1e7a2e05c4 100644 --- a/lib/rbcodec/codecs/demac/libdemac/predictor-arm.S +++ b/lib/rbcodec/codecs/demac/libdemac/predictor-arm.S @@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA */ #include "demac_config.h" + .syntax unified .section ICODE_SECTION_DEMAC_ARM,"ax",%progbits .align 2 diff --git a/lib/rbcodec/codecs/libatrac/atrac3_arm.S b/lib/rbcodec/codecs/libatrac/atrac3_arm.S index 68f8de2c4e..3a81039d2b 100644 --- a/lib/rbcodec/codecs/libatrac/atrac3_arm.S +++ b/lib/rbcodec/codecs/libatrac/atrac3_arm.S @@ -21,6 +21,7 @@ #include "config.h" + .syntax unified .section .text, "ax", %progbits /**************************************************************************** diff --git a/lib/rbcodec/codecs/libatrac/atrac3_armv5e.S b/lib/rbcodec/codecs/libatrac/atrac3_armv5e.S index 1d9d35a5da..d5ba92c55d 100644 --- a/lib/rbcodec/codecs/libatrac/atrac3_armv5e.S +++ b/lib/rbcodec/codecs/libatrac/atrac3_armv5e.S @@ -21,6 +21,7 @@ #include "config.h" + .syntax unified .section .text, "ax", %progbits diff --git a/lib/rbcodec/codecs/libffmpegFLAC/arm.S b/lib/rbcodec/codecs/libffmpegFLAC/arm.S index 8adca77ce5..70a0f7de49 100644 --- a/lib/rbcodec/codecs/libffmpegFLAC/arm.S +++ b/lib/rbcodec/codecs/libffmpegFLAC/arm.S @@ -21,6 +21,8 @@ #include "config.h" + .syntax unified + /* The following is an assembler optimised version of the LPC filtering routines needed for FLAC decoding. It is optimised for use with ARM processors. diff --git a/lib/rbcodec/codecs/libmad/imdct_l_arm.S b/lib/rbcodec/codecs/libmad/imdct_l_arm.S index b511ff169d..86a0fcde8b 100644 --- a/lib/rbcodec/codecs/libmad/imdct_l_arm.S +++ b/lib/rbcodec/codecs/libmad/imdct_l_arm.S @@ -202,6 +202,7 @@ @***************************************************************************** + .syntax unified .text .align diff --git a/lib/rbcodec/codecs/libmad/synth_full_arm.S b/lib/rbcodec/codecs/libmad/synth_full_arm.S index 0a4f9b93c2..3489cea09d 100644 --- a/lib/rbcodec/codecs/libmad/synth_full_arm.S +++ b/lib/rbcodec/codecs/libmad/synth_full_arm.S @@ -22,6 +22,7 @@ #include "config.h" #include "mad_iram.h" + .syntax unified .section ICODE_SECTION_MPA_ARM,"ax",%progbits .global synth_full_odd_sbsample diff --git a/lib/rbcodec/codecs/libmusepack/synth_filter_arm.S b/lib/rbcodec/codecs/libmusepack/synth_filter_arm.S index 23bc429c49..da560bb14a 100644 --- a/lib/rbcodec/codecs/libmusepack/synth_filter_arm.S +++ b/lib/rbcodec/codecs/libmusepack/synth_filter_arm.S @@ -21,6 +21,7 @@ #include "config.h" + .syntax unified #if defined(CPU_S5L87XX) /* Moving this asm routine to iram is (little) faster on S5L87xx. */ .section .icode, "ax", %progbits diff --git a/lib/rbcodec/codecs/libspeex/filters_arm4.S b/lib/rbcodec/codecs/libspeex/filters_arm4.S index e652ede554..0386851077 100644 --- a/lib/rbcodec/codecs/libspeex/filters_arm4.S +++ b/lib/rbcodec/codecs/libspeex/filters_arm4.S @@ -33,6 +33,7 @@ */ #include "config.h" + .syntax unified #if CONFIG_CPU == PP5002 .section .icode,"ax",%progbits #else diff --git a/lib/rbcodec/codecs/libwavpack/arm.S b/lib/rbcodec/codecs/libwavpack/arm.S index 32de1df7de..c4cb3459a8 100644 --- a/lib/rbcodec/codecs/libwavpack/arm.S +++ b/lib/rbcodec/codecs/libwavpack/arm.S @@ -38,6 +38,7 @@ #include "config.h" + .syntax unified .text .align .global decorr_stereo_pass_cont_arm diff --git a/lib/rbcodec/codecs/libwavpack/arml.S b/lib/rbcodec/codecs/libwavpack/arml.S index 60818aa1e6..0705a5e7ad 100644 --- a/lib/rbcodec/codecs/libwavpack/arml.S +++ b/lib/rbcodec/codecs/libwavpack/arml.S @@ -40,6 +40,7 @@ #include "config.h" + .syntax unified .text .align .global decorr_stereo_pass_cont_arml