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

VS2008 compiling fix [Miodrag Milanovic] (no whatsnew)

Browse Source
This commit is contained in:
Miodrag Milanovic 2010-02-18 18:33:18 +00:00
parent 3c2f551e34
commit c9885fe958
5 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/emu/cpu/mn10200/mn10200.c
View File

@ -171,8 +171,9 @@ INLINE INT32 r24u(mn102_info *mn102, offs_t adr)
INLINE void w24(mn102_info *mn102, offs_t adr, UINT32 val)
{
if(adr == 0x4075aa || adr == 0x40689a || adr == 0x4075a2)
log_write("TRACE", adr, val, MEM_LONG);
if(adr == 0x4075aa || adr == 0x40689a || adr == 0x4075a2) {
log_write("TRACE", adr, val, MEM_LONG);
}
mn102_write_byte(mn102, adr, val);
mn102_write_byte(mn102, adr+1, val>>8);
mn102_write_byte(mn102, adr+2, val>>16);
@ -332,13 +333,15 @@ void mn102_force_irq(mn102_info *mn102, int level, int group, int entry)
{
if(!(mn102->psw & 0x800))
{
if(group != 1 || entry != 3)
if(group != 1 || entry != 3){
log_event("MN102", "Dropping irq %d %d %d, pc=%x, a3=%x", level, group, entry, mn102->pc, mn102->a[3]);
}
return;
}
if(group != 1 || entry != 3)
if(group != 1 || entry != 3) {
log_event("MN102", "Taking irq %d %d %d, pc=%x, a3=%x", level, group, entry, mn102->pc, mn102->a[3]);
}
mn102->a[3] -= 6;
w24(mn102, mn102->a[3]+2, mn102->pc);
mn102_write_word(mn102, mn102->a[3], mn102->psw);
@ -1685,8 +1688,9 @@ static void mn10200_w(mn102_info *mn102, UINT32 adr, UINT32 data, int type)
switch(adr) {
case 0x000:
if(data & 12)
if(data & 12) {
log_event("CPU", "Stop request");
}
break;
case 0x001:
log_event("WATCHDOG", "Write %d", data>>7);
@ -1717,15 +1721,16 @@ static void mn10200_w(mn102_info *mn102, UINT32 adr, UINT32 data, int type)
case 0x043: case 0x045: case 0x047: case 0x049: case 0x04b:
case 0x04d: case 0x04f: case 0x051: case 0x053: case 0x055: {
int irq = ((adr & 0x3f)>>1)-1;
if((mn102->icrh[irq] != data) && (data & 15))
if((mn102->icrh[irq] != data) && (data & 15)) {
log_event("MN102", "irq %d enabled, level=%x, enable= %s %s %s %s", irq+1, (data >> 4) & 7,
data & 1 ? inames[irq][0] : "-",
data & 2 ? inames[irq][1] : "-",
data & 4 ? inames[irq][2] : "-",
data & 8 ? inames[irq][3] : "-");
if((mn102->icrh[irq] != data) && !(data & 15))
}
if((mn102->icrh[irq] != data) && !(data & 15)) {
log_event("MN102", "irq %d disabled", irq+1);
}
mn102->icrh[irq] = data;
break;
}

2
src/emu/debugint/debugint.c
View File

@ -1137,7 +1137,7 @@ static void render_editor(DView_edit *editor)
x1 = 0.5f - 0.5f * maxwidth;
x2 = x1 + maxwidth;
y1 = 0.25;
y2 = 0.45 - UI_BOX_TB_BORDER;
y2 = 0.45f - UI_BOX_TB_BORDER;
/* draw a box */
ui_draw_outlined_box(editor->container, x1, y1, x2, y2, UI_BACKGROUND_COLOR);

6
src/emu/mconfig.c
View File

@ -12,12 +12,6 @@
#include "emu.h"
#include <ctype.h>
#if defined(_MSC_VER)
#pragma optimize ("", off)
#endif
/***************************************************************************
FUNCTION PROTOTYPES
***************************************************************************/

2
src/emu/render.c
View File

@ -1650,7 +1650,7 @@ const render_primitive_list *render_target_get_primitives(render_target *target)
ui_xform.xscale = (float) target->width;
ui_xform.yscale = (float) target->height;
ui_xform.color.r = ui_xform.color.g = ui_xform.color.b = ui_xform.color.a = 1.0f;
ui_xform.color.a = 0.9;
ui_xform.color.a = 0.9f;
ui_xform.orientation = target->orientation;
ui_xform.no_center = TRUE;

2
src/emu/state.c
View File

@ -181,7 +181,9 @@ void state_init(running_machine *machine)
float test_float;
double test_double;
test_enum_type test_enum;
#ifdef __GNUC__
test_class_type test_class;
#endif
assert_always(IS_VALID_SAVE_TYPE(test_bool), "bool is not a valid type for save");
assert_always(IS_VALID_SAVE_TYPE(test_INT8), "INT8 is not a valid type for save");