Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made MAME and MESS compile under VS2013, 32bit only for now (nw)

Browse Source 
OG: please check things in H8 core, thing in timer16 can caused some issues in past
This commit is contained in:
Miodrag Milanovic 2014-03-31 08:29:30 +00:00
parent f60bf10bf7
commit b297c61ebd
12 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/cpu/h8/h8_adc.c
View File

@ -76,7 +76,7 @@ WRITE8_MEMBER(h8_adc_device::adcr_w)
WRITE_LINE_MEMBER(h8_adc_device::adtrg_w)
{
if(state != adtrg) {
if((bool)state != adtrg) {
adtrg = state;
if(!adtrg && (trigger & T_EXT) && !(adcsr & F_ADST)) {
adcsr |= F_ADST;

4
src/emu/cpu/h8/h8_sci.c
View File

@ -279,8 +279,8 @@ WRITE_LINE_MEMBER(h8_sci_device::rx_w)
WRITE_LINE_MEMBER(h8_sci_device::clk_w)
{
if(ext_clock_value != state) {
ext_clock_value = state;
if(ext_clock_value != (bool)state) {
ext_clock_value = (bool)state;
if(clock_state) {
switch(clock_mode) {
case CLKM_EXTERNAL_ASYNC:

4
src/emu/cpu/h8/h8_sci.h
View File

@ -146,8 +146,8 @@ protected:
int eri_int, rxi_int, txi_int, tei_int;
int tx_state, rx_state, tx_bit, rx_bit, clock_state, clock_mode, tx_parity, rx_parity, ext_clock_counter;
bool clock_value, ext_clock_value, rx_value;
int tx_state, rx_state, tx_bit, rx_bit, clock_state, clock_mode, tx_parity, ext_clock_counter;
bool clock_value, ext_clock_value, rx_value, rx_parity;
UINT8 rdr, tdr, smr, scr, ssr, brr, rsr, tsr;
UINT64 clock_base, divider;

2
src/emu/cpu/h8/h8_timer16.c
View File

@ -289,7 +289,7 @@ void h8_timer16_channel_device::recalc_event(UINT64 cur_time)
event_delay = new_delay;
}
if(event_delay != 0xffffffff)
event_time = ((((cur_time + (1 << clock_divider) - phase) >> clock_divider) + event_delay - 1) << clock_divider) + phase;
event_time = ((((cur_time + (1ULL << clock_divider) - phase) >> clock_divider) + event_delay - 1) << clock_divider) + phase;
else
event_time = 0;

6
src/emu/debug/debugcmd.c
View File

@ -2149,7 +2149,7 @@ static void execute_cheatnext(running_machine &machine, int ref, int params, con
cheat.undo++;
/* execute the search */
for (cheatindex = 0; cheatindex < cheat.cheatmap.count(); cheatindex += 1)
for (cheatindex = 0; cheatindex < (UINT64)cheat.cheatmap.count(); cheatindex += 1)
if (cheat.cheatmap[cheatindex].state == 1)
{
UINT64 cheat_value = cheat_read_extended(&cheat, *space, cheat.cheatmap[cheatindex].offset);
@ -2294,7 +2294,7 @@ static void execute_cheatlist(running_machine &machine, int ref, int params, con
}
/* write the cheat list */
for (cheatindex = 0; cheatindex < cheat.cheatmap.count(); cheatindex += 1)
for (cheatindex = 0; cheatindex < (UINT64)cheat.cheatmap.count(); cheatindex += 1)
{
if (cheat.cheatmap[cheatindex].state == 1)
{
@ -2330,7 +2330,7 @@ static void execute_cheatundo(running_machine &machine, int ref, int params, con
if (cheat.undo > 0)
{
for (cheatindex = 0; cheatindex < cheat.cheatmap.count(); cheatindex += 1)
for (cheatindex = 0; cheatindex < (UINT64)cheat.cheatmap.count(); cheatindex += 1)
{
if (cheat.cheatmap[cheatindex].undo == cheat.undo)
{

3
src/emu/render.h
View File

@ -162,7 +162,6 @@ class render_font;
struct object_transform;
class layout_element;
class layout_view;
class layout_file;
// texture scaling callback
@ -580,6 +579,8 @@ private:
};
#include "rendlay.h"
// ======================> render_target
// a render_target describes a surface that is being rendered to

10
src/emu/rendlay.c
View File

@ -2146,6 +2146,16 @@ layout_view::item::~item()
}
//-------------------------------------------------
// screen_container - retrieve screen container
//-------------------------------------------------
render_container *layout_view::item::screen_container(running_machine &machine) const
{
return (m_screen != NULL) ? &m_screen->container() : NULL;
}
//-------------------------------------------------
// state - fetch state based on configured source
//-------------------------------------------------

2
src/emu/rendlay.h
View File

@ -203,7 +203,7 @@ public:
const render_bounds &bounds() const { return m_bounds; }
const render_color &color() const { return m_color; }
int orientation() const { return m_orientation; }
render_container *screen_container(running_machine &machine) const { return (m_screen != NULL) ? &m_screen->container() : NULL; }
render_container *screen_container(running_machine &machine) const;
bool has_input() const { return bool(m_input_tag); }
const char *input_tag_and_mask(ioport_value &mask) const { mask = m_input_mask; return m_input_tag; }

2
src/lib/formats/ccvf_dsk.c
View File

@ -115,7 +115,7 @@ bool ccvf_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
start = end + 1;
} while (start > 0 && end != -1);
int pos = 0;
UINT64 pos = 0;
int total_size = 200000000/f.cell_size;
for(int track=0; track < f.track_count; track++) {

2
src/mame/machine/namco_settings.h
View File

@ -22,7 +22,7 @@ protected:
virtual void device_reset();
private:
bool ce, clk, data;
int ce, clk, data;
int cur_bit;
UINT8 adr, value;
};

4
src/mess/drivers/ymmu100.c
View File

@ -224,7 +224,7 @@ float mu100_state::lightlevel(const UINT8 *src, const UINT8 *render)
int adr = (slot >> 3);
if(render[adr] & (1 << bit))
return 1-(1-(255-l)/255.0)*contrast;
return 0.95;
return 0.95f;
}
UINT32 mu100_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
@ -249,7 +249,7 @@ UINT32 mu100_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, c
int x = 830 + 40*(i & 1);
int y = 55 + 65*(i >> 1);
for(int yy=-9; yy <= 9; yy++) {
int dx = int(sqrt(99-yy*yy));
int dx = int(sqrt((float)(99-yy*yy)));
UINT32 *pix = reinterpret_cast<UINT32 *>(bitmap.raw_pixptr(y+yy)) + (x-dx);
for(int xx=0; xx<2*dx+1; xx++)
*pix++ = 0x00ff00;

2
src/osd/windows/vconv.c
View File

@ -68,7 +68,7 @@ static const translation_info gcc_translate[] =
{ 0, "-fomit-frame-pointer", "" },
{ 0, "-Werror", "/WX" },
//{ VS7, "-Wall", "/Wall /W3 /wd4003 /wd4018 /wd4146 /wd4242 /wd4244 /wd4619 /wd4702 /wd4706 /wd4710 /wd4711 /wd4738 /wd4826" },
{ VS7, "-Wall", "/Wall /W4 /wd4003 /wd4018 /wd4146 /wd4242 /wd4244 /wd4619 /wd4702 /wd4706 /wd4710 /wd4711 /wd4738 /wd4826 /wd4820 /wd4514 /wd4668 /wd4127 /wd4625 /wd4626 /wd4512 /wd4100 /wd4310 /wd4571 /wd4061 /wd4131 /wd4255 /wd4510 /wd4610 /wd4505 /wd4324 /wd4611 /wd4201 /wd4189 /wd4296 /wd4986 /wd4347 /wd4987 /wd4250 /wd4435" },
{ VS7, "-Wall", "/Wall /W4 /wd4003 /wd4018 /wd4146 /wd4242 /wd4244 /wd4619 /wd4702 /wd4706 /wd4710 /wd4711 /wd4738 /wd4826 /wd4820 /wd4514 /wd4668 /wd4127 /wd4625 /wd4626 /wd4512 /wd4100 /wd4310 /wd4571 /wd4061 /wd4131 /wd4255 /wd4510 /wd4610 /wd4505 /wd4324 /wd4611 /wd4201 /wd4189 /wd4296 /wd4986 /wd4347 /wd4987 /wd4250 /wd4435 /wd4150" },
{ 0, "-Wall", "/W0" },
{ VS7, "-Wno-unused", "/wd4100 /wd4101 /wd4102 /wd4505" },
{ 0, "-Wno-sign-compare", "/wd4365 /wd4389 /wd4245" },