Actually implement ^^FILESIZE this time :)

[rmac] / listing.c

diff --git a/listing.c b/listing.c
index 3d632560ab89ccf8ce561a29b8d9fb6e10628f74..f2f361336315a9d843bb069f7cd9b95ce09256dc 100644 (file)
--- a/listing.c
+++ b/listing.c
@@ -1,7 +1,7 @@
 //
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's 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-2020 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -14,11 +14,11 @@
 // 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
@@ -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));
@@ -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);
 }
 
 
@@ -217,26 +217,29 @@ void ship_ln(const char * ln)
        if (listing <= 0)
                return;
 
-       // Notice bottom of page
-       if (nlines >= pagelen - BOT_MAR)
-               eject();
-
-       // Print title, boilerplate, and subtitle at top of page
-       if (nlines == 0)
+       if (list_pag)
        {
-               pageno++;
-               println("");
-               date_string(datestr, dos_date());
-               time_string(timestr, dos_time());
-               sprintf(buf,
-                       "%-40s%-20s Page %-4d    %s %s        RMAC %01i.%01i.%02i (%s)",
-                       title, curfname, pageno, timestr, datestr, MAJOR, MINOR, PATCH,
-                       PLATFORM);
-               println(buf);
-               sprintf(buf, "%s", subttl);
-               println(buf);
-               println("");
-               nlines = 4;
+               // Notice bottom of page
+               if (nlines >= pagelen - BOT_MAR)
+                       eject();
+
+               // Print title, boilerplate, and subtitle at top of page
+               if (nlines == 0)
+               {
+                       pageno++;
+                       println("");
+                       date_string(datestr, dos_date());
+                       time_string(timestr, dos_time());
+                       sprintf(buf,
+                               "%-40s%-20s Page %-4d    %s %s        RMAC %01i.%01i.%02i (%s)",
+                               title, curfname, pageno, timestr, datestr, MAJOR, MINOR, PATCH,
+                               PLATFORM);
+                       println(buf);
+                       sprintf(buf, "%s", subttl);
+                       println(buf);
+                       println("");
+                       nlines = 4;
+               }
        }
 
        println(ln);
@@ -249,8 +252,6 @@ void ship_ln(const char * ln)
 //
 void InitListing(void)
 {
-       extern VALUE dos_date(), dos_time();
-
        subflag = 0;
        pageno = 0;
        nlines = 0;
@@ -301,11 +302,14 @@ void listeol(void)
        {
                ch = sect[lcursect].sfcode;
 
+               if (lcursect != M6502)
+        {
                for(; ch!=NULL; ch=ch->chnext)
                {
                        if (lsloc >= ch->chloc && lsloc < (ch->chloc + ch->ch_size))
                                break;
                }
+        }
 
                // Fatal: Can't find chunk holding code
                if (ch == NULL)
@@ -331,7 +335,8 @@ nochunk:
                                strncpy(lnimage + LOC_COL, buf, 8);
                        }
 
-                       if (lsloc >= (ch->chloc + ch->ch_size))
+                       if (lcursect != M6502 &&
+                    lsloc >= (ch->chloc + ch->ch_size))
                        {
                                if ((ch = ch->chnext) == NULL)
                                        goto nochunk;
@@ -405,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);