Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-06 04:43:45 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes for building with Visual Studio 2013 RTM [smf]

Browse Source
This commit is contained in:
smf- 2013-10-19 08:12:34 +00:00
parent 6179584cb3
commit c97661f0e6
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/emu/cpu/mips/mips3.c
View File

@ -1990,11 +1990,11 @@ CPU_EXECUTE( mips3 )
case 0x02: /* BLTZL */ if ((INT64)RSVAL64 < 0) ADDPC(SIMMVAL); else mips3.core.pc += 4; break;
case 0x03: /* BGEZL */ if ((INT64)RSVAL64 >= 0) ADDPC(SIMMVAL); else mips3.core.pc += 4; break;
case 0x08: /* TGEI */ if ((INT64)RSVAL64 >= SIMMVAL) generate_exception(EXCEPTION_TRAP, 1); break;
case 0x09: /* TGEIU */ if (RSVAL64 >= SIMMVAL) generate_exception(EXCEPTION_TRAP, 1); break;
case 0x09: /* TGEIU */ if (RSVAL64 >= UIMMVAL) generate_exception(EXCEPTION_TRAP, 1); break;
case 0x0a: /* TLTI */ if ((INT64)RSVAL64 < SIMMVAL) generate_exception(EXCEPTION_TRAP, 1); break;
case 0x0b: /* TLTIU */ if (RSVAL64 >= SIMMVAL) generate_exception(EXCEPTION_TRAP, 1); break;
case 0x0c: /* TEQI */ if (RSVAL64 == SIMMVAL) generate_exception(EXCEPTION_TRAP, 1); break;
case 0x0e: /* TNEI */ if (RSVAL64 != SIMMVAL) generate_exception(EXCEPTION_TRAP, 1); break;
case 0x0b: /* TLTIU */ if (RSVAL64 >= UIMMVAL) generate_exception(EXCEPTION_TRAP, 1); break;
case 0x0c: /* TEQI */ if (RSVAL64 == UIMMVAL) generate_exception(EXCEPTION_TRAP, 1); break;
case 0x0e: /* TNEI */ if (RSVAL64 != UIMMVAL) generate_exception(EXCEPTION_TRAP, 1); break;
case 0x10: /* BLTZAL */ if ((INT64)RSVAL64 < 0) ADDPCL(SIMMVAL,31); break;
case 0x11: /* BGEZAL */ if ((INT64)RSVAL64 >= 0) ADDPCL(SIMMVAL,31); break;
case 0x12: /* BLTZALL */ if ((INT64)RSVAL64 < 0) ADDPCL(SIMMVAL,31) else mips3.core.pc += 4; break;
@ -2029,7 +2029,7 @@ CPU_EXECUTE( mips3 )
case 0x16: /* BLEZL */ if ((INT64)RSVAL64 <= 0) ADDPC(SIMMVAL); else mips3.core.pc += 4; break;
case 0x17: /* BGTZL */ if ((INT64)RSVAL64 > 0) ADDPC(SIMMVAL); else mips3.core.pc += 4; break;
case 0x18: /* DADDI */
if (ENABLE_OVERFLOWS && RSVAL64 > ~SIMMVAL) generate_exception(EXCEPTION_OVERFLOW, 1);
if (ENABLE_OVERFLOWS && (INT64)RSVAL64 > ~SIMMVAL) generate_exception(EXCEPTION_OVERFLOW, 1);
else if (RTREG) RTVAL64 = RSVAL64 + (INT64)SIMMVAL;
break;
case 0x19: /* DADDIU */ if (RTREG) RTVAL64 = RSVAL64 + (UINT64)SIMMVAL; break;

9
src/emu/video/fixfreq.c
View File

@ -242,11 +242,18 @@ void fixedfreq_device::update_vid(double newval, attotime cur_time)
bm->plot_box(m_last_x, m_last_y + m_sig_field, pixels - m_last_x, 1, col);
m_last_x = pixels;
}
if (sync & 1) VERBOSE_OUT(("VSYNC %d %d\n", pixels, m_last_y + m_sig_field));
if (sync & 1)
{
VERBOSE_OUT(("VSYNC %d %d\n", pixels, m_last_y + m_sig_field));
}
if (sync & 2)
{
VERBOSE_OUT(("HSYNC up %d\n", pixels));
}
if (sync & 4)
{
VERBOSE_OUT(("HSYNC down %f %d %f\n", time.as_double()* 1e6, pixels, m_vid));
}
//VERBOSE_OUT(("%d\n", m_last_x);
if (sync & 1)

6
src/mess/tools/imgtool/modules/bml3.c
View File

@ -704,7 +704,6 @@ static imgtoolerr_t bml3_diskimage_writefile(imgtool_partition *partition, const
size_t i;
UINT64 sz, read_sz;
UINT64 freespace = 0;
unsigned char g;
unsigned char *gptr;
UINT8 granule_count;
UINT8 granule_map[MAX_GRANULEMAP_SIZE];
@ -744,7 +743,8 @@ static imgtoolerr_t bml3_diskimage_writefile(imgtool_partition *partition, const
if (ferr)
return imgtool_floppy_error(ferr);
g = 0x00;
unsigned char g = 0x00;
UINT32 granule_bytes = info->granule_sectors * info->sector_size;
do
{
@ -758,7 +758,7 @@ static imgtoolerr_t bml3_diskimage_writefile(imgtool_partition *partition, const
gptr = &granule_map[g];
i = MIN(read_sz, info->granule_sectors * info->sector_size);
i = MIN(read_sz, granule_bytes);
if (i > 0) {
err = transfer_to_granule(img, g, i, sourcef);
if (err)

4
src/mess/tools/imgtool/modules/ti99.c
View File

@ -968,7 +968,7 @@ static imgtoolerr_t open_image_lvl1(imgtool_stream *file_handle, ti99_img_format
{
imgtoolerr_t err;
int reply;
int totphysrecs;
UINT16 totphysrecs;
l1_img->img_format = img_format;
@ -1030,7 +1030,7 @@ static imgtoolerr_t open_image_lvl1(imgtool_stream *file_handle, ti99_img_format
|| (totphysrecs < 2)
|| memcmp(vib->id, "DSK", 3) || (! strchr(" P", vib->protection))
|| (((img_format == if_mess) || (img_format == if_v9t9))
&& (stream_size(file_handle) != totphysrecs*256)))
&& (stream_size(file_handle) != totphysrecs*256U)))
return (imgtoolerr_t)IMGTOOLERR_CORRUPTIMAGE;
if ((img_format == if_pc99_fm) || (img_format == if_pc99_mfm))

2
src/mess/tools/imgtool/modules/vzdos.c
View File

@ -498,7 +498,7 @@ static imgtoolerr_t vzdos_diskimage_readfile(imgtool_partition *partition, const
if (ret) return ret;
/* detect sectors pointing to themselfs */
if ((track == pick_integer_le(buffer, DATA_SIZE, 1)) && (sector == pick_integer_le(buffer, DATA_SIZE + 1, 1)))
if ((track == (int)pick_integer_le(buffer, DATA_SIZE, 1)) && (sector == (int)pick_integer_le(buffer, DATA_SIZE + 1, 1)))
return IMGTOOLERR_CORRUPTIMAGE;
/* load next track and sector values */