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

Remove some cases of visual studio warnings 4805 4389 4065 (nw)

Browse Source
This commit is contained in:
yz70s 2019-12-16 22:51:02 +01:00
parent 3026c35a23
commit 8b908f306b
2 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/devices/cpu/i386/cpuidmsrs.hxx
View File

@ -158,23 +158,13 @@ void pentium_pro_device::opcode_wrmsr(uint64_t data, bool &valid_msr)
uint64_t pentium4_device::opcode_rdmsr(bool &valid_msr) uint64_t pentium4_device::opcode_rdmsr(bool &valid_msr)
{ {
switch (REG32(ECX)) logerror("RDMSR: unimplemented register called %08x at %08x\n", REG32(ECX), m_pc - 2);
{ valid_msr = true;
default: return 0;
logerror("RDMSR: unimplemented register called %08x at %08x\n", REG32(ECX), m_pc - 2);
valid_msr = true;
return 0;
}
return -1;
} }
void pentium4_device::opcode_wrmsr(uint64_t data, bool &valid_msr) void pentium4_device::opcode_wrmsr(uint64_t data, bool &valid_msr)
{ {
switch (REG32(ECX)) logerror("WRMSR: unimplemented register called %08x (%08x%08x) at %08x\n", REG32(ECX), (uint32_t)(data >> 32), (uint32_t)data, m_pc - 2);
{ valid_msr = true;
default:
logerror("WRMSR: unimplemented register called %08x (%08x%08x) at %08x\n", REG32(ECX), (uint32_t)(data >> 32), (uint32_t)data, m_pc - 2);
valid_msr = true;
break;
}
} }

20
src/mame/video/xbox_nv2a.cpp
View File

@ -1331,11 +1331,13 @@ void nv2a_renderer::write_pixel(int x, int y, uint32_t color, int depth)
uint32_t deptsten; uint32_t deptsten;
int32_t c[4], fb[4], s[4], d[4], cc[4]; int32_t c[4], fb[4], s[4], d[4], cc[4];
uint32_t dep, sten, stenc, stenv; uint32_t dep, sten, stenc, stenv;
uint32_t udepth;
bool stencil_passed; bool stencil_passed;
bool depth_passed; bool depth_passed;
if ((depth > 0xffffff) || (depth < 0) || (x < 0)) if ((depth > 0xffffff) || (depth < 0) || (x < 0))
return; return;
udepth = (uint32_t)depth;
fb[3] = fb[2] = fb[1] = fb[0] = 0; fb[3] = fb[2] = fb[1] = fb[0] = 0;
addr = nullptr; addr = nullptr;
if (color_mask != 0) if (color_mask != 0)
@ -1508,27 +1510,27 @@ void nv2a_renderer::write_pixel(int x, int y, uint32_t color, int depth)
depth_passed = false; depth_passed = false;
break; break;
case NV2A_COMPARISON_OP::LESS: case NV2A_COMPARISON_OP::LESS:
if (depth >= dep) if (udepth >= dep)
depth_passed = false; depth_passed = false;
break; break;
case NV2A_COMPARISON_OP::EQUAL: case NV2A_COMPARISON_OP::EQUAL:
if (depth != dep) if (udepth != dep)
depth_passed = false; depth_passed = false;
break; break;
case NV2A_COMPARISON_OP::LEQUAL: case NV2A_COMPARISON_OP::LEQUAL:
if (depth > dep) if (udepth > dep)
depth_passed = false; depth_passed = false;
break; break;
case NV2A_COMPARISON_OP::GREATER: case NV2A_COMPARISON_OP::GREATER:
if (depth <= dep) if (udepth <= dep)
depth_passed = false; depth_passed = false;
break; break;
case NV2A_COMPARISON_OP::NOTEQUAL: case NV2A_COMPARISON_OP::NOTEQUAL:
if (depth == dep) if (udepth == dep)
depth_passed = false; depth_passed = false;
break; break;
case NV2A_COMPARISON_OP::GEQUAL: case NV2A_COMPARISON_OP::GEQUAL:
if (depth < dep) if (udepth < dep)
depth_passed = false; depth_passed = false;
break; break;
case NV2A_COMPARISON_OP::ALWAYS: case NV2A_COMPARISON_OP::ALWAYS:
@ -1925,7 +1927,7 @@ void nv2a_renderer::write_pixel(int x, int y, uint32_t color, int depth)
} }
} }
if (depth_write_enabled) if (depth_write_enabled)
dep = depth; dep = udepth;
if (depthformat_rendertarget == NV2A_RT_DEPTH_FORMAT::Z24S8) { if (depthformat_rendertarget == NV2A_RT_DEPTH_FORMAT::Z24S8) {
deptsten = (dep << 8) | sten; deptsten = (dep << 8) | sten;
*daddr32 = deptsten; *daddr32 = deptsten;
@ -4491,11 +4493,11 @@ WRITE_LINE_MEMBER(nv2a_renderer::vblank_callback)
#ifdef LOG_NV2A #ifdef LOG_NV2A
printf("vblank_callback\n\r"); printf("vblank_callback\n\r");
#endif #endif
if ((state == true) && (puller_waiting == 1)) { if ((state != 0) && (puller_waiting == 1)) {
puller_waiting = 0; puller_waiting = 0;
puller_timer_work(nullptr, 0); puller_timer_work(nullptr, 0);
} }
if (state == true) { if (state != 0) {
pcrtc[0x100 / 4] |= 1; pcrtc[0x100 / 4] |= 1;
pcrtc[0x808 / 4] |= 0x10000; pcrtc[0x808 / 4] |= 0x10000;
} }