d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

moer robust version

Browse source
This commit is contained in:
ceriel 1987-03-31 08:16:41 +00:00
parent b53a5e2540
commit f67bfc485c
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
modules/src/read_em/read_em.c
View file

@ -106,7 +106,7 @@ int EM_wordsize, EM_pointersize;
#ifdef CHECKING
static char *argrange = "Argument range error";
#define check(expr) (expr || (xerror(argrange)))
#define check(expr) (expr || !EM_error || (EM_error = argrange))
#else not CHECKING
#define check(x) /* nothing */
#endif CHECKING
@ -204,7 +204,7 @@ startmes(p)
if (ap->em_cst == ms_emx) {
if (wsize || psize) {
xerror("Duplicate ms_emx");
if (!EM_error) EM_error = "Duplicate ms_emx";
}
argp = ap = getarg(cst_ptyp);
wsize = ap->em_cst;
@ -344,7 +344,8 @@ EM_getinstr()
/* Check that the last value is 0 or 1
*/
if (ap1->em_cst != 1 && ap1->em_cst != 0) {
xerror("Third argument of hol/bss not 0/1");
if (! EM_error)
EM_error="Third argument of hol/bss not 0/1";
}
#endif CHECKING
break;
@ -391,10 +392,11 @@ EM_getinstr()
startmes(p);
break;
}
if (!wsize) {
xerror("EM code should start with mes 2");
if (!wsize && !EM_error) {
wsize = 2;
psize = 2;
EM_error = "EM code should start with mes 2";
}
if (EM_error && p->em_type != EM_FATAL) p->em_type = EM_ERROR;
return p;
}
@ -413,10 +415,10 @@ EM_getinstr()
default:
assert(0);
case MES:
xerror("String too long in message");
/* p->em_type = EM_MESARG;
p->em_arg = args;
*/
if (!EM_error)
EM_error = "String too long in message";
p->em_type = EM_MESARG;
p->em_arg = args;
break;
case CON:
p->em_type = EM_PSEU;
@ -429,14 +431,12 @@ EM_getinstr()
p->em_args = args;
break;
}
if (EM_error && p->em_type != EM_FATAL) p->em_type = EM_ERROR;
return p;
}
/* Here, we are in a state reading arguments */
args = getarg(any_ptyp);
if (EM_error && p->em_type != EM_FATAL) {
p->em_type = EM_ERROR;
return p;
}
if (!args) { /* No more arguments */

24
modules/src/read_em/readk.c
View file

@ -71,8 +71,8 @@ getarg(typset)
ap->em_noff = 0;
ap->em_argtype = nof_ptyp;
#ifdef CHECKING
if (ap->em_dlb < 0) {
xerror("Illegal data label");
if (ap->em_dlb < 0 && !EM_error) {
EM_error = "Illegal data label";
break;
}
#endif CHECKING
@ -87,8 +87,8 @@ getarg(typset)
ap->em_ilb = get16();
ap->em_argtype = ilb_ptyp;
#ifdef CHECKING
if (ap->em_ilb < 0) {
xerror("Illegal instruction label");
if (ap->em_ilb < 0 && !EM_error) {
EM_error = "Illegal instruction label";
break;
}
#endif CHECKING
@ -195,8 +195,8 @@ getarg(typset)
return 0;
}
if ((typset & (1 << i)) == 0) {
xerror("Bad argument type");
if ((typset & (1 << i)) == 0 && !EM_error) {
EM_error = "Bad argument type";
}
if (argtyp == sp_cend) return 0;
#else not CHECKING
@ -276,8 +276,8 @@ getstring(isident)
#ifdef CHECKING
if (isident) {
if (!checkident(s)) {
xerror("Illegal identifier");
if (!checkident(s) && !EM_error) {
EM_error = "Illegal identifier";
}
}
#endif CHECKING
@ -326,8 +326,8 @@ gethead()
p->em_type = EM_DEFILB;
p->em_deflb = get16();
#ifdef CHECKING
if (p->em_deflb < 0) {
xerror("Illegal instruction label definition");
if (p->em_deflb < 0 && !EM_error) {
EM_error = "Illegal instruction label definition";
}
#endif CHECKING
break;
@ -341,8 +341,8 @@ gethead()
p->em_type = EM_DEFDLB;
p->em_deflb = get16();
#ifdef CHECKING
if (p->em_deflb < 0) {
xerror("Illegal data label definition");
if (p->em_deflb < 0 && !EM_error) {
EM_error = "Illegal data label definition";
}
#endif CHECKING
break;