mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/hexagon: Rename macros.inc -> macros.h.inc

Browse Source 
Since commits 139c1837db ("meson: rename included C source files
to .c.inc") and 0979ed017f ("meson: rename .inc.h files to .h.inc"),
EMU standard procedure for included header files is to use *.h.inc.

Besides, since commit 6a0057aa22 ("docs/devel: make a statement
about includes") this is documented in the Coding Style:

  If you do use template header files they should be named with
  the ``.c.inc`` or ``.h.inc`` suffix to make it clear they are
  being included for expansion.

Therefore rename "macros.inc" as "macros.h.inc".

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Brian Cain <bcain@quicinc.com>
Reviewed-by: Anton Johansson <anjo@rev.ng>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Philippe Mathieu-Daudé 2024-09-10 13:28:32 +02:00 committed by Michael Tokarev
parent 0addb05a8c
commit b8daa5fc8b
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/hexagon/gen_idef_parser_funcs.py
View File

@ -50,7 +50,7 @@ def main():
tagimms = hex_common.get_tagimms() tagimms = hex_common.get_tagimms()
with open(sys.argv[-1], "w") as f: with open(sys.argv[-1], "w") as f:
f.write('#include "macros.inc"\n\n') f.write('#include "macros.h.inc"\n\n')
for tag in hex_common.tags: for tag in hex_common.tags:
## Skip the priv instructions ## Skip the priv instructions

4
target/hexagon/idef-parser/README.rst
View File

@ -138,7 +138,7 @@ we obtain the pseudo code
with macros such as ``fJUMPR`` intact. with macros such as ``fJUMPR`` intact.
The second step is to expand macros into a form suitable for our parser. The second step is to expand macros into a form suitable for our parser.
These macros are defined in ``idef-parser/macros.inc`` and the step is These macros are defined in ``idef-parser/macros.h.inc`` and the step is
carried out by the ``prepare`` script which runs the C preprocessor on carried out by the ``prepare`` script which runs the C preprocessor on
``idef_parser_input.h.inc`` to produce ``idef_parser_input.h.inc`` to produce
``idef_parser_input.preprocessed.h.inc``. ``idef_parser_input.preprocessed.h.inc``.
@ -266,7 +266,7 @@ in plain C is defined as
#define fABS(A) (((A) < 0) ? (-(A)) : (A)) #define fABS(A) (((A) < 0) ? (-(A)) : (A))
and returns the absolute value of the argument ``A``. This macro is not included and returns the absolute value of the argument ``A``. This macro is not included
in ``idef-parser/macros.inc`` and as such is not expanded and kept as a "call" in ``idef-parser/macros.h.inc`` and as such is not expanded and kept as a "call"
``fABS(...)``. Reason being, that ``fABS`` is easier to match and map to ``fABS(...)``. Reason being, that ``fABS`` is easier to match and map to
``tcg_gen_abs_<width>``, compared to the full ternary expression above. Loads of ``tcg_gen_abs_<width>``, compared to the full ternary expression above. Loads of
macros in ``macros.h`` are kept unexpanded to aid in parsing, as seen in the macros in ``macros.h`` are kept unexpanded to aid in parsing, as seen in the

0
target/hexagon/idef-parser/macros.inc → target/hexagon/idef-parser/macros.h.inc
View File

2
target/hexagon/meson.build
View File

@ -284,7 +284,7 @@ if idef_parser_enabled and 'hexagon-linux-user' in target_dirs
'idef_parser_input.preprocessed.h.inc', 'idef_parser_input.preprocessed.h.inc',
output: 'idef_parser_input.preprocessed.h.inc', output: 'idef_parser_input.preprocessed.h.inc',
input: idef_parser_input_generated, input: idef_parser_input_generated,
depend_files: [idef_parser_dir / 'macros.inc'], depend_files: [idef_parser_dir / 'macros.h.inc'],
command: [idef_parser_dir / 'prepare', '@INPUT@', '-I' + idef_parser_dir, '-o', '@OUTPUT@'], command: [idef_parser_dir / 'prepare', '@INPUT@', '-I' + idef_parser_dir, '-o', '@OUTPUT@'],
) )