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

TT2500: Debugging and reduce type slice warnings.

Browse source 
- Debug: Output the character received, if printable.
- Eliminate type slicing warnings (uint32 -> uint16)
This commit is contained in:
B. Scott Michel 2024-04-15 09:58:11 -07:00 • committed by Paul Koning
parent 3e9d8cf864
commit 458ab73c4f
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tt2500/tt2500_cpu.c
View file

@ -162,8 +162,8 @@ static uint16 cpu_ars (uint16 data, uint16 n)
{ {
uint32 sign = 0; uint32 sign = 0;
if (data & 0100000) if (data & 0100000)
sign = 0177777 << 16; sign = 0177777u << 16;
return (data >> n) + (sign >> n); return (data >> n) + ((uint16) (sign >> n));
} }
uint16 cpu_alu (uint16 insn, uint16 op, uint16 adata, uint16 bdata) uint16 cpu_alu (uint16 insn, uint16 op, uint16 adata, uint16 bdata)

2
tt2500/tt2500_dpy.c
View file

@ -210,7 +210,7 @@ static t_stat dpy_reset (DEVICE *dptr)
void dpy_magic (uint16 xr, uint16 *r2, uint16 *r3, uint16 r4, uint16 r5) void dpy_magic (uint16 xr, uint16 *r2, uint16 *r3, uint16 r4, uint16 r5)
{ {
uint32 x = *r2, y = *r3; uint16 x = *r2, y = *r3;
uint16 x0, y0, x1, y1, dx, dy; uint16 x0, y0, x1, y1, dx, dy;
sim_debug (DBG_VEC, &dpy_dev, "MAGIC %06o\n", xr); sim_debug (DBG_VEC, &dpy_dev, "MAGIC %06o\n", xr);

5
tt2500/tt2500_tv.c
View file

@ -108,11 +108,12 @@ tv_reset (DEVICE *dptr)
static void tv_character (int row, int col, uint8 c, uint8 *font) static void tv_character (int row, int col, uint8 c, uint8 *font)
{ {
uint16 i, j, pixels, address; size_t i, address;
address = 16 * c; address = 16 * c;
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
pixels = font[address + i]; size_t j, pixels = font[address + i];
for (j = 0; j < 8; j++) { for (j = 0; j < 8; j++) {
surface[8 * (72 * i + col) + j] = palette[(pixels >> 7) & 1]; surface[8 * (72 * i + col) + j] = palette[(pixels >> 7) & 1];
pixels <<= 1; pixels <<= 1;

4
tt2500/tt2500_uart.c
View file

@ -113,7 +113,7 @@ uart_r_svc(UNIT *uptr)
if (uptr->fileref != NULL) { if (uptr->fileref != NULL) {
unsigned char buf; unsigned char buf;
if (sim_fread (&buf, 1, 1, uptr->fileref) == 1) { if (sim_fread (&buf, 1, 1, uptr->fileref) == 1) {
sim_debug (DBG_RX, &uart_dev, "Received character %03o\n", buf); sim_debug (DBG_RX, &uart_dev, "Received character %03o (%c)\n", buf, isprint(buf) ? buf : ' ');
RBUF = buf; RBUF = buf;
flag_on (INT_RRD); flag_on (INT_RRD);
} }
@ -122,7 +122,7 @@ uart_r_svc(UNIT *uptr)
ch = tmxr_getc_ln (&uart_ldsc); ch = tmxr_getc_ln (&uart_ldsc);
if (ch & TMXR_VALID) { if (ch & TMXR_VALID) {
RBUF = sim_tt_inpcvt (ch, TT_GET_MODE (uart_unit[0].flags)); RBUF = sim_tt_inpcvt (ch, TT_GET_MODE (uart_unit[0].flags));
sim_debug (DBG_RX, &uart_dev, "Received character %03o\n", RBUF); sim_debug (DBG_RX, &uart_dev, "TMXR received character %03o (%c)\n", RBUF, isprint(RBUF) ? RBUF : ' ');
flag_on (INT_RRD); flag_on (INT_RRD);
return SCPE_OK; return SCPE_OK;
} }