//
-// 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
+// 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
-char subttl[TITLESIZ]; // Current subtitle
-int listing; // Listing level
+uint8_t subttl[TITLESIZ]; // Current subtitle
+int listing; // Listing level
int pagelen = 61; // Lines on a page
int nlines; // #lines on page so far
-LONG lsloc; // `sloc' at start of line
+LONG lsloc; // `sloc' at start of line
// Private
static int lcursect; // `cursect' at start of line
-static int llineno; // `curlineno' at start of line
-static int pageno; // Current page number
+static int llineno; // `curlineno' at start of line
+static int pageno; // Current page number
static int pagewidth; // #columns on a page
static int subflag; // 0, don't do .eject on subttl (set 1)
static char lnimage[IMAGESIZ]; // Image of output line
static char title[TITLESIZ]; // Current title
-static char datestr[20]; // Current date dd-mon-yyyy
+static char datestr[20]; // Current date dd-mon-yyyy
static char timestr[20]; // Current time hh:mm:ss [am|pm]
static char buf[IMAGESIZ]; // Buffer for numbers
static long unused; // For supressing 'write' warnings
//
int eject(void)
{
- if (listing > 0)
+ if (listing > 0 && list_pag)
{
println("\f");
nlines = 0;
//
// Return GEMDOS format date
//
-VALUE dos_date(void)
+uint32_t dos_date(void)
{
- VALUE v;
+ uint32_t v;
struct tm * tm;
time_t tloc;
}
-//
+//
// Return GEMDOS format time
//
-VALUE dos_time(void)
+uint32_t dos_time(void)
{
- VALUE v;
+ uint32_t v;
struct tm * tm;
time_t tloc;
//
// Generate a time string
//
-void time_string(char * buf, VALUE time)
+void time_string(char * buf, uint32_t time)
{
int hour;
char * ampm;
//
// 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));
//
// 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)
}
-//
+//
// Create listing file with the appropriate name
//
void list_setup(void)
}
list_fname = NULL;
-
+
if ((list_fd = open(fnbuf, _OPEN_FLAGS, _PERM_MODE)) < 0)
- cantcreat(fnbuf);
+ CantCreateFile(fnbuf);
}
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);
//
void InitListing(void)
{
- extern VALUE dos_date(), dos_time();
-
subflag = 0;
pageno = 0;
nlines = 0;
{
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)
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;
strcpy(buf, "xx");
p++; // Advance anyway
}
- else
+ else
sprintf(buf, "%02x", *p++ & 0xff);
strncpy(lnimage + col, buf, 2);
}
- // Flush partial line
+ // Flush partial line
if (col > DATA_COL)
{
uc_ln(lnimage);
//
// 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);
tok += 2;
- // Always eject on pages 2+
+ // Always eject on pages 2+
if (ejectok && (subflag || pageno > 1))
eject();
{
if (*tok != STRING)
return error("missing string");
-
+
// strcpy(title, (char*)tok[1]);
strcpy(title, string[tok[1]]);
tok += 2;