Update bootstrap sources.

This commit is contained in:
David Brown 2016-12-11 17:32:23 +00:00
parent 3c1e64375e
commit c409b84e68
10 changed files with 74 additions and 69 deletions

View file

@ -18,7 +18,7 @@ export void Out_Char (CHAR ch);
export void Out_Flush (void); export void Out_Flush (void);
export void Out_Hex (INT64 x, INT64 n); export void Out_Hex (INT64 x, INT64 n);
export void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len); export void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len);
export void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l); export void Out_HexDumpAdr (INT32 adr, INT64 offset, INT32 length);
export void Out_Int (INT64 x, INT64 n); export void Out_Int (INT64 x, INT64 n);
static INT32 Out_Length (CHAR *s, ADDRESS s__len); static INT32 Out_Length (CHAR *s, ADDRESS s__len);
export void Out_Ln (void); export void Out_Ln (void);
@ -150,25 +150,26 @@ void Out_Ln (void)
Out_Flush(); Out_Flush();
} }
void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l) void Out_HexDumpAdr (INT32 adr, INT64 offset, INT32 length)
{ {
INT32 i, n, lim; INT16 i;
INT32 n, lim;
CHAR c; CHAR c;
lim = a + l; lim = adr + length;
while (a < lim) { while (adr < lim) {
if (a + 16 < lim) { if (adr + 16 < lim) {
n = 16; n = 16;
} else { } else {
n = lim - a; n = lim - adr;
} }
Out_Hex(o, 8); Out_Hex(offset, 8);
Out_Char(' '); Out_Char(' ');
i = 0; i = 0;
while (i < n) { while (i < n) {
if (__MASK(i, -4) == 0) { if (__MASK(i, -4) == 0) {
Out_Char(' '); Out_Char(' ');
} }
__GET(a + i, c, CHAR); __GET(adr + i, c, CHAR);
Out_Hex((INT16)c, 2); Out_Hex((INT16)c, 2);
Out_Char(' '); Out_Char(' ');
i += 1; i += 1;
@ -183,7 +184,7 @@ void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l)
Out_String((CHAR*)" ", 2); Out_String((CHAR*)" ", 2);
i = 0; i = 0;
while (i < n) { while (i < n) {
__GET(a + i, c, CHAR); __GET(adr + i, c, CHAR);
if ((INT16)c < 32 || (INT16)c > 126) { if ((INT16)c < 32 || (INT16)c > 126) {
Out_Char('.'); Out_Char('.');
} else { } else {
@ -191,8 +192,8 @@ void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l)
} }
i += 1; i += 1;
} }
a += n; adr += n;
o += n; offset += (INT64)n;
Out_Ln(); Out_Ln();
} }
} }

View file

@ -13,7 +13,7 @@ import void Out_Char (CHAR ch);
import void Out_Flush (void); import void Out_Flush (void);
import void Out_Hex (INT64 x, INT64 n); import void Out_Hex (INT64 x, INT64 n);
import void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len); import void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len);
import void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l); import void Out_HexDumpAdr (INT32 adr, INT64 offset, INT32 length);
import void Out_Int (INT64 x, INT64 n); import void Out_Int (INT64 x, INT64 n);
import void Out_Ln (void); import void Out_Ln (void);
import void Out_LongReal (LONGREAL x, INT16 n); import void Out_LongReal (LONGREAL x, INT16 n);

View file

