folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

I1401: Fix to deal with instructions that are longer than 8 characters (from Van Snyder)

Browse source
This commit is contained in:
Mark Pizzolato 2014-04-12 10:11:36 -07:00
parent 5f5e931db0
commit 9b7c614bb6
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
I1401/i1401_sys.c
View file

@ -1,6 +1,6 @@
/* i1401_sys.c: IBM 1401 simulator interface /* i1401_sys.c: IBM 1401 simulator interface
Copyright (c) 1993-2012, Robert M. Supnik Copyright (c) 1993-2014, Robert M. Supnik
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),
@ -23,6 +23,7 @@
used in advertising or otherwise to promote the sale, use or other dealings used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from Robert M Supnik. in this Software without prior written authorization from Robert M Supnik.
25-Mar-14 RMS Fixed d character printout (Van Snyder)
25-Mar-12 RMS Fixed && -> & in test (Peter Schorn) 25-Mar-12 RMS Fixed && -> & in test (Peter Schorn)
20-Sep-05 RMS Revised for new code tables 20-Sep-05 RMS Revised for new code tables
04-Jan-05 WVS Added address argument support 04-Jan-05 WVS Added address argument support
@ -283,14 +284,12 @@ if ((flags & (NOWM | HNOP)) && (ilnt > 7)) /* cs, swm, h, nop? */
ilnt = 7; ilnt = 7;
else if ((op == OP_B) && (ilnt > 4) && (val[4] == BCD_BLANK)) else if ((op == OP_B) && (ilnt > 4) && (val[4] == BCD_BLANK))
ilnt = 4; ilnt = 4;
else if ((ilnt > 8) && (op != OP_NOP)) /* cap length */
ilnt = 8;
if (ilnt == 3) { /* lnt = 3? */ if (ilnt == 3) { /* lnt = 3? */
fprintf (of, "DSA"); /* assume DSA */ fprintf (of, "DSA"); /* assume DSA */
fprint_addr (of, val); /* print addr */ fprint_addr (of, val); /* print addr */
return -(ilnt - 1); return -(ilnt - 1);
} }
if ((((flags & len_table[ilnt]) == 0) && /* invalid lnt, */ if ((((flags & len_table[(ilnt > 8)? 8: ilnt]) == 0) && /* invalid lnt, */
(op != OP_NOP)) || /* not nop? */ (op != OP_NOP)) || /* not nop? */
(opcode[op] == NULL)) /* or undef? */ (opcode[op] == NULL)) /* or undef? */
return dcw (of, op, val, sw); return dcw (of, op, val, sw);
@ -303,7 +302,7 @@ if (ilnt > 2) { /* A address? */
} }
if (ilnt > 5) /* B address? */ if (ilnt > 5) /* B address? */
fprint_addr (of, &val[4]); fprint_addr (of, &val[4]);
if ((ilnt == 2) || (ilnt == 5) || (ilnt == 8)) /* d character? */ if ((ilnt == 2) || (ilnt == 5) || (ilnt >= 8)) /* d character? */
fprintf (of, " '%c", bcd2ascii (val[ilnt - 1], use_h)); fprintf (of, " '%c", bcd2ascii (val[ilnt - 1], use_h));
return -(ilnt - 1); /* return # chars */ return -(ilnt - 1); /* return # chars */
} }