X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=listing.c;h=31308870bb574e3343f3c332a7d3772a484d49f9;hp=2fcf315c48739d057dbd46ddad1d3cc1acdd9534;hb=HEAD;hpb=26019087571ebcafae571c7d32f485ceb8af8c5d

diff --git a/listing.c b/listing.c
index 2fcf315..e13856e 100644
--- a/listing.c
+++ b/listing.c
@@ -1,24 +1,24 @@
 //
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Renamed Macro Assembler for all Atari computers
 // LISTING.C - Listing Output
-// Copyright (C) 199x Landon Dyer, 2011-2012 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2021 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
 // --------------------------------------------------------------------------
 // 0    0    1    1    2    2    3    3    4    4    5    5    6    6    7    7
 // 012345678901234567890123456789012345678901234567890123456789012345678901234567
-// filename....                         Reboot's Macro Assembler N.N.NN (Unknown)
+// filename....                         Renamed Macro Assembler N.N.NN (Unknown)
 // nnnnn  aaaaaaaa  dddddddddddddddddddd T source code
 // nnnnn  aaaaaaaa  dddddddddddddddd
 // nnnnn           =vvvvvvvv
 
 #include "listing.h"
-#include "version.h"
-#include "token.h"
+#include "error.h"
 #include "procln.h"
 #include "sect.h"
-#include "error.h"
+#include "token.h"
+#include "version.h"
 
 char * list_fname;					// Listing filename
 uint8_t subttl[TITLESIZ];			// Current subtitle
@@ -53,7 +53,7 @@ static char * month[16] = {
 //
 int eject(void)
 {
-	if (listing > 0)
+	if (listing > 0 && list_pag)
 	{
 		println("\f");
 		nlines = 0;
@@ -66,9 +66,9 @@ int eject(void)
 //
 // Return GEMDOS format date
 //
-VALUE dos_date(void)
+uint32_t dos_date(void)
 {
-	VALUE v;
+	uint32_t v;
 	struct tm * tm;
 	time_t tloc;
 
@@ -83,9 +83,9 @@ VALUE dos_date(void)
 //
 // Return GEMDOS format time
 //
-VALUE dos_time(void)
+uint32_t dos_time(void)
 {
-	VALUE v;
+	uint32_t v;
 	struct tm * tm;
 	time_t tloc;
 
@@ -100,7 +100,7 @@ VALUE dos_time(void)
 //
 // Generate a time string
 //
-void time_string(char * buf, VALUE time)
+void time_string(char * buf, uint32_t time)
 {
 	int hour;
 	char * ampm;
@@ -123,7 +123,7 @@ void time_string(char * buf, VALUE time)
 //
 // Generate a date string
 //
-void date_string(char * buf, VALUE date)
+void date_string(char * buf, uint32_t date)
 {
 	sprintf(buf, "%d-%s-%d",
 		(int)(date & 0x1F), month[(date >> 5) & 0xF], (int)((date >> 9) + 1980));
@@ -132,7 +132,7 @@ void date_string(char * buf, VALUE date)
 
 //
 // Transform letters a-f in the address and data columns of the listing to
-// uppercase. (People seem  to like uppercase hex better in assembly-language
+// uppercase. (People seem to like uppercase hex better in assembly-language
 // listings....)
 //
 void uc_ln(char * ln)
@@ -178,7 +178,7 @@ void list_setup(void)
 	list_fname = NULL;
 
 	if ((list_fd = open(fnbuf, _OPEN_FLAGS, _PERM_MODE)) < 0)
-		cantcreat(fnbuf);
+		CantCreateFile(fnbuf);
 }
 
 
@@ -252,8 +252,6 @@ void ship_ln(const char * ln)
 //
 void InitListing(void)
 {
-	extern VALUE dos_date(), dos_time();
-
 	subflag = 0;
 	pageno = 0;
 	nlines = 0;
@@ -412,7 +410,7 @@ void lstout(char tag)
 //
 // Output a value to listing
 //
-int listvalue(VALUE v)
+int listvalue(uint32_t v)
 {
 	sprintf(buf, "=%08X", v);
 	strncpy(lnimage + DATA_COL - 1, buf, 9);