@ -18,7 +18,7 @@ export void Out_Char (CHAR ch);
export void Out_Flush (void); export void Out_Flush (void);
export void Out_Hex (INT64 x, INT64 n); export void Out_Hex (INT64 x, INT64 n);
export void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len); export void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len);
export void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l); export void Out_HexDumpAdr (INT32 adr, INT64 offset, INT32 length);
export void Out_Int (INT64 x, INT64 n); export void Out_Int (INT64 x, INT64 n);
static INT32 Out_Length (CHAR *s, ADDRESS s__len); static INT32 Out_Length (CHAR *s, ADDRESS s__len);
export void Out_Ln (void); export void Out_Ln (void);
@ -150,25 +150,26 @@ void Out_Ln (void)
Out_Flush(); Out_Flush();
} }
void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l) void Out_HexDumpAdr (INT32 adr, INT64 offset, INT32 length)
{ {
INT32 i, n, lim; INT16 i;
INT32 n, lim;
CHAR c; CHAR c;
lim = a + l; lim = adr + length;
while (a < lim) { while (adr < lim) {
if (a + 16 < lim) { if (adr + 16 < lim) {
n = 16; n = 16;
} else { } else {
n = lim - a; n = lim - adr;
} }
Out_Hex(o, 8); Out_Hex(offset, 8);
Out_Char(' '); Out_Char(' ');
i = 0; i = 0;
while (i < n) { while (i < n) {
if (__MASK(i, -4) == 0) { if (__MASK(i, -4) == 0) {
Out_Char(' '); Out_Char(' ');
} }
__GET(a + i, c, CHAR); __GET(adr + i, c, CHAR);
Out_Hex((INT16)c, 2); Out_Hex((INT16)c, 2);
Out_Char(' '); Out_Char(' ');
i += 1; i += 1;
@ -183,7 +184,7 @@ void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l)
Out_String((CHAR*)" ", 2); Out_String((CHAR*)" ", 2);
i = 0; i = 0;
while (i < n) { while (i < n) {
__GET(a + i, c, CHAR); __GET(adr + i, c, CHAR);
if ((INT16)c < 32 || (INT16)c > 126) { if ((INT16)c < 32 || (INT16)c > 126) {
Out_Char('.'); Out_Char('.');
} else { } else {
@ -191,8 +192,8 @@ void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l)
} }
i += 1; i += 1;
} }
a += n; adr += n;
o += n; offset += (INT64)n;
Out_Ln(); Out_Ln();
} }
} }

View file

@ -13,7 +13,7 @@ import void Out_Char (CHAR ch);
import void Out_Flush (void); import void Out_Flush (void);
import void Out_Hex (INT64 x, INT64 n); import void Out_Hex (INT64 x, INT64 n);
import void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len); import void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len);
import void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l); import void Out_HexDumpAdr (INT32 adr, INT64 offset, INT32 length);
import void Out_Int (INT64 x, INT64 n); import void Out_Int (INT64 x, INT64 n);
import void Out_Ln (void); import void Out_Ln (void);
import void Out_LongReal (LONGREAL x, INT16 n); import void Out_LongReal (LONGREAL x, INT16 n);

View file

@ -18,7 +18,7 @@ export void Out_Char (CHAR ch);
export void Out_Flush (void); export void Out_Flush (void);
export void Out_Hex (INT64 x, INT64 n); export void Out_Hex (INT64 x, INT64 n);
export void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len); export void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len);
export void Out_HexDumpAdr (INT64 a, INT64 o, INT64 l); export void Out_HexDumpAdr (INT64 adr, INT64 offset, INT32 length);
export void Out_Int (INT64 x, INT64 n); export void Out_Int (INT64 x, INT64 n);
static INT32 Out_Length (CHAR *s, ADDRESS s__len); static INT32 Out_Length (CHAR *s, ADDRESS s__len);
export void Out_Ln (void); export void Out_Ln (void);
@ -150,25 +150,26 @@ void Out_Ln (void)
Out_Flush(); Out_Flush();
} }
void Out_HexDumpAdr (INT64 a, INT64 o, INT64 l) void Out_HexDumpAdr (INT64 adr, INT64 offset, INT32 length)
{ {
INT64 i, n, lim; INT16 i;
INT64 n, lim;
CHAR c; CHAR c;
lim = a + l; lim = adr + (INT64)length;
while (a < lim) { while (adr < lim) {
if (a + 16 < lim) { if (adr + 16 < lim) {
n = 16; n = 16;
} else { } else {
n = lim - a; n = lim - adr;
} }
Out_Hex(o, 8); Out_Hex(offset, 8);
Out_Char(' '); Out_Char(' ');
i = 0; i = 0;
while (i < n) { while ((INT64)i < n) {
if (__MASK(i, -4) == 0) { if (__MASK(i, -4) == 0) {
Out_Char(' '); Out_Char(' ');
} }
__GET(a + i, c, CHAR); __GET(adr + (INT64)i, c, CHAR);
Out_Hex((INT16)c, 2); Out_Hex((INT16)c, 2);
Out_Char(' '); Out_Char(' ');
i += 1; i += 1;
@ -182,8 +183,8 @@ void Out_HexDumpAdr (INT64 a, INT64 o, INT64 l)
} }
Out_String((CHAR*)" ", 2); Out_String((CHAR*)" ", 2);
i = 0; i = 0;
while (i < n) { while ((INT64)i < n) {
__GET(a + i, c, CHAR); __GET(adr + (INT64)i, c, CHAR);
if ((INT16)c < 32 || (INT16)c > 126) { if ((INT16)c < 32 || (INT16)c > 126) {
Out_Char('.'); Out_Char('.');
} else { } else {
@ -191,8 +192,8 @@ void Out_HexDumpAdr (INT64 a, INT64 o, INT64 l)
} }
i += 1; i += 1;
} }
a += n; adr += n;
o += n; offset += n;
Out_Ln(); Out_Ln();
} }
} }

