Core_Timing: Address Feedback and suppress warnings.

This commit is contained in:
Fernando Sahmkow 2019-10-11 14:44:14 -04:00
parent 96f2b16356
commit e0650a2034
5 changed files with 12 additions and 13 deletions

View File

@ -116,7 +116,7 @@ public:
num_interpreted_instructions = 0; num_interpreted_instructions = 0;
} }
u64 GetTicksRemaining() override { u64 GetTicksRemaining() override {
return std::max<s64>(parent.system.CoreTiming().GetDowncount(), 0LL); return std::max(parent.system.CoreTiming().GetDowncount(), s64{0});
} }
u64 GetCNTPCT() override { u64 GetCNTPCT() override {
return Timing::CpuCyclesToClockCycles(parent.system.CoreTiming().GetTicks()); return Timing::CpuCyclesToClockCycles(parent.system.CoreTiming().GetTicks());

View File

@ -156,7 +156,7 @@ void ARM_Unicorn::Run() {
if (GDBStub::IsServerEnabled()) { if (GDBStub::IsServerEnabled()) {
ExecuteInstructions(std::max(4000000, 0)); ExecuteInstructions(std::max(4000000, 0));
} else { } else {
ExecuteInstructions(std::max<s64>(system.CoreTiming().GetDowncount(), 0LL)); ExecuteInstructions(std::max(system.CoreTiming().GetDowncount(), s64{0}));
} }
} }

View File

@ -38,10 +38,8 @@ CoreTiming::CoreTiming() = default;
CoreTiming::~CoreTiming() = default; CoreTiming::~CoreTiming() = default;
void CoreTiming::Initialize() { void CoreTiming::Initialize() {
for (std::size_t core = 0; core < num_cpu_cores; core++) { downcounts.fill(MAX_SLICE_LENGTH);
downcounts[core] = MAX_SLICE_LENGTH; time_slice.fill(MAX_SLICE_LENGTH);
time_slice[core] = MAX_SLICE_LENGTH;
}
slice_length = MAX_SLICE_LENGTH; slice_length = MAX_SLICE_LENGTH;
global_timer = 0; global_timer = 0;
idled_cycles = 0; idled_cycles = 0;
@ -162,17 +160,17 @@ std::optional<u64> CoreTiming::NextAvailableCore(const s64 needed_ticks) const {
if (time_slice[next_context] >= needed_ticks) { if (time_slice[next_context] >= needed_ticks) {
return {next_context}; return {next_context};
} else if (time_slice[next_context] >= 0) { } else if (time_slice[next_context] >= 0) {
return {}; return std::nullopt;
} }
next_context = (next_context + 1) % num_cpu_cores; next_context = (next_context + 1) % num_cpu_cores;
} }
return {}; return std::nullopt;
} }
void CoreTiming::Advance() { void CoreTiming::Advance() {
std::unique_lock<std::mutex> guard(inner_mutex); std::unique_lock<std::mutex> guard(inner_mutex);
const int cycles_executed = accumulated_ticks; const u64 cycles_executed = accumulated_ticks;
time_slice[current_context] = std::max<s64>(0, time_slice[current_context] - accumulated_ticks); time_slice[current_context] = std::max<s64>(0, time_slice[current_context] - accumulated_ticks);
global_timer += cycles_executed; global_timer += cycles_executed;
@ -191,7 +189,8 @@ void CoreTiming::Advance() {
// Still events left (scheduled in the future) // Still events left (scheduled in the future)
if (!event_queue.empty()) { if (!event_queue.empty()) {
s64 needed_ticks = std::min<s64>(event_queue.front().time - global_timer, MAX_SLICE_LENGTH); const s64 needed_ticks =
std::min<s64>(event_queue.front().time - global_timer, MAX_SLICE_LENGTH);
const auto next_core = NextAvailableCore(needed_ticks); const auto next_core = NextAvailableCore(needed_ticks);
if (next_core) { if (next_core) {
downcounts[*next_core] = needed_ticks; downcounts[*next_core] = needed_ticks;

View File

@ -113,7 +113,7 @@ public:
current_context = new_context; current_context = new_context;
} }
bool CurrentContextCanRun() const { bool CanCurrentContextRun() const {
return time_slice[current_context] > 0; return time_slice[current_context] > 0;
} }

View File

@ -130,10 +130,10 @@ void CpuCoreManager::RunLoop(bool tight_loop) {
keep_running = false; keep_running = false;
for (active_core = 0; active_core < NUM_CPU_CORES; ++active_core) { for (active_core = 0; active_core < NUM_CPU_CORES; ++active_core) {
core_timing.SwitchContext(active_core); core_timing.SwitchContext(active_core);
if (core_timing.CurrentContextCanRun()) { if (core_timing.CanCurrentContextRun()) {
cores[active_core]->RunLoop(tight_loop); cores[active_core]->RunLoop(tight_loop);
} }
keep_running |= core_timing.CurrentContextCanRun(); keep_running |= core_timing.CanCurrentContextRun();
} }
} while (keep_running); } while (keep_running);