From 50738a6bd8162e421dad0f11b335946291c2c2ae Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Thu, 11 Jun 2015 11:42:36 +0300 Subject: [PATCH] arm: Properly match /* */ comments in the arm assembly Some versions of the clang built-in assembler interprets /* as a start of a multi-line comment, even within lines starting with a @. Therefore, make sure to terminate these properly. This fixes warnings about /* within a block comment when building using the clang built-in assembler (in some versions of clang), and fixes issues where part of the assembly source was effectively commented out, when building with this assembler. Change-Id: I4b520334d92740f8c60def94ee990561b2cb8b7c --- encoder/arm/ih264e_evaluate_intra16x16_modes_a9q.s | 7 +++---- encoder/arm/ih264e_evaluate_intra4x4_modes_a9q.s | 3 --- encoder/arm/ih264e_evaluate_intra_chroma_modes_a9q.s | 1 - encoder/arm/ih264e_fmt_conv.s | 2 -- encoder/arm/ih264e_half_pel.s | 1 - encoder/armv8/ih264e_evaluate_intra16x16_modes_av8.s | 1 - encoder/armv8/ih264e_evaluate_intra_chroma_modes_av8.s | 1 - encoder/armv8/ih264e_half_pel_av8.s | 1 - 8 files changed, 3 insertions(+), 14 deletions(-) diff --git a/encoder/arm/ih264e_evaluate_intra16x16_modes_a9q.s b/encoder/arm/ih264e_evaluate_intra16x16_modes_a9q.s index fe0ce17..9f5bfa9 100644 --- a/encoder/arm/ih264e_evaluate_intra16x16_modes_a9q.s +++ b/encoder/arm/ih264e_evaluate_intra16x16_modes_a9q.s @@ -17,7 +17,6 @@ @ ***************************************************************************** @ * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore @*/ -@/** @/** @****************************************************************************** @@ -102,11 +101,11 @@ ih264e_evaluate_intra16x16_modes_a9q: vld1.32 {q5}, [r1]! mov r11, #0 mov r4, #0 - @/* Left available ???? + @/* Left available ???? */ ands r7, r5, #01 movne r10, #1 - @/* Top available ???? + @/* Top available ???? */ ands r8, r5, #04 lsl r9, r10, #3 movne r11, #1 @@ -114,7 +113,7 @@ ih264e_evaluate_intra16x16_modes_a9q: adds r8, r9, r12 - @/* None available :( + @/* None available :( */ moveq r4, #128 diff --git a/encoder/arm/ih264e_evaluate_intra4x4_modes_a9q.s b/encoder/arm/ih264e_evaluate_intra4x4_modes_a9q.s index 568e623..6137054 100644 --- a/encoder/arm/ih264e_evaluate_intra4x4_modes_a9q.s +++ b/encoder/arm/ih264e_evaluate_intra4x4_modes_a9q.s @@ -17,9 +17,7 @@ @ ***************************************************************************** @ * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore @*/ -@/** -@/** .data .p2align 2 @@ -38,7 +36,6 @@ scratch_intrapred_luma_4x4_prediction_addr1: -@/** @/** @****************************************************************************** @* diff --git a/encoder/arm/ih264e_evaluate_intra_chroma_modes_a9q.s b/encoder/arm/ih264e_evaluate_intra_chroma_modes_a9q.s index e4dfca8..bdbaa02 100644 --- a/encoder/arm/ih264e_evaluate_intra_chroma_modes_a9q.s +++ b/encoder/arm/ih264e_evaluate_intra_chroma_modes_a9q.s @@ -17,7 +17,6 @@ @ ***************************************************************************** @ * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore @*/ -@/** @/** @****************************************************************************** diff --git a/encoder/arm/ih264e_fmt_conv.s b/encoder/arm/ih264e_fmt_conv.s index 3b7825a..f8f5e42 100644 --- a/encoder/arm/ih264e_fmt_conv.s +++ b/encoder/arm/ih264e_fmt_conv.s @@ -17,11 +17,9 @@ @ ***************************************************************************** @ * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore @*/ -@/** .text .p2align 2 -@/** @/***************************************************************************** @* * diff --git a/encoder/arm/ih264e_half_pel.s b/encoder/arm/ih264e_half_pel.s index 1b9a87a..3ae6130 100644 --- a/encoder/arm/ih264e_half_pel.s +++ b/encoder/arm/ih264e_half_pel.s @@ -43,7 +43,6 @@ .text .p2align 2 -@ /** @/******************************************************************************* @* @* @brief diff --git a/encoder/armv8/ih264e_evaluate_intra16x16_modes_av8.s b/encoder/armv8/ih264e_evaluate_intra16x16_modes_av8.s index 6058bf2..e24ef49 100644 --- a/encoder/armv8/ih264e_evaluate_intra16x16_modes_av8.s +++ b/encoder/armv8/ih264e_evaluate_intra16x16_modes_av8.s @@ -17,7 +17,6 @@ //***************************************************************************** //* Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore //*/ -///** ///** //****************************************************************************** diff --git a/encoder/armv8/ih264e_evaluate_intra_chroma_modes_av8.s b/encoder/armv8/ih264e_evaluate_intra_chroma_modes_av8.s index 9313ad1..bb2526d 100644 --- a/encoder/armv8/ih264e_evaluate_intra_chroma_modes_av8.s +++ b/encoder/armv8/ih264e_evaluate_intra_chroma_modes_av8.s @@ -17,7 +17,6 @@ //***************************************************************************** //* Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore //*/ -///** ///** //****************************************************************************** diff --git a/encoder/armv8/ih264e_half_pel_av8.s b/encoder/armv8/ih264e_half_pel_av8.s index 8b36ab2..8f27104 100644 --- a/encoder/armv8/ih264e_half_pel_av8.s +++ b/encoder/armv8/ih264e_half_pel_av8.s @@ -44,7 +44,6 @@ .p2align 2 .include "ih264_neon_macros.s" -// /** ///******************************************************************************* //* //* @brief