From: Gaius Mulley <gaius.mulley@southwales.ac.uk>
Date: Fri, 20 May 2022 01:39:14 +0000 (+0100)
Subject: gcc/m2/m2pp.cc renamed from m2pp.c and tidied comments.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f1a305893cf32a6907e1fed8d9dd5bd4652e767;p=thirdparty%2Fgcc.git

gcc/m2/m2pp.cc renamed from m2pp.c and tidied comments.

2022-05-20   Gaius Mulley   <gaius.mulley@southwales.ac.uk>

gcc/m2/ChangeLog:

	* m2pp.cc: (Renamed from m2pp.c).  Comments tidied up.
	* Make-lang.in: m2pp.c changed to m2pp.cc.
	(m2rte.so) Added insn-flags.h as a dependent.

Signed-off-by: Gaius Mulley <gaius.mulley@southwales.ac.uk>
---

diff --git a/gcc/m2/ChangeLog b/gcc/m2/ChangeLog
index 21e429021ca1..52e951fafaa1 100644
--- a/gcc/m2/ChangeLog
+++ b/gcc/m2/ChangeLog
@@ -1,3 +1,9 @@
+2022-05-20   Gaius Mulley   <gaius.mulley@southwales.ac.uk>
+
+	* m2pp.cc: (Renamed from m2pp.c).  Comments tidied up.
+	* Make-lang.in: m2pp.c changed to m2pp.cc.
+	(m2rte.so) Added insn-flags.h as a dependent
+
 2022-05-19   Gaius Mulley   <gaius.mulley@southwales.ac.uk>
 
 	* gm2-gcc/m2builtins.cc: Corrected comments (specifically
diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in
index 1e931e3790d9..fddd7934454e 100644
--- a/gcc/m2/Make-lang.in
+++ b/gcc/m2/Make-lang.in
@@ -392,7 +392,7 @@ m2.install-plugin: installdirs
 	chmod a+x $(DESTDIR)$(plugin_resourcesdir)/m2rte$(exeext).so
 
 plugin/m2rte$(exeext).so: $(srcdir)/m2/plugin/m2rte.cc $(GCC_HEADER_DEPENDENCIES_FOR_M2) \
-        insn-attr-common.h $(generated_files)
+        insn-attr-common.h insn-flags.h $(generated_files)
 	test -d plugin || mkdir plugin
 	$(PLUGINCC) $(PLUGINCFLAGS) -fno-rtti -I. -I$(srcdir) -I$(srcdir)/m2 -I$(srcdir)/m2/gm2-gcc -I$(srcdir)/../include -I$(srcdir)/../libcpp/include -Wall $(GMPINC) -Wno-literal-suffix -fPIC -c -o plugin/m2rte.o $(srcdir)/m2/plugin/m2rte.cc
 	$(PLUGINCC) $(PLUGINCFLAGS) $(PLUGINLIBS) -fno-rtti plugin/m2rte.o -shared -o $@
@@ -604,7 +604,7 @@ m2/stor-layout.o: $(srcdir)/stor-layout.cc $(GCC_HEADER_DEPENDENCIES_FOR_M2)
 	$(COMPILER) -c -DSET_WORD_SIZE=INT_TYPE_SIZE $(ALL_COMPILERFLAGS) \
             $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
-m2/m2pp.o : $(srcdir)/m2/m2pp.c $(GCC_HEADER_DEPENDENCIES_FOR_M2)
+m2/m2pp.o : $(srcdir)/m2/m2pp.cc $(GCC_HEADER_DEPENDENCIES_FOR_M2)
 	$(COMPILER) -c -g -DGM2 $(ALL_COMPILERFLAGS) \
             $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
@@ -613,7 +613,7 @@ m2/gm2-gcc/rtegraph.o: $(srcdir)/m2/gm2-gcc/rtegraph.cc $(GCC_HEADER_DEPENDENCIE
 	$(COMPILER) -c -g -I$(GM2GCC) $(ALL_COMPILERFLAGS) \
             $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
-c-family/m2pp.o : $(srcdir)/m2/m2pp.c $(GCC_HEADER_DEPENDENCIES_FOR_M2)
+c-family/m2pp.o : $(srcdir)/m2/m2pp.cc $(GCC_HEADER_DEPENDENCIES_FOR_M2)
 	$(COMPILER) -c -g $(ALL_COMPILERFLAGS) \
             $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
diff --git a/gcc/m2/m2pp.c b/gcc/m2/m2pp.cc
similarity index 99%
rename from gcc/m2/m2pp.c
rename to gcc/m2/m2pp.cc
index aeb1264ee3c8..36b1e604ef41 100644
--- a/gcc/m2/m2pp.c
+++ b/gcc/m2/m2pp.cc
@@ -63,7 +63,7 @@ typedef struct m2stack_t
   struct m2stack_t *next;
 } stack;
 
-/* Prototypes */
+/* Prototypes.  */
 
 static pretty *initPretty (int bits);
 static pretty *dupPretty (pretty *s);
@@ -162,7 +162,7 @@ extern void stop (void);
 
 static stack *stackPtr = NULL;
 
-/* */
+/* do_pf helper function for pf.  */
 
 void
 do_pf (tree t, int bits)
@@ -545,7 +545,6 @@ m2pp_types (pretty *s)
     }
 }
 
-#if 1
 /* hextree - displays the critical fields for function, block and
    bind_expr trees in raw hex.  */
 
@@ -606,9 +605,8 @@ hextree (tree t)
       killPretty (state);
     }
 }
-#endif
 
-/* */
+/* translation produce a pseudo implementation module from the tree t.  */
 
 static void
 m2pp_translation (pretty *s, tree t)
@@ -641,7 +639,6 @@ m2pp_module_block (pretty *s, tree t)
       {
         switch (TREE_CODE (t))
           {
-
           case FUNCTION_DECL:
             if (!DECL_EXTERNAL (t))
               {
@@ -2330,7 +2327,7 @@ m2pp_procedure_call (pretty *s, tree t)
   m2pp_print (s, ";\n");
 }
 
-/* */
+/* args displays each argument in an iter list by calling expression.  */
 
 static void
 m2pp_args (pretty *s, tree e)