ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing more warnings.

This commit is contained in:
Ben Vanik 2013-05-21 16:19:11 -07:00
parent 720651ba9e
commit a064e68621
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common.gypi
View File

@ -30,6 +30,9 @@
'defines': [ 'defines': [
'_WIN64=1', '_WIN64=1',
'_AMD64_=1', '_AMD64_=1',
# HACK: it'd be nice to use the proper functions, when available.
'_CRT_SECURE_NO_WARNINGS=1',
], ],
}], }],
], ],
@ -63,7 +66,7 @@
'ExceptionHandling': '1', # /EHsc 'ExceptionHandling': '1', # /EHsc
'AdditionalOptions': [ 'AdditionalOptions': [
'/MP', # Multiprocessor build '/MP', # Multiprocessor build
'/TP', # Compile as C++ #'/TP', # Compile as C++
'/EHsc', # C++ exception handling, '/EHsc', # C++ exception handling,
], ],
}, },

6
src/xenia/cpu/global_exports.cc
View File

@ -43,8 +43,8 @@ void _cdecl XeInvalidInstruction(
xe_ppc_state_t* state, uint64_t cia, uint64_t data, xe_ppc_state_t* state, uint64_t cia, uint64_t data,
void* unused) { void* unused) {
ppc::InstrData i; ppc::InstrData i;
i.address = cia; i.address = (uint32_t)cia;
i.code = data; i.code = (uint32_t)data;
i.type = ppc::GetInstrType(i.code); i.type = ppc::GetInstrType(i.code);
if (!i.type) { if (!i.type) {
@ -89,7 +89,7 @@ void _cdecl XeTraceUserCall(
void _cdecl XeTraceInstruction( void _cdecl XeTraceInstruction(
xe_ppc_state_t* state, uint64_t cia, uint64_t data, xe_ppc_state_t* state, uint64_t cia, uint64_t data,
void* unused) { void* unused) {
ppc::InstrType* type = ppc::GetInstrType(data); ppc::InstrType* type = ppc::GetInstrType((uint32_t)data);
XELOGCPU("TRACE: %.8X %.8X %s %s", XELOGCPU("TRACE: %.8X %.8X %s %s",
cia, data, cia, data,
type && type->emit ? " " : "X", type && type->emit ? " " : "X",