View file

@ -13,7 +13,7 @@ import void Out_Char (CHAR ch);
import void Out_Flush (void); import void Out_Flush (void);
import void Out_Hex (INT64 x, INT64 n); import void Out_Hex (INT64 x, INT64 n);
import void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len); import void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len);
import void Out_HexDumpAdr (INT64 a, INT64 o, INT64 l); import void Out_HexDumpAdr (INT64 adr, INT64 offset, INT32 length);
import void Out_Int (INT64 x, INT64 n); import void Out_Int (INT64 x, INT64 n);
import void Out_Ln (void); import void Out_Ln (void);
import void Out_LongReal (LONGREAL x, INT16 n); import void Out_LongReal (LONGREAL x, INT16 n);

View file

@ -18,7 +18,7 @@ export void Out_Char (CHAR ch);
export void Out_Flush (void); export void Out_Flush (void);
export void Out_Hex (INT64 x, INT64 n); export void Out_Hex (INT64 x, INT64 n);
export void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len); export void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len);
export void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l); export void Out_HexDumpAdr (INT32 adr, INT64 offset, INT32 length);
export void Out_Int (INT64 x, INT64 n); export void Out_Int (INT64 x, INT64 n);
static INT32 Out_Length (CHAR *s, ADDRESS s__len); static INT32 Out_Length (CHAR *s, ADDRESS s__len);
export void Out_Ln (void); export void Out_Ln (void);
@ -150,25 +150,26 @@ void Out_Ln (void)
Out_Flush(); Out_Flush();
} }
void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l) void Out_HexDumpAdr (INT32 adr, INT64 offset, INT32 length)
{ {
INT32 i, n, lim; INT16 i;
INT32 n, lim;
CHAR c; CHAR c;
lim = a + l; lim = adr + length;
while (a < lim) { while (adr < lim) {
if (a + 16 < lim) { if (adr + 16 < lim) {
n = 16; n = 16;
} else { } else {
n = lim - a; n = lim - adr;
} }
Out_Hex(o, 8); Out_Hex(offset, 8);
Out_Char(' '); Out_Char(' ');
i = 0; i = 0;
while (i < n) { while (i < n) {
if (__MASK(i, -4) == 0) { if (__MASK(i, -4) == 0) {
Out_Char(' '); Out_Char(' ');
} }
__GET(a + i, c, CHAR); __GET(adr + i, c, CHAR);
Out_Hex((INT16)c, 2); Out_Hex((INT16)c, 2);
Out_Char(' '); Out_Char(' ');
i += 1; i += 1;
@ -183,7 +184,7 @@ void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l)
Out_String((CHAR*)" ", 2); Out_String((CHAR*)" ", 2);
i = 0; i = 0;
while (i < n) { while (i < n) {
__GET(a + i, c, CHAR); __GET(adr + i, c, CHAR);
if ((INT16)c < 32 || (INT16)c > 126) { if ((INT16)c < 32 || (INT16)c > 126) {
Out_Char('.'); Out_Char('.');
} else { } else {
@ -191,8 +192,8 @@ void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l)
} }
i += 1; i += 1;
} }
a += n; adr += n;
o += n; offset += (INT64)n;
Out_Ln(); Out_Ln();
} }
} }

View file

