X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=4e9cffd350cb1603bb01a34b58e2bf18cb55c676;hp=5628ef90f8226d59d064e0e9757634c3ac3d6852;hb=8f287ee72236774216a11a3062f9a26dc8dc66b6;hpb=2037569179a89c7ea99abf7c3e75f23448ff54ff

diff --git a/direct.c b/direct.c
index 5628ef9..4e9cffd 100644
--- a/direct.c
+++ b/direct.c
@@ -1,7 +1,7 @@
 //
 // RMAC - Reboot's Macro Assembler for all Atari computers
 // DIRECT.C - Directive Handling
-// Copyright (C) 199x Landon Dyer, 2011-2019 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2020 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -154,7 +154,7 @@ int (*dirtab[])() = {
 	d_nofpu,			// 65 nofpu
 	d_opt,				// 66 .opt
 	d_objproc,			// 67 .objproc
-	d_dsm,				// 68 .dsm
+	(void *)d_dsm,			// 68 .dsm
 };
 
 
@@ -221,8 +221,8 @@ int d_org(void)
 {
 	uint64_t address;
 
-	if (!rgpu && !rdsp && !robjproc && !m6502 && !dsp56001)
-		return error(".org permitted only in GPU/DSP/OP, 56001 and 6502 sections");
+	if (!rgpu && !rdsp && !robjproc && !m6502 && !dsp56001 && !(obj_format == RAW))
+		return error(".org permitted only in GPU/DSP/OP, 56001, 6502 and 68k (with -fr switch) sections");
 
 	// M56K can leave the expression off the org for some reason :-/
 	// (It's because the expression is non-standard, and so we have to look at
@@ -346,6 +346,17 @@ int d_org(void)
 // N.B.: It seems that by enabling this, even though it works elsewhere, will cause symbols to royally fuck up.  Will have to do some digging to figure out why.
 //		orgactive = 1;
 	}
+	else
+	{
+		// If we get here we assume it's 68k with RAW output, so this is allowed
+		if (orgactive)
+		{
+			return error("In 68k mode only one .org statement is allowed");
+		}
+
+		org68k_address = address;
+		org68k_active = 1;
+	}
 
 	ErrorIfNotAtEOL();
 	return 0;
@@ -1077,9 +1088,9 @@ int d_ds(WORD siz)
 
 	// Check to see if the value being passed in is negative (who the hell does
 	// that?--nobody does; it's the code gremlins, or rum, what does it)
-	// N.B.: Since 'eval' is of type uint32_t, if it goes negative, it will
+	// N.B.: Since 'eval' is of type uint64_t, if it goes negative, it will
 	//       have its high bit set.
-	if (eval & 0x80000000)
+	if (eval & 0x8000000000000000)
 		return error("negative sizes not allowed in DS");
 
 	// In non-TDB section (BSS, ABS and M6502) just advance the location
@@ -1096,7 +1107,7 @@ int d_ds(WORD siz)
 
 		just_bss = 1;					// No data deposited (8-bit CPU mode)
 	}
-	else if (cursect == M56001P || cursect == M56001X || cursect == M56001Y || cursect == M56001L)
+	else if (cursect & M56KPXYL)
 	{
 		// Change segment instead of marking blanks.
 		// Only mark segments we actually wrote something
@@ -1125,7 +1136,7 @@ int d_ds(WORD siz)
 	}
 
 	ErrorIfNotAtEOL();
-	return 0;
+	return OK;
 }