Add the .dataf4 and .dataf8 directives to the assembler --- manually converting

floats and doubles to bytes is not fun. It might even work!

mach/mips/libem/c_ud_i.s

@@ -28,9 +28,8 @@ toobig:
 	jr ra
 	nop
 
-/* 2147483648 as a double. */
 .sect .rom
 .define .fd_80000000
 .fd_80000000:
-	.data4 0, 0x41e00000
+	.dataf8 2147483648.0
 

mach/mips/libem/c_uf_i.s

@@ -31,8 +31,7 @@ toobig:
 	jr ra
 	nop
 
-/* 2147483648 as a float. */
 .sect .rom
 .ff_80000000:
-	.data4 0x4f000000
+	.dataf4 2147483648.0
 

mach/mips/libem/c_ui_d.s

@@ -20,7 +20,6 @@ nonnegative:
 	jr ra
 	nop
 
-/* 4294967296 as a double. */
 .sect .rom
 .fd_100000000:
-	.data4 0, 0x41f00000
+	.dataf8 4294967296.0

mach/mips/libem/c_ui_f.s

@@ -23,4 +23,4 @@ nonnegative:
 /* 4294967296 as a float. */
 .sect .rom
 .fs_100000000:
-	.data4 0x4f800000
+	.dataf4 4294967296.0

mach/pdp/as/mach0.c

@@ -12,6 +12,7 @@
 #define WORDS_REVERSED
 #define LISTING
 #define RELOCATION
+#define PDPFLOAT
 #undef ISALPHA
 #define ISALPHA(c)	(isalpha(c) || c == '_' || c == '.' || c == '~')
 #undef ISALNUM

mach/proto/as/build.lua

@@ -44,6 +44,7 @@ definerule("build_as",
 			deps = {
 				"h+emheaders",
 				"modules/src/object+lib",
+				"modules/src/flt_arith+lib",
 				archlib,
 				yaccfiles,
 				e.deps

mach/proto/as/comm1.h

@@ -153,6 +153,7 @@ void	 emit1(int);
 void	 emit2(int);
 void	 emit4(long);
 void	 emitx(valu_t, int);
+void     emitf(int size);
 void	 emitstr(int);
 void	 ffreopen(char *, FILE *);
 FILE	*ffcreat(char *);

mach/proto/as/comm2.y

@@ -43,9 +43,11 @@ static item_t	*last_it, *o_it;
 %token NUMBER2
 %token NUMBER3
 %token <y_valu> NUMBER
+%token NUMBERF
 %token DOT
 %token EXTERN
 %token <y_word> DATA
+%token <y_word> DATAF
 %token <y_word> ASCII
 %token SECTION
 %token COMMON
@@ -249,6 +251,7 @@ operation
 				DOTSCT->s_zero += $2;
 			}
 	|	DATA datalist
+	|   DATAF dataflist
 	|	ASCII STRING
 			{	emitstr($1);}
 	;
@@ -276,6 +279,18 @@ datalist
 				emitx($3.val, (int)$<y_word>0);
 			}
 	;
+
+dataflist
+	:   NUMBERF
+			{
+				emitf((int)$<y_word>0);
+			}
+	|   dataflist ',' NUMBERF
+			{
+				emitf((int)$<y_word>3);
+			}
+	;
+
 expr	:	error
 			{	serror("expr syntax err");
 				$$.val = 0; $$.typ = S_UND;

mach/proto/as/comm3.c

@@ -29,6 +29,8 @@ item_t	keytab[] = {
 	0,	DATA,		RELO1,	".data1",
 	0,	DATA,		RELO2,	".data2",
 	0,	DATA,		RELO4,	".data4",
+	0,  DATAF,      4,      ".dataf4",
+	0,  DATAF,      8,      ".dataf8",
 	0,	ASCII,		0,		".ascii",
 	0,	ASCII,		1,		".asciz",
 	0,	ALIGN,		0,		".align",

mach/proto/as/comm5.c

@@ -395,10 +395,12 @@ static int innumber(int c)
 {
 	char* p;
 	int radix;
-	static char num[20 + 1];
+	static char num[40 + 1];
 
 	p = num;
-	radix = 20;
+	radix = 40;
+	if (c == '.')
+		goto floatconstant;
 	do
 	{
 		if (--radix < 0)
@@ -407,6 +409,8 @@ static int innumber(int c)
 			c += ('a' - 'A');
 		*p++ = c;
 		c = nextchar();
+		if (c == '.')
+			goto floatconstant;
 	} while (isalnum(c));
 	peekc = c;
 	*p = '\0';
@@ -441,6 +445,22 @@ static int innumber(int c)
 		yylval.y_valu = yylval.y_valu * radix + c;
 	}
 	return (NUMBER);
+
+floatconstant:
+	do
+	{
+		if (--radix < 0)
+			fatal("number too long");
+		if (isupper(c))
+			c += ('a' - 'A');
+		*p++ = c;
+		c = nextchar();
+	} while (isdigit(c) || (c == '.') || (c == 'E') || (c == '+') || (c == '-'));
+
+	*p = '\0';
+	stringbuf = strdup(num);
+	stringlen = p - num;
+	return NUMBERF;
 }
 
 static int instring(int termc)

mach/proto/as/comm7.c

@@ -346,6 +346,34 @@ void emitstr(int zero)
 		emit1(0);
 }
 
+#define CODE_EXPANDER
+
+#if !defined IEEEFLOAT && !defined PDPFLOAT
+	#define IEEEFLOAT
+#endif
+
+#if defined WORDS_REVERSED
+	#define FL_MSL_AT_LOW_ADDRESS 1
+	#define FL_MSW_AT_LOW_ADDRESS 1
+#else
+	#define FL_MSL_AT_LOW_ADDRESS 0
+	#define FL_MSW_AT_LOW_ADDRESS 0
+#endif
+
+#if defined BYTES_REVERSED
+	#define FL_MSB_AT_LOW_ADDRESS 1
+#else
+	#define FL_MSB_AT_LOW_ADDRESS 0
+#endif
+
+#define gen1 emit1
+#include <con_float>
+
+void emitf(int size)
+{
+	con_float(stringbuf, size);
+}
+
 /* ---------- Error checked file I/O  ---------- */
 
 void ffreopen(char* s, FILE* f)

man/uni_ass.6

@@ -206,6 +206,16 @@ This is not followed by automatic alignment.
 .Pu ".data4 \fIexpression [, expression]*\fP"
 Initialize a sequence of longs (4-byte values).
 This is not followed by automatic alignment.
+.Pu ".dataf4 \fIliteralfloat [, literalfloat]*\fP"
+Initialize a sequence of floats (4-byte values).
+The values must be literal floating point constants containing
+a dot character.
+This is not followed by automatic alignment.
+.Pu ".dataf8 \fIliteralfloat [, literalfloat]*\fP"
+Initialize a sequence of doubles (8-byte values).
+The values must be literal floating point constants containing
+a dot character.
+This is not followed by automatic alignment.
 .Pu ".ascii \fIstring\fP"
 Initialize a sequence of bytes with the value of the bytes in
 the string.