Merge commit '0616816f8e81c24377dca6e191a82c406ab59394' into macro11-v0.8

Update to latest released version of macro-11.

Command run: git subtree pull --prefix=crossassemblers/macro11 ../macro11 macro11-v0.8
(should be equivalent to git subtree pull --prefix=crossassemblers/macro11 git://gitlab.com/Rhialto/macro11.git macro11-v0.8)
This commit is contained in:
Olaf Seibert
2022-07-06 19:00:22 +02:00
38 changed files with 2521 additions and 482 deletions

View File

@@ -159,23 +159,21 @@ int gsd_flush(
/* 1 byte type */
/* 2 bytes value */
static int gsd_write(
static int gsd_write2(
GSD * gsd,
char *name,
unsigned *radtbl,
int flags,
int type,
int value)
{
char *cp;
unsigned radtbl[2];
if (gsd->offset > (int)sizeof(gsd->buf) - 8) {
if (!gsd_flush(gsd))
return 0;
}
rad50x2(name, radtbl);
cp = gsd->buf + gsd->offset;
*cp++ = radtbl[0] & 0xff;
*cp++ = (radtbl[0] >> 8) & 0xff;
@@ -193,6 +191,19 @@ static int gsd_write(
return 1;
}
static int gsd_write(
GSD * gsd,
char *name,
int flags,
int type,
int value)
{
unsigned radtbl[2];
rad50x2(name, radtbl);
return gsd_write2 (gsd, radtbl, flags, type, value);
}
/* gsd_mod - Write module name to GSD */
int gsd_mod(
@@ -258,9 +269,9 @@ int gsd_psect(
/* Write program ident to GSD */
int gsd_ident(
GSD * gsd,
char *name)
unsigned *name)
{
return gsd_write(gsd, name, 0, GSD_IDENT, 0);
return gsd_write2(gsd, name, 0, GSD_IDENT, 0);
}
/* Write virtual array declaration to GSD */