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

diff --git a/mach.c b/mach.c
index e0640e5..db45123 100644
--- a/mach.c
+++ b/mach.c
@@ -307,7 +307,7 @@ int m_shi(WORD inst, WORD siz)
 	}
 	else
 	{
-		fixup(FU_QUICK, sloc, a0expr);
+		AddFixup(FU_QUICK, sloc, a0expr);
 		D_word(inst);
 	}
 
@@ -372,7 +372,7 @@ int m_dbra(WORD inst, WORD siz)
 	}
 	else
 	{
-		fixup(FU_WORD | FU_PCREL | FU_ISBRA, sloc, a1expr);
+		AddFixup(FU_WORD | FU_PCREL | FU_ISBRA, sloc, a1expr);
 		D_word(0);
 	}
 
@@ -489,7 +489,7 @@ int m_moveq(WORD inst, WORD siz)
 	// Arrange for future fixup 
 	if (!(a0exattr & DEFINED))
 	{
-		fixup(FU_BYTE | FU_SEXT, sloc + 1, a0expr);
+		AddFixup(FU_BYTE | FU_SEXT, sloc + 1, a0expr);
 		a0exval = 0; 
 	}
 	else if (a0exval + 0x100 >= 0x200)
@@ -545,7 +545,10 @@ int m_br(WORD inst, WORD siz)
 	if (a0exattr & DEFINED)
 	{
 		if ((a0exattr & TDB) != cursect)
+//{
+//printf("m_br(): a0exattr = %X, cursect = %X, a0exval = %X, sloc = %X\n", a0exattr, cursect, a0exval, sloc);
 			return error(rel_error);
+//}
 
 		v = a0exval - (sloc + 2);
 
@@ -596,7 +599,7 @@ int m_br(WORD inst, WORD siz)
 	if (siz == SIZB)
 	{
 		// .B 
-		fixup(FU_BBRA | FU_PCREL | FU_SEXT, sloc, a0expr);
+		AddFixup(FU_BBRA | FU_PCREL | FU_SEXT, sloc, a0expr);
 		D_word(inst);
 		return 0;
 	}
@@ -604,7 +607,7 @@ int m_br(WORD inst, WORD siz)
 	{
 		// .W 
 		D_word(inst);
-		fixup(FU_WORD | FU_PCREL | FU_LBRA | FU_ISBRA, sloc, a0expr);
+		AddFixup(FU_WORD | FU_PCREL | FU_LBRA | FU_ISBRA, sloc, a0expr);
 		D_word(0);
 	}
 
@@ -629,7 +632,7 @@ int m_addq(WORD inst, WORD siz)
 	}
 	else
 	{
-		fixup(FU_QUICK, sloc, a0expr);
+		AddFixup(FU_QUICK, sloc, a0expr);
 		D_word(inst);
 	}