X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=riscasm.c;h=74de784e839ceb91fde20d4300a064112e49606c;hp=9d95bfc9920676f1c06c5e334c1dd1affe5d570f;hb=5f23454f7155f0c77ea1bede3f9e60b39da99fa8;hpb=1feb728a9eb579b6441daf0124d81483f600365c

diff --git a/riscasm.c b/riscasm.c
index 9d95bfc..74de784 100644
--- a/riscasm.c
+++ b/riscasm.c
@@ -7,13 +7,14 @@
 //
 
 #include "riscasm.h"
+#include "amode.h"
+#include "direct.h"
 #include "error.h"
-#include "sect.h"
-#include "token.h"
 #include "expr.h"
-#include "direct.h"
 #include "mark.h"
-#include "amode.h"
+#include "procln.h"
+#include "sect.h"
+#include "token.h"
 
 #define DEF_MR				// Declare keyword values
 #include "risckw.h"			// Incl. generated risc keywords
@@ -23,7 +24,7 @@
 
 
 unsigned altbankok = 0;		// Ok to use alternate register bank
-unsigned orgactive = 0;		// RISC org directive active
+unsigned orgactive = 0;		// RISC/6502 org directive active
 unsigned orgaddr = 0;		// Org'd address
 unsigned orgwarning = 0;	// Has an ORG warning been issued
 int lastOpcode = -1;		// Last RISC opcode assembled
@@ -385,12 +386,13 @@ int GenerateRISCCode(int state)
 		{
 			if (eattr & TDB)
 //{
-//printf("RISCASM: Doing rmark for RI_MOVEI (tdb=$%X)...\n", eattr & TDB);
-				rmark(cursect, sloc + 2, (eattr & TDB), (MLONG | MMOVEI), NULL);
+//printf("RISCASM: Doing MarkRelocatable for RI_MOVEI (tdb=$%X)...\n", eattr & TDB);
+				MarkRelocatable(cursect, sloc + 2, (eattr & TDB), (MLONG | MMOVEI), NULL);
 //}
 		}
 
-		val = ((eval >> 16) & 0x0000FFFF) | ((eval << 16) & 0xFFFF0000);
+//		val = ((eval >> 16) & 0x0000FFFF) | ((eval << 16) & 0xFFFF0000);
+		val = WORDSWAP32(eval);
 		CHECK_COMMA;
 		reg2 = GetRegister(FU_REGTWO);
 		at_eol();