@ -13,7 +13,7 @@ import void Out_Char (CHAR ch);
import void Out_Flush (void); import void Out_Flush (void);
import void Out_Hex (INT64 x, INT64 n); import void Out_Hex (INT64 x, INT64 n);
import void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len); import void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len);
import void Out_HexDumpAdr (INT32 a, INT32 o, INT32 l); import void Out_HexDumpAdr (INT32 adr, INT64 offset, INT32 length);
import void Out_Int (INT64 x, INT64 n); import void Out_Int (INT64 x, INT64 n);
import void Out_Ln (void); import void Out_Ln (void);
import void Out_LongReal (LONGREAL x, INT16 n); import void Out_LongReal (LONGREAL x, INT16 n);

View file

@ -18,7 +18,7 @@ export void Out_Char (CHAR ch);
export void Out_Flush (void); export void Out_Flush (void);
export void Out_Hex (INT64 x, INT64 n); export void Out_Hex (INT64 x, INT64 n);
export void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len); export void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len);
export void Out_HexDumpAdr (INT64 a, INT64 o, INT64 l); export void Out_HexDumpAdr (INT64 adr, INT64 offset, INT32 length);
export void Out_Int (INT64 x, INT64 n); export void Out_Int (INT64 x, INT64 n);
static INT32 Out_Length (CHAR *s, ADDRESS s__len); static INT32 Out_Length (CHAR *s, ADDRESS s__len);
export void Out_Ln (void); export void Out_Ln (void);
@ -150,25 +150,26 @@ void Out_Ln (void)
Out_Flush(); Out_Flush();
} }
void Out_HexDumpAdr (INT64 a, INT64 o, INT64 l) void Out_HexDumpAdr (INT64 adr, INT64 offset, INT32 length)
{ {
INT64 i, n, lim; INT16 i;
INT64 n, lim;
CHAR c; CHAR c;
lim = a + l; lim = adr + (INT64)length;
while (a < lim) { while (adr < lim) {
if (a + 16 < lim) { if (adr + 16 < lim) {
n = 16; n = 16;
} else { } else {
n = lim - a; n = lim - adr;
} }
Out_Hex(o, 8); Out_Hex(offset, 8);
Out_Char(' '); Out_Char(' ');
i = 0; i = 0;
while (i < n) { while ((INT64)i < n) {
if (__MASK(i, -4) == 0) { if (__MASK(i, -4) == 0) {
Out_Char(' '); Out_Char(' ');
} }
__GET(a + i, c, CHAR); __GET(adr + (INT64)i, c, CHAR);
Out_Hex((INT16)c, 2); Out_Hex((INT16)c, 2);
Out_Char(' '); Out_Char(' ');
i += 1; i += 1;
@ -182,8 +183,8 @@ void Out_HexDumpAdr (INT64 a, INT64 o, INT64 l)
} }
Out_String((CHAR*)" ", 2); Out_String((CHAR*)" ", 2);
i = 0; i = 0;
while (i < n) { while ((INT64)i < n) {
__GET(a + i, c, CHAR); __GET(adr + (INT64)i, c, CHAR);
if ((INT16)c < 32 || (INT16)c > 126) { if ((INT16)c < 32 || (INT16)c > 126) {
Out_Char('.'); Out_Char('.');
} else { } else {
@ -191,8 +192,8 @@ void Out_HexDumpAdr (INT64 a, INT64 o, INT64 l)
} }
i += 1; i += 1;
} }
a += n; adr += n;
o += n; offset += n;
Out_Ln(); Out_Ln();
} }
} }

View file

@ -13,7 +13,7 @@ import void Out_Char (CHAR ch);
import void Out_Flush (void); import void Out_Flush (void);
import void Out_Hex (INT64 x, INT64 n); import void Out_Hex (INT64 x, INT64 n);
import void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len); import void Out_HexDump (SYSTEM_BYTE *m, ADDRESS m__len);
import void Out_HexDumpAdr (INT64 a, INT64 o, INT64 l); import void Out_HexDumpAdr (INT64 adr, INT64 offset, INT32 length);
import void Out_Int (INT64 x, INT64 n); import void Out_Int (INT64 x, INT64 n);
import void Out_Ln (void); import void Out_Ln (void);
import void Out_LongReal (LONGREAL x, INT16 n); import void Out_LongReal (LONGREAL x, INT16 n);