github.com/open-simh.simtools
1
0
Fork 0
mirror of https://github.com/open-simh/simtools.git synced 2026-01-11 23:53:02 +00:00
Code Issues Projects Releases Wiki Activity

Fix .IDENT to accept <val> just as .RAD50 does.

Browse Source
This commit is contained in:
Paul Koning 2022-06-27 09:51:19 -04:00
parent 2969c16583
commit 417ff111ad
5 changed files with 106 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
assemble.c
View File

@ -27,6 +27,79 @@
#define CHECK_EOL check_eol(stack, cp)
/* assemble a rad50 value (some number of words). */
static unsigned * assemble_rad50 (
char *cp,
int max,
int *count,
STACK *stack)
{
char *radstr;
unsigned *ret;
int i, len, wcnt;
/*
* Allocate storage sufficient for the rest of
* the line.
*/
radstr = memcheck(malloc(strlen(cp)));
len = 0;
do {
cp = skipwhite(cp);
if (*cp == '<') {
EX_TREE *value;
/* A byte value */
value = parse_unary_expr(cp, 0);
cp = value->cp;
if (value->type != EX_LIT) {
report(stack->top, "expression must be constant\n");
radstr[len++] = 0;
} else if (value->data.lit >= 050) {
report(stack->top, "invalid character value %o\n", value->data.lit);
radstr[len++] = 0;
} else {
radstr[len++] = value->data.lit;
}
free_tree(value);
} else {
char quote = *cp++;
while (*cp && *cp != '\n' && *cp != quote) {
int ch = ascii2rad50(*cp++);
if (ch == -1) {
report(stack->top, "invalid character '%c'\n", cp[-1]);
radstr[len++] = 0;
} else {
radstr[len++] = ch;
}
}
cp++; /* Skip closing quote */
}
cp = skipwhite(cp);
} while (!EOL(*cp));
wcnt = (len + 2) / 3;
if (max && max < wcnt)
wcnt = max;
if (count != NULL)
*count = wcnt;
ret = memcheck (malloc (wcnt * sizeof (int)));
for (i = 0; i < wcnt; i++) {
int word = packrad50word(radstr + i * 3, len - (i * 3));
ret[i] = word;
}
for (; i < max; i++)
ret[i] = 0;
free(radstr);
return ret;
}
/* assemble - read a line from the input stack, assemble it. */
/* This function is way way too large, because I just coded most of
@ -315,29 +388,11 @@ do_mcalled_macro:
return 1;
case P_IDENT:
{
char endc[6];
int len;
if (ident) /* An existing ident? */
free(ident); /* Discard it. */
cp = skipwhite(cp);
endc[0] = *cp++;
endc[1] = '\n';
endc[2] = 0;
len = (int) strcspn(cp, endc);
if (len > 6)
len = 6;
if (ident) /* An existing ident? */
free(ident); /* Discard it. */
ident = memcheck(malloc(len + 1));
memcpy(ident, cp, len);
ident[len] = 0;
upcase(ident);
cp += len + 1;
return CHECK_EOL;
}
ident = assemble_rad50 (cp, 2, NULL, stack);
return 1;
case P_RADIX:
{
@ -1208,59 +1263,15 @@ do_mcalled_macro:
DOT++; /* Fix it */
}
{
char *radstr;
int i, len;
/*
* Allocate storage sufficient for the rest of
* the line.
*/
radstr = memcheck(malloc(strlen(cp)));
len = 0;
do {
cp = skipwhite(cp);
if (*cp == '<') {
EX_TREE *value;
/* A byte value */
value = parse_unary_expr(cp, 0);
cp = value->cp;
if (value->type != EX_LIT) {
report(stack->top, "expression must be constant\n");
radstr[len++] = 0;
} else if (value->data.lit >= 050) {
report(stack->top, "invalid character value %o\n", value->data.lit);
radstr[len++] = 0;
} else {
radstr[len++] = value->data.lit;
}
free_tree(value);
} else {
char quote = *cp++;
while (*cp && *cp != '\n' && *cp != quote) {
int ch = ascii2rad50(*cp++);
if (ch == -1) {
report(stack->top, "invalid character '%c'\n", cp[-1]);
radstr[len++] = 0;
} else {
radstr[len++] = ch;
}
}
cp++; /* Skip closing quote */
}
cp = skipwhite(cp);
} while (!EOL(*cp));
for (i = 0; i < len; i += 3) {
int word = packrad50word(radstr + i, len - i);
store_word(stack->top, tr, 2, word);
int i, count;
unsigned *rad50;
/* Now assemble the argument */
rad50 = assemble_rad50 (cp, 0, &count, stack);
for (i = 0; i < count; i++) {
store_word (stack->top, tr, 2, rad50[i]);
}
free(radstr);
free (rad50);
}
return 1;

2
assemble_globals.c
View File

@ -59,7 +59,7 @@ int sect_sp; /* Stack pointer */
char *module_name = NULL; /* The module name (taken from the 'TITLE'); */
char *ident = NULL; /* .IDENT name */
unsigned *ident = NULL; /* Encoded .IDENT name */
EX_TREE *xfer_address = NULL; /* The transfer address */

2
assemble_globals.h
View File

@ -66,7 +66,7 @@ extern int sect_sp; /* Stack pointer */
extern char *module_name; /* The module name (taken from the 'TITLE'); */
extern char *ident; /* .IDENT name */
extern unsigned *ident; /* .IDENT name (encoded RAD50 value) */
extern EX_TREE *xfer_address; /* The transfer address */

25
object.c
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 */

2
object.h
View File

@ -161,7 +161,7 @@ int gsd_psect(
int size);
int gsd_ident(
GSD * gsd,
char *name);
unsigned *name);
int gsd_virt(
GSD * gsd,
char *name,