mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some warnings.

Browse Source
This commit is contained in:
Volker Ruppert 2014-12-01 17:06:00 +00:00
parent 03dab0b0c9
commit c8ef526143
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bochs/gui/paramtree.cc
View File

@ -295,7 +295,7 @@ bx_shadow_num_c::bx_shadow_num_c(bx_param_c *parent,
val.p64bit = ptr_to_real_val;
if (base == BASE_HEX) {
this->base = base;
this->text_format = "0x"FMT_LL"x";
this->text_format = "0x" FMT_LL "x";
}
}
@ -314,7 +314,7 @@ bx_shadow_num_c::bx_shadow_num_c(bx_param_c *parent,
val.p64bit = (Bit64s*) ptr_to_real_val;
if (base == BASE_HEX) {
this->base = base;
this->text_format = "0x"FMT_LL"x";
this->text_format = "0x" FMT_LL "x";
}
}

2
bochs/iodev/harddrv.cc
View File

@ -2624,7 +2624,7 @@ bx_hard_drive_c::calculate_logical_address(Bit8u channel, Bit64s *sector)
Bit64s sector_count = BX_SELECTED_DRIVE(channel).hdimage->hd_size / 512;
if (logical_sector >= sector_count) {
BX_ERROR (("logical address out of bounds ("FMT_LL"d/"FMT_LL"d) - aborting command", logical_sector, sector_count));
BX_ERROR (("logical address out of bounds (" FMT_LL "d/" FMT_LL "d) - aborting command", logical_sector, sector_count));
return 0;
}
*sector = logical_sector;

4
bochs/iodev/hdimage/hdimage.cc
View File

@ -468,7 +468,7 @@ int flat_image_t::open(const char* _pathname, int flags)
if ((fd = hdimage_open_file(pathname, flags, &hd_size, &mtime)) < 0) {
return -1;
}
BX_INFO(("hd_size: "FMT_LL"u", hd_size));
BX_INFO(("hd_size: " FMT_LL "u", hd_size));
if (hd_size <= 0) BX_PANIC(("size of disk image not detected / invalid"));
if ((hd_size % 512) != 0) BX_PANIC(("size of disk image must be multiple of 512 bytes"));
return fd;
@ -604,7 +604,7 @@ int concat_image_t::open(const char* _pathname0, int flags)
thismax = length_table[0]-1;
seek_was_last_op = 0;
hd_size = start_offset;
BX_INFO(("hd_size: "FMT_LL"u", hd_size));
BX_INFO(("hd_size: " FMT_LL "u", hd_size));
return 0; // success.
}

6
bochs/iodev/pit.cc
View File

@ -148,7 +148,7 @@ void bx_pit_c::init(void)
BX_DEBUG(("finished init"));
BX_DEBUG(("s.last_usec="FMT_LL"d",BX_PIT_THIS s.last_usec));
BX_DEBUG(("s.last_usec=" FMT_LL "d",BX_PIT_THIS s.last_usec));
BX_DEBUG(("s.timer_id=%d",BX_PIT_THIS s.timer_handle[0]));
BX_DEBUG(("s.timer.get_next_event_time=%d", BX_PIT_THIS s.timer.get_next_event_time()));
BX_DEBUG(("s.last_next_event_time=%d", BX_PIT_THIS s.last_next_event_time));
@ -216,7 +216,7 @@ void bx_pit_c::handle_timer()
}
BX_PIT_THIS s.last_next_event_time = BX_PIT_THIS s.timer.get_next_event_time();
}
BX_DEBUG(("s.last_usec="FMT_LL"d", BX_PIT_THIS s.last_usec));
BX_DEBUG(("s.last_usec=" FMT_LL "d", BX_PIT_THIS s.last_usec));
BX_DEBUG(("s.timer_id=%d", BX_PIT_THIS s.timer_handle[0]));
BX_DEBUG(("s.timer.get_next_event_time=%x", BX_PIT_THIS s.timer.get_next_event_time()));
BX_DEBUG(("s.last_next_event_time=%d", BX_PIT_THIS s.last_next_event_time));
@ -358,7 +358,7 @@ void bx_pit_c::write(Bit32u address, Bit32u dvalue, unsigned io_len)
}
BX_PIT_THIS s.last_next_event_time = BX_PIT_THIS s.timer.get_next_event_time();
}
BX_DEBUG(("s.last_usec="FMT_LL"d", BX_PIT_THIS s.last_usec));
BX_DEBUG(("s.last_usec=" FMT_LL "d", BX_PIT_THIS s.last_usec));
BX_DEBUG(("s.timer_id=%d", BX_PIT_THIS s.timer_handle[0]));
BX_DEBUG(("s.timer.get_next_event_time=%x", BX_PIT_THIS s.timer.get_next_event_time()));
BX_DEBUG(("s.last_next_event_time=%d", BX_PIT_THIS s.last_next_event_time));

