X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=0c8dfb5b0fba563a5081a800c4cf64df83bb57f1;hp=1864b86e266142964f630166ca37390a48a40d39;hb=59c5357bbdaddaeb207c4c395ab3353a789495c5;hpb=1df40a4f5be00b253fbb7901f8e108d994c8cb40

diff --git a/direct.c b/direct.c
index 1864b86..0c8dfb5 100644
--- a/direct.c
+++ b/direct.c
@@ -1074,11 +1074,11 @@ int d_ds(WORD siz)
 		return 0;
 
 	// 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, that does it)
-	// N.B.: Since 'eval' is of type uint32_t, if it goes negative, it will have
-	//       its high bit set.
+	// 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
+	//       have its high bit set.
 	if (eval & 0x80000000)
-		return error("negative sizes not allowed");
+		return error("negative sizes not allowed in DS");
 
 	// In non-TDB section (BSS, ABS and M6502) just advance the location
 	// counter appropriately. In TDB sections, deposit (possibly large) chunks
@@ -1094,9 +1094,32 @@ 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)
+	{
+		// Change segment instead of marking blanks.
+		// Only mark segments we actually wrote something
+		if (chptr != dsp_currentorg->start && dsp_written_data_in_current_org)
+		{
+			dsp_currentorg->end = chptr;
+			dsp_currentorg++;
+			dsp_currentorg->memtype = dsp_currentorg[-1].memtype;
+		}
+
+		listvalue((uint32_t)eval);
+		sloc += (uint32_t)eval;
+
+		// And now let's create a new segment
+		dsp_currentorg->start = chptr;
+		dsp_currentorg->chunk = scode;  // Mark down which chunk this org starts from (will be needed when outputting)
+		sect[cursect].orgaddr = sloc;
+		dsp_currentorg->orgadr = sloc;
+		dsp_written_data_in_current_org = 0;
+
+		just_bss = 1;					// No data deposited
+	}
 	else
 	{
-		dep_block(eval, siz, 0, (WORD)(DEFINED | ABS), NULL);
+		dep_block(eval, siz, 0, (DEFINED | ABS), NULL);
 	}
 
 	ErrorIfNotAtEOL();
@@ -1105,7 +1128,7 @@ int d_ds(WORD siz)
 
 
 //
-// dc.b, dc.w / dc, dc.l, dc.i, dc.q, dc.d
+// dc.b, dc.w / dc, dc.l, dc.i, dc.q, dc.d, dc.s, dc.x
 //
 int d_dc(WORD siz)
 {
@@ -1289,6 +1312,7 @@ l_parse_loop:
 			}
 
 			break;
+
 		case SIZW:
 		case SIZN:
 			if (!defined)
@@ -1312,6 +1336,7 @@ l_parse_loop:
 			}
 
 			break;
+
 		case SIZL:
 			// Shamus: Why can't we do longs in 6502 mode?
 			if (m6502)
@@ -1319,11 +1344,7 @@ l_parse_loop:
 
 			if (!defined)
 			{
-				if (movei)
-					AddFixup(FU_LONG | FU_MOVEI, sloc, exprbuf);
-				else
-					AddFixup(FU_LONG, sloc, exprbuf);
-
+				AddFixup(FU_LONG | (movei ? FU_MOVEI : 0), sloc, exprbuf);
 				D_long(0);
 			}
 			else
@@ -1338,34 +1359,33 @@ l_parse_loop:
 			}
 
 			break;
+
 		case SIZQ:
 			// 64-bit size
 			if (m6502)
 				return error(in_6502mode);
 
-			// Shamus: We only handle DC.Q type stuff, will have to add fixups
-			//         and stuff later (maybe... might not be needed...)
 			// DEFINITELY NEED FIXUPS HERE!
 			if (!defined)
 			{
 				AddFixup(FU_QUAD, sloc, exprbuf);
-				D_quad(0LL);
-			}
-			else
-			{
-				D_quad(eval);
+				eval = 0;
 			}
 
+			D_quad(eval);
 			break;
+
 		case SIZS:
 			// 32-bit float size
 			if (m6502)
 				return error(in_6502mode);
 
+/* Seems to me that if something is undefined here, then that should be an error.  Likewise for the D & X variants. */
 			if (!defined)
 			{
-				AddFixup(FU_FLOATSING, sloc, exprbuf);
-				D_long(0);
+//				AddFixup(FU_FLOATSING, sloc, exprbuf);
+//				D_long(0);
+				return error("labels not allowed in floating point expressions");
 			}
 			else
 			{
@@ -1380,6 +1400,7 @@ l_parse_loop:
 			}
 
 			break;
+
 		case SIZD:
 			// 64-bit double size
 			if (m6502)
@@ -1387,8 +1408,9 @@ l_parse_loop:
 
 			if (!defined)
 			{
-				AddFixup(FU_FLOATDOUB, sloc, exprbuf);
-				D_quad(0LL);
+//				AddFixup(FU_FLOATDOUB, sloc, exprbuf);
+//				D_quad(0LL);
+				return error("labels not allowed in floating point expressions");
 			}
 			else
 			{
@@ -1403,6 +1425,7 @@ l_parse_loop:
 			}
 
 			break;
+
 		case SIZX:
 			if (m6502)
 				return error(in_6502mode);
@@ -1412,8 +1435,9 @@ l_parse_loop:
 
 			if (!defined)
 			{
-				AddFixup(FU_FLOATEXT, sloc, exprbuf);
-				D_extend(extDbl);
+//				AddFixup(FU_FLOATEXT, sloc, exprbuf);
+//				D_extend(extDbl);
+				return error("labels not allowed in floating point expressions");
 			}
 			else
 			{
@@ -1545,11 +1569,8 @@ int d_init(WORD def_siz)
 //
 int dep_block(uint32_t count, WORD siz, uint32_t eval, WORD eattr, TOKEN * exprbuf)
 {
-	WORD tdb;
-	WORD defined;
-
-	tdb = (WORD)(eattr & TDB);
-	defined = (WORD)(eattr & DEFINED);
+	WORD tdb = eattr & TDB;
+	WORD defined = eattr & DEFINED;
 
 	while (count--)
 	{