cc, plusplus: add -pm option to dump predefined macros (#1592)

playday3008 · web-flow · commit 2adb759d4fb6 · 2026-03-29T19:14:51.000+02:00
* cc: add -pm option to dump predefined macros

Add a new -pm compiler option that dumps all predefined macros
in #define format, similar to gcc/clang's -dM -E.

Usage: wcc386 -pm /dev/null

* plusplus: add -pm option to dump predefined macros

Port the -pm option from the C compiler to the C++ compiler,
allowing wpp/wpp386 to dump all predefined macros.

* cc, plusplus: move -pm outside preprocessor option chain

Move -pm before the :usagechain with :nochain/:usagenochain
so it is not part of the -p preprocessor control group.
Process -pm after the cpp_mode block so it has highest
priority and does not set cpp_mode.
diff --git a/bld/cc/c/ccmain.c b/bld/cc/c/ccmain.c
@@ -1020,66 +1020,71 @@ static void DoCCompile( char **cmdline )
     }
     ParseInit();
     if( ParseCmdLine( cmdline ) ) {
-        if( WholeFName == NULL ) {
+        if( CompFlags.cpp_dump_macros ) {
+            if( CppFile == NULL )
+                OpenCppFile();
+            DumpAllMacros();
+            MacroFini();
+        } else if( WholeFName == NULL ) {
             CErr1( ERR_FILENAME_REQUIRED );
             return;
-        }
-        MakePgmName();
-        DelErrFile();               /* delete old error file */
-        CPragmaInit();              /* memory model is known now */
+        } else {
+            MakePgmName();
+            DelErrFile();               /* delete old error file */
+            CPragmaInit();              /* memory model is known now */
 #if _CPU == 370
-        ParseAuxFile();
+            ParseAuxFile();
 #endif
-        if( CompFlags.cpp_mode ) {
-            PrintWhiteSpace = true;
-            if( ForcePreInclude != NULL ) {
-                if( CppFile == NULL )
-                    OpenCppFile();
-                CompFlags.cpp_output = false;
-                if( openForcePreInclude() ) {
-                    CurToken = T_NULL;
-                    while( CurToken != T_EOF ) {
-                        CurToken = GetNextToken();
+            if( CompFlags.cpp_mode ) {
+                PrintWhiteSpace = true;
+                if( ForcePreInclude != NULL ) {
+                    if( CppFile == NULL )
+                        OpenCppFile();
+                    CompFlags.cpp_output = false;
+                    if( openForcePreInclude() ) {
+                        CurToken = T_NULL;
+                        while( CurToken != T_EOF ) {
+                            CurToken = GetNextToken();
+                        }
                     }
+                    CompFlags.cpp_output = true;
                 }
-                CompFlags.cpp_output = true;
-            }
-            OpenPgmFile();
-            CPP_Parse();
-            if( !CompFlags.quiet_mode ) {
-                PrintStats();
-            }
-            if( CompFlags.warnings_cause_bad_exit ) {
-                ErrCount += WngCount;
-            }
-        } else {
-            OpenPgmFile();
-            MacroAddComp(); // Add any compile time only macros
-            Parse();
-            if( !CompFlags.quiet_mode ) {
-                PrintStats();
-            }
-            if( CompFlags.warnings_cause_bad_exit ) {
-                ErrCount += WngCount;
-            }
-            if( ( ErrCount == 0 ) && ( !CompFlags.check_syntax ) ) {
-                if( CompFlags.emit_browser_info ) {
-                    DwarfBrowseEmit();
+                OpenPgmFile();
+                CPP_Parse();
+                if( !CompFlags.quiet_mode ) {
+                    PrintStats();
+                }
+                if( CompFlags.warnings_cause_bad_exit ) {
+                    ErrCount += WngCount;
+                }
+            } else {
+                OpenPgmFile();
+                MacroAddComp(); // Add any compile time only macros
+                Parse();
+                if( !CompFlags.quiet_mode ) {
+                    PrintStats();
+                }
+                if( CompFlags.warnings_cause_bad_exit ) {
+                    ErrCount += WngCount;
+                }
+                if( ( ErrCount == 0 ) && ( !CompFlags.check_syntax ) ) {
+                    if( CompFlags.emit_browser_info ) {
+                        DwarfBrowseEmit();
+                    }
+                    FreeMacroSegments();
+                    DoCompile();
+                } else {
+                    FreeMacroSegments();
                 }
-                FreeMacroSegments();
-                DoCompile();
+            }
+            if( ErrCount == 0 ) {
+                DumpDepFile();
             } else {
-                FreeMacroSegments();
+                DelDepFile();
             }
+            SymFini();
+            CPragmaFini();
         }
-        if( ErrCount == 0 ) {
-            DumpDepFile();
-        } else {
-            DelDepFile();
-        }
-
-        SymFini();
-        CPragmaFini();
     } else {
         ErrCount = 1;
     }
diff --git a/bld/cc/c/cmac1.c b/bld/cc/c/cmac1.c
@@ -222,6 +222,79 @@ void MacroPurge( void )
 #endif
 }
 
+
+static void DumpMacroDefn( const char *p )
+/****************************************/
+{
+    unsigned char   c;
+    TOKEN           token;
+
+    while( (token = MTOK( p )) != T_NULL ) {
+        MTOKINC( p );
+        switch( token ) {
+        case T_CONSTANT:
+        case T_PPNUMBER:
+        case T_BAD_TOKEN:
+        case T_ID:
+        case T_UNEXPANDABLE_ID:
+            for( ; (c = *p++) != '\0'; ) {
+                fputc( c, CppFile );
+            }
+            break;
+        case T_LSTRING:
+            fputc( 'L', CppFile );
+            /* fall through */
+        case T_STRING:
+            fputc( '"', CppFile );
+            for( ; (c = *p++) != '\0'; ) {
+                fputc( c, CppFile );
+            }
+            fputc( '"', CppFile );
+            break;
+        case T_WHITE_SPACE:
+            fputc( ' ', CppFile );
+            break;
+        case T_BAD_CHAR:
+            fputc( *p++, CppFile );
+            break;
+        case T_MACRO_PARM:
+        case T_MACRO_VAR_PARM:
+            MTOKPARMINC( p );
+            break;
+        default:
+            fprintf( CppFile, "%s", Tokens[token] );
+            break;
+        }
+    }
+}
+
+
+void DumpAllMacros( void )
+/************************/
+{
+    mac_hash_idx    hash;
+    MEPTR           mentry;
+    const char      *p;
+
+    for( hash = 0; hash < MACRO_HASH_SIZE; hash++ ) {
+        for( mentry = MacHash[hash]; mentry != NULL; mentry = mentry->next_macro ) {
+            if( mentry->macro_flags & MFLAG_HIDDEN )
+                continue;
+            if( MacroIsSpecial( mentry ) )
+                continue;
+            fprintf( CppFile, "#define %s", mentry->macro_name );
+            p = (char *)mentry + mentry->macro_defn;
+            if( MTOK( p ) != T_NULL ) {
+                fputc( ' ', CppFile );
+                DumpMacroDefn( p );
+            }
+            fputc( '\n', CppFile );
+        }
+    }
+    fflush( CppFile );
+}
+
+
 static void DeleteNestedMacro( void )
 /***********************************/
 {
diff --git a/bld/cc/c/coptions.c b/bld/cc/c/coptions.c
@@ -742,6 +742,10 @@ static void AnalyseAnyTargetOptions( OPT_STORAGE *data )
         CompFlags.cpp_output = true;
         CompFlags.quiet_mode = true;
     }
+    if( data->pm ) {
+        CompFlags.cpp_dump_macros = true;
+        CompFlags.quiet_mode = true;
+    }
     if( data->rod ) {
         OPT_STRING *s;
         for( s = data->rod_value; s != NULL; s = s->next ) {
diff --git a/bld/cc/gml/options.gml b/bld/cc/gml/options.gml
@@ -972,6 +972,13 @@
 :usage. preprocessor ignores #line directives
 :jusage.
 
+:option. pm
+:target. any
+:nochain.
+:usagenochain.
+:usage. dump predefined macros to output
+:jusage.
+
 :option. p
 :target. any
 :usage. preprocess source file
diff --git a/bld/cc/h/ctypes.h b/bld/cc/h/ctypes.h
@@ -609,6 +609,7 @@ typedef struct comp_flags {
     boolbit debug_info_some                     : 1;    /* d1 + some typing info     */
     boolbit emit_names                          : 1;    /* /en switch used           */
     boolbit cpp_mode                            : 1;    /* compiler CPP mode         */
+    boolbit cpp_dump_macros                     : 1;    /* dump predefined macros    */
     boolbit warnings_cause_bad_exit             : 1;    /* warnings=>non-zero exit   */
 
     boolbit save_restore_segregs                : 1;    /* save/restore segregs      */
diff --git a/bld/cc/h/cvars.h b/bld/cc/h/cvars.h
@@ -598,6 +598,7 @@ extern void         MacroInit( void );
 extern void         MacroAddComp( void );
 extern void         MacroFini( void );
 extern void         MacroPurge( void );
+extern void         DumpAllMacros( void );
 extern TOKEN        GetMacroToken( void );
 extern TOKEN        SpecialMacro( MEPTR );
 extern void         DoMacroExpansion( MEPTR );
diff --git a/bld/plusplus/c/cmacadd.c b/bld/plusplus/c/cmacadd.c
@@ -777,3 +777,75 @@ void MacroSegmentAddMem(            // MacroSegment: ADD A SEQUENCE OF BYTES
     memcpy( MacroOffset + clen, buff, len );
     *mlen += len;
 }
+
+
+static void dumpMacroDefn(          // DUMP TOKENIZED MACRO DEFINITION
+    const char *p )                 // - pointer to token stream
+{
+    unsigned char   c;
+    TOKEN           token;
+
+    while( (token = *(TOKEN *)p) != T_NULL ) {
+        p += sizeof( TOKEN );
+        switch( token ) {
+        case T_CONSTANT:
+        case T_PPNUMBER:
+        case T_BAD_TOKEN:
+        case T_ID:
+        case T_UNEXPANDABLE_ID:
+            for( ; (c = *p++) != '\0'; ) {
+                fputc( c, CppFile );
+            }
+            break;
+        case T_LSTRING:
+            fputc( 'L', CppFile );
+            /* fall through */
+        case T_STRING:
+            fputc( '"', CppFile );
+            for( ; (c = *p++) != '\0'; ) {
+                fputc( c, CppFile );
+            }
+            fputc( '"', CppFile );
+            break;
+        case T_WHITE_SPACE:
+            fputc( ' ', CppFile );
+            break;
+        case T_BAD_CHAR:
+            fputc( *p++, CppFile );
+            break;
+        case T_MACRO_PARM:
+        case T_MACRO_VAR_PARM:
+            ++p;
+            break;
+        default:
+            fprintf( CppFile, "%s", Tokens[token] );
+            break;
+        }
+    }
+}
+
+
+void DumpAllMacros(                 // DUMP ALL PREDEFINED MACROS
+    void )
+{
+    unsigned        hash;
+    MEPTR           mentry;
+    const char      *p;
+
+    for( hash = 0; hash < MACRO_HASH_SIZE; hash++ ) {
+        RingIterBeg( macroHashTable[hash], mentry ) {
+            if( mentry->macro_flags & MFLAG_HIDDEN )
+                continue;
+            if( MacroIsSpecial( mentry ) )
+                continue;
+            fprintf( CppFile, "#define %s", mentry->macro_name );
+            p = (char *)mentry + mentry->macro_defn;
+            if( *(TOKEN *)p != T_NULL ) {
+                fputc( ' ', CppFile );
+                dumpMacroDefn( p );
+            }
+            fputc( '\n', CppFile );
+        } RingIterEnd( mentry )
+    }
+    fflush( CppFile );
+}
diff --git a/bld/plusplus/c/cmdlnany.c b/bld/plusplus/c/cmdlnany.c
@@ -1059,6 +1059,10 @@ static void analyseAnyTargetOptions( OPT_STORAGE *data )
         CompFlags.cpp_output = true;
         CompFlags.quiet_mode = true;
     }
+    if( data->pm ) {
+        CompFlags.cpp_dump_macros = true;
+        CompFlags.quiet_mode = true;
+    }
     if( data->p_sharp ) {
         PreProcChar = (char)data->p_sharp_value;
     }
diff --git a/bld/plusplus/c/plusplus.c b/bld/plusplus/c/plusplus.c
@@ -269,6 +269,9 @@ static int doCCompile(          // COMPILE C++ PROGRAM
             } else {
                 exit_status |= WPP_BATCH_FILES;
             }
+        } else if( CompFlags.cpp_dump_macros ) {
+            PpOpen();
+            DumpAllMacros();
         } else if( WholeFName == NULL ) {
             CErr1( ERR_FILENAME_REQUIRED );
             CompFlags.cmdline_error = true;
diff --git a/bld/plusplus/gml/options.gml b/bld/plusplus/gml/options.gml
@@ -987,6 +987,13 @@
 :usage.  preprocessor ignores #line directives
 :jusage. preprocessor ignores #line directives
 
+:option. pm
+:target. any
+:nochain.
+:usagenochain.
+:usage.  dump predefined macros to output
+:jusage.
+
 :option. p
 :target. any
 :usage. preprocess source file
diff --git a/bld/plusplus/h/compflag.h b/bld/plusplus/h/compflag.h
@@ -123,6 +123,7 @@ typedef struct comp_flags {
     boolbit     cpp_output                      : 1;    // compiler doing CPP output
     boolbit     cpp_output_to_file              : 1;    // compiler doing CPP output to file (default extension .i)
     boolbit     cpp_mode                        : 1;    // compiler CPP mode
+    boolbit     cpp_dump_macros                 : 1;    // dump predefined macros
     boolbit     no_debug_type_names             : 1;
     boolbit     emit_names                      : 1;
     boolbit     warnings_cause_bad_exit         : 1;
diff --git a/bld/plusplus/h/preproc.h b/bld/plusplus/h/preproc.h
@@ -153,6 +153,9 @@ bool MacroExists(               // TEST IF MACRO EXISTS
     const char *macname,        // - macro name
     size_t len )                // - length of macro name
 ;
+void DumpAllMacros(             // DUMP ALL PREDEFINED MACROS
+    void )
+;
 void MacroFini(                 // MACRO PROCESSING -- COMPLETION
     void )
 ;

Original file line number	Diff line number	Diff line change
`@@ -1059,6 +1059,10 @@ static void analyseAnyTargetOptions( OPT_STORAGE *data )`
`1059`	`1059`	`CompFlags.cpp_output = true;`
`1060`	`1060`	`CompFlags.quiet_mode = true;`
`1061`	`1061`	`}`
	`1062`	`+ if( data->pm ) {`
	`1063`	`+ CompFlags.cpp_dump_macros = true;`
	`1064`	`+ CompFlags.quiet_mode = true;`
	`1065`	`+ }`
`1062`	`1066`	`if( data->p_sharp ) {`
`1063`	`1067`	`PreProcChar = (char)data->p_sharp_value;`
`1064`	`1068`	`}`