6
bochs/iodev/usb/scsi_device.cc
View File

@ -843,7 +843,7 @@ Bit32s scsi_device_t::scsi_send_command(Bit32u tag, Bit8u *buf, int lun)
case 0x08:
case 0x28:
case 0x88:
BX_DEBUG(("Read (sector "FMT_LL"d, count %d)", lba, len));
BX_DEBUG(("Read (sector " FMT_LL "d, count %d)", lba, len));
if (lba > max_lba)
goto illegal_lba;
r->sector = lba;
@ -852,7 +852,7 @@ Bit32s scsi_device_t::scsi_send_command(Bit32u tag, Bit8u *buf, int lun)
case 0x0a:
case 0x2a:
case 0x8a:
BX_DEBUG(("Write (sector "FMT_LL"d, count %d)", lba, len));
BX_DEBUG(("Write (sector " FMT_LL "d, count %d)", lba, len));
if (lba > max_lba)
goto illegal_lba;
r->sector = lba;
@ -860,7 +860,7 @@ Bit32s scsi_device_t::scsi_send_command(Bit32u tag, Bit8u *buf, int lun)
is_write = 1;
break;
case 0x35:
BX_DEBUG(("Syncronise cache (sector "FMT_LL"d, count %d)", lba, len));
BX_DEBUG(("Syncronise cache (sector " FMT_LL "d, count %d)", lba, len));
// TODO: flush cache
break;
case 0x43:

4
bochs/memory/misc_mem.cc
View File

@ -158,12 +158,12 @@ void BX_MEM_C::read_block(Bit32u block)
const Bit64u block_address = ((Bit64u)block)*BX_MEM_BLOCK_LEN;
if (fseeko64(BX_MEM_THIS overflow_file, block_address, SEEK_SET))
BX_PANIC(("FATAL ERROR: Could not seek to 0x"FMT_LL"x in memory overflow file!", block_address));
BX_PANIC(("FATAL ERROR: Could not seek to 0x" FMT_LL "x in memory overflow file!", block_address));
// We could legitimately get an EOF condition if we are reading the last bit of memory.ram
if ((fread(BX_MEM_THIS blocks[block], BX_MEM_BLOCK_LEN, 1, BX_MEM_THIS overflow_file) != 1) &&
(!feof(BX_MEM_THIS overflow_file)))
BX_PANIC(("FATAL ERROR: Could not read from 0x"FMT_LL"x in memory overflow file!", block_address));
BX_PANIC(("FATAL ERROR: Could not read from 0x" FMT_LL "x in memory overflow file!", block_address));
}
#endif

6
bochs/misc/bximage.cc
View File

@ -1234,7 +1234,7 @@ int CDECL main(int argc, char *argv[])
Bit64u cyl = (Bit64u)(hdsize/16.0/63.0/512.0);
if (cyl >= (1 << BX_MAX_CYL_BITS))
fatal("ERROR: number of cylinders out of range !\n");
printf("\nCreating hard disk image '%s' with CHS="FMT_LL"d/%d/%d\n",
printf("\nCreating hard disk image '%s' with CHS=" FMT_LL "d/%d/%d\n",
bx_filename_1, cyl, heads, spt);
hdsize = cyl * heads * spt * 512;
create_hard_disk_image(bx_filename_1, imgmode, hdsize);
@ -1300,10 +1300,10 @@ int CDECL main(int argc, char *argv[])
} else {
if (hdimage->get_capabilities() & HDIMAGE_AUTO_GEOMETRY) {
Bit64u cyl = (Bit64u)(hdimage->hd_size/16.0/63.0/512.0);
printf("geometry = "FMT_LL"d/16/63 ("FMT_LL"d MB)\n\n", cyl,
printf("geometry = " FMT_LL "d/16/63 (" FMT_LL "d MB)\n\n", cyl,
hdimage->hd_size >> 20);
} else {
printf("geometry = %d/%d/%d ("FMT_LL"d MB)\n\n", hdimage->cylinders,
printf("geometry = %d/%d/%d (" FMT_LL "d MB)\n\n", hdimage->cylinders,
hdimage->heads, hdimage->spt, hdimage->hd_size >> 20);
}
hdimage->close();