Merge branch 'linuxfix' of https://github.com/sephiroth99/xenia into sephiroth99-linuxfix

This commit is contained in:
Ben Vanik
2015-12-31 14:39:23 -08:00
16 changed files with 124 additions and 64 deletions

View File

@@ -206,6 +206,9 @@ void Value::Convert(TypeName target_type, RoundMode round_mode) {
type = target_type;
constant.f64 = constant.f32;
return;
default:
assert_unhandled_case(target_type);
return;
}
case FLOAT64_TYPE:
switch (target_type) {
@@ -213,9 +216,12 @@ void Value::Convert(TypeName target_type, RoundMode round_mode) {
type = target_type;
constant.f32 = (float)constant.f64;
return;
default:
assert_unhandled_case(target_type);
return;
}
default:
assert_unhandled_case(target_type);
assert_unhandled_case(type);
return;
}
}

View File

@@ -338,7 +338,7 @@ uint64_t Processor::Execute(ThreadState* thread_state, uint32_t address,
SCOPE_profile_cpu_f("cpu");
auto context = thread_state->context();
for (size_t i = 0; i < std::min(arg_count, 8ull); ++i) {
for (size_t i = 0; i < std::min(arg_count, static_cast<size_t>(8)); ++i) {
context->r[3 + i] = args[i];
}