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

CARD: Use proper int types for messages emitted

Browse source 
t_addr may not be an int equivalent type depending on simulator build
parameters.  Any messages for card activities will always be within int
bounds.
This commit is contained in:
Mark Pizzolato 2019-12-30 13:16:30 -08:00
parent d131f66c40
commit e7cf2a00ec
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sim_card.c
View file

@ -1318,7 +1318,7 @@ sim_card_attach(UNIT * uptr, CONST char *cptr)
sprintf (uptr->filename, "%s-F %s %s", (eof)?"-E ": "", fmt, cptr); sprintf (uptr->filename, "%s-F %s %s", (eof)?"-E ": "", fmt, cptr);
} }
r = sim_messagef(SCPE_OK, "%s: %d card Deck Loaded from %s\n", r = sim_messagef(SCPE_OK, "%s: %d card Deck Loaded from %s\n",
sim_uname(uptr), data->hopper_cards - previous_cards, cptr); sim_uname(uptr), (int)(data->hopper_cards - previous_cards), cptr);
} else { } else {
if (uptr->dynflags & UNIT_ATTMULT) if (uptr->dynflags & UNIT_ATTMULT)
uptr->flags |= UNIT_ATT; uptr->flags |= UNIT_ATT;
@ -1430,22 +1430,22 @@ sprintf (cmd, "%s -S -E File40.deck", dptr->name);
SIM_TEST(attach_cmd (0, cmd)); SIM_TEST(attach_cmd (0, cmd));
sprintf (saved_filename, "%s %s", dptr->name, dptr->units->filename); sprintf (saved_filename, "%s %s", dptr->name, dptr->units->filename);
show_cmd (0, dptr->name); show_cmd (0, dptr->name);
sim_printf ("Input Hopper Count: %d\n", sim_card_input_hopper_count(dptr->units)); sim_printf ("Input Hopper Count: %d\n", (int)sim_card_input_hopper_count(dptr->units));
sim_printf ("Output Hopper Count: %d\n", sim_card_output_hopper_count(dptr->units)); sim_printf ("Output Hopper Count: %d\n", (int)sim_card_output_hopper_count(dptr->units));
while (!sim_card_eof (dptr->units)) while (!sim_card_eof (dptr->units))
SIM_TEST(sim_read_card (dptr->units, card_image)); SIM_TEST(sim_read_card (dptr->units, card_image));
sim_printf ("Input Hopper Count: %d\n", sim_card_input_hopper_count(dptr->units)); sim_printf ("Input Hopper Count: %d\n", (int)sim_card_input_hopper_count(dptr->units));
sim_printf ("Output Hopper Count: %d\n", sim_card_output_hopper_count(dptr->units)); sim_printf ("Output Hopper Count: %d\n", (int)sim_card_output_hopper_count(dptr->units));
sim_printf ("Detaching %s\n", dptr->name); sim_printf ("Detaching %s\n", dptr->name);
SIM_TEST(detach_cmd (0, dptr->name)); SIM_TEST(detach_cmd (0, dptr->name));
show_cmd (0, dptr->name); show_cmd (0, dptr->name);
sim_printf ("Input Hopper Count: %d\n", sim_card_input_hopper_count(dptr->units)); sim_printf ("Input Hopper Count: %d\n", (int)sim_card_input_hopper_count(dptr->units));
sim_printf ("Output Hopper Count: %d\n", sim_card_output_hopper_count(dptr->units)); sim_printf ("Output Hopper Count: %d\n", (int)sim_card_output_hopper_count(dptr->units));
sim_printf ("Attaching Saved Filenames: %s\n", saved_filename + strlen(dptr->name)); sim_printf ("Attaching Saved Filenames: %s\n", saved_filename + strlen(dptr->name));
SIM_TEST(attach_cmd (0, saved_filename)); SIM_TEST(attach_cmd (0, saved_filename));
show_cmd (0, dptr->name); show_cmd (0, dptr->name);
sim_printf ("Input Hopper Count: %d\n", sim_card_input_hopper_count(dptr->units)); sim_printf ("Input Hopper Count: %d\n", (int)sim_card_input_hopper_count(dptr->units));
sim_printf ("Output Hopper Count: %d\n", sim_card_output_hopper_count(dptr->units)); sim_printf ("Output Hopper Count: %d\n", (int)sim_card_output_hopper_count(dptr->units));
SIM_TEST(detach_cmd (0, dptr->name)); SIM_TEST(detach_cmd (0, dptr->name));
(void)remove ("file10.deck"); (void)remove ("file10.deck");
(void)remove ("file20.deck"); (void)remove ("file20.deck");