X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=mach.c;h=b3e36c7dc382c93b84599a1979f8da85920c7280;hp=db4512325ea2e9826d81768fe697d131e47e87cc;hb=917bfc1503181b7e762b73b9560bb834c12c64fa;hpb=062214e62031c26d372edc2e68473ebb64f6a506

diff --git a/mach.c b/mach.c
index db45123..b3e36c7 100644
--- a/mach.c
+++ b/mach.c
@@ -3,7 +3,7 @@
 // MACH.C - Code Generation
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer
 //
 
 #include "mach.h"
@@ -13,6 +13,7 @@
 #include "token.h"
 #include "procln.h"
 #include "riscasm.h"
+#include "rmac.h"
 
 #define DEF_KW
 #include "kwtab.h"
@@ -439,10 +440,12 @@ int m_move(WORD inst, WORD size)
 	int siz = (int)size;
 
 	// Try to optimize to MOVEQ
-	if (siz == SIZL && am0 == IMMED && am1 == DREG
+	if (optim_flag && siz == SIZL && am0 == IMMED && am1 == DREG
 		&& (a0exattr & (TDB|DEFINED)) == DEFINED && a0exval + 0x80 < 0x100)
 	{
 		m_moveq((WORD)0x7000, (WORD)0);
+		if (sbra_flag)
+			warn("move.l #size,dx converted to moveq");
 	}
 	else
 	{
@@ -555,11 +558,13 @@ int m_br(WORD inst, WORD siz)
 		// Optimize branch instr. size
 		if (siz == SIZN)
 		{
-			if (v != 0 && v + 0x80 < 0x100)
+			if (optim_flag && v != 0 && v + 0x80 < 0x100)
 			{
 				// Fits in .B 
 				inst |= v & 0xFF;
 				D_word(inst);
+				if (sbra_flag)
+					warn("Bcc.w/BSR.w converted to .s");
 				return 0;
 			}
 			else