TEXT/DATA/BSS sizes printed at the end of assembly only when -v is invoked.

[rmac] / rmac.c

diff --git a/rmac.c b/rmac.c
index 0c663b40a0af0cca1b76faed1e2e73bad35f9f82..0683739847ce7172b1562068545f393a5b969266 100644 (file)
--- a/rmac.c
+++ b/rmac.c
@@ -132,7 +132,9 @@ void DisplayHelp(void)
                "  -l[filename]      Create an output listing file\n"
                "  -n                Don't do things behind your back in RISC assembler\n"
                "  -o file           Output file name\n"
-               "  -p[n]             Create an ST .prg (1=normal, 2=w/symbols)\n"
+               "  -p                Create an ST .prg (without symbols)\n"
+               "  -ps               Create an ST .prg (with symbols)\n"
+               "                    Forces -fa\n"
                "  -r[size]          Pad segments to boundary size specified\n"
                "                    w: word (2 bytes, default alignment)\n"
                "                    l: long (4 bytes)\n"
@@ -152,7 +154,12 @@ void DisplayHelp(void)
 //
 void DisplayVersion(void)
 {
-       printf("\nReboot's Macro Assembler for Atari Jaguar\n"
+       printf("\n"
+               " _ __ _ __ ___   __ _  ___ \n"
+               "| '__| '_ ` _ \\ / _` |/ __|\n"
+               "| |  | | | | | | (_| | (__ \n"
+               "|_|  |_| |_| |_|\\__,_|\\___|\n"
+               "\nReboot's Macro Assembler\n"
                "Copyright (C) 199x Landon Dyer, 2011-2015 Reboot\n"
                "V%01i.%01i.%01i %s (%s)\n\n", MAJOR, MINOR, PATCH, __DATE__, PLATFORM);
 }
@@ -317,6 +324,10 @@ int Process(int argc, char ** argv)
                                                ++errcnt;
                                                return errcnt;
                                }
+
+                               // Enforce Alcyon object format - kind of silly
+                               // to ask for .prg output without it!
+                               obj_format = ALCYON;
                                break;
                        case 'r':                               // Pad seg to requested boundary size
                        case 'R':
@@ -444,7 +455,6 @@ int Process(int argc, char ** argv)
 
                strcpy(fnbuf, firstfname);
                fext(fnbuf, (prg_flag ? ".prg" : ".o"), 1);
-               fext(fnbuf, ".o", 1);
                objfname = fnbuf;
        }