X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=rmac.c;h=782f97c7435826f57d033bcfe60c880335f3e402;hb=0de5c6860bd1bb7f0017e30721ed52c1cc2a720f;hp=8ea0189e02ef740ecce71b59fad8c4b5076140f9;hpb=5c830e8dbf40798d8936a06ba660a167b6410cd9;p=rmac

diff --git a/rmac.c b/rmac.c
index 8ea0189..782f97c 100644
--- a/rmac.c
+++ b/rmac.c
@@ -29,7 +29,6 @@ int list_flag;					// "-l" listing flag on command line
 int list_pag = 1;				// Enable listing pagination by default
 int verb_flag;					// Be verbose about what's going on
 int m6502;						// 1, assembling 6502 code
-int as68_flag;					// as68 kludge mode
 int glob_flag;					// Assume undefined symbols are global
 int lsym_flag;					// Include local symbols in object file
 int optim_warn_flag;			// Warn about possible short branches
@@ -53,7 +52,7 @@ char * cmdlnexec;				// Executable name, pointer to ARGV[0]
 char searchpatha[512] = { 0 };	// Buffer to hold searchpath when specified
 char * searchpath = NULL;		// Search path for include files
 char defname[] = "noname.o";	// Default output filename
-int optim_flags[OPT_COUNT];		// Specific optimisations on/off matrix
+int optim_flags[OPT_COUNT_ALL] = { 0 };	// Specific optimisations on/off matrix
 int activecpu = CPU_68000;		// Active 68k CPU (68000 by default)
 int activefpu = FPU_NONE;		// Active FPU (none by default)
 int org68k_active = 0;			// .org switch for 68k (only with RAW output format)
@@ -172,18 +171,20 @@ void DisplayHelp(void)
 		"  -n                Don't do things behind your back in RISC assembler\n"
 		"  -o file           Output file name\n"
 		"  +o[value]         Turn a specific optimisation on\n"
-		"                    Available optimisation values and default settings:\n"
-		"                    o0: Absolute long addresses to word               (on)\n"
-		"                    o1: move.l #x,dn/an to moveq                      (on)\n"
-		"                    o2: Word branches to short                        (on)\n"
-		"                    o3: Outer displacement 0(an) to (an)              (off)\n"
-		"                    o4: lea size(An),An to addq #size,An              (off)\n"
-		"                    o5: 68020+ Absolute long base/outer disp. to word (off)\n"
-		"                    o6: Null branches to NOP                          (off)\n"
-		"                    o7: clr.l Dx to moveq #0,Dx                       (off)\n"
-		"                    o8: adda.w/l #x,Dy to addq.w/l #x,Dy              (off)\n"
-		"                    o9: adda.w/l #x,Dy to lea x(Dy),Dy                (off)\n"
-		"                    o10: Enforce PC relative (alternative: op)        (off)\n"
+		"                    Available optimisation switches:\n"
+		"                    o0: Absolute long addresses to word\n"
+		"                    o1: move.l #x,dn/an to moveq\n"
+		"                    o2: Word branches to short\n"
+		"                    o3: Outer displacement 0(an) to (an)\n"
+		"                    o4: lea size(An),An to addq #size,An\n"
+		"                    o5: 68020+ Absolute long base/outer disp. to word\n"
+		"                    o6: Null branches to NOP\n"
+		"                    o7: clr.l Dx to moveq #0,Dx\n"
+		"                    o8: adda.w/l #x,Dy to addq.w/l #x,Dy\n"
+		"                    o9: adda.w/l #x,Ay to lea x(Dy),Ay\n"
+		"                    o10: 56001 Use short format for immediate values if possible\n"
+		"                    o11: 56001 Auto convert short addressing mode to long (default: on)\n"
+		"                    o30: Enforce PC relative (alternative name: op)\n"
 		"  ~o[value]         Turn a specific optimisation off\n"
 		"  +oall             Turn all optimisations on\n"
 		"  ~oall             Turn all optimisations off\n"
@@ -301,7 +302,6 @@ int Process(int argc, char ** argv)
 	listing = 0;					// Initialize listing level
 	list_flag = 0;					// Initialize listing flag
 	verb_flag = perm_verb_flag;		// Initialize verbose flag
-	as68_flag = 0;					// Initialize as68 kludge mode
 	glob_flag = 0;					// Initialize .globl flag
 	optim_warn_flag = 0;			// Initialize short branch flag
 	debug = 0;						// Initialize debug flag
@@ -776,12 +776,7 @@ int main(int argc, char ** argv)
 {
 	perm_verb_flag = 0;				// Clobber "permanent" verbose flag
 	legacy_flag = 1;				// Default is legacy mode on (:-P)
-
-	// Set legacy optimisation flags to on and everything else to off
-	memset(optim_flags, 0, OPT_COUNT * sizeof(int));
-	optim_flags[OPT_ABS_SHORT] =
-		optim_flags[OPT_MOVEL_MOVEQ] =
-		optim_flags[OPT_BSR_BCC_S] = 1;
+	optim_flags[OPT_56K_SHORT] = 1; // This ensures compatibilty with Motorola's 56k assembler
 
 	cmdlnexec = argv[0];			// Obtain executable name
 	endian = GetEndianess();		// Get processor endianess