jaby/jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Support HighResolutionTimer in a better fashion

Browse Source
This commit is contained in:
Jaby
2023-01-10 20:36:28 +01:00
parent 2b34d105c8
commit 3bd3a57801
8 changed files with 152 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Library/src/BootLoader/start_boot.cpp
View File

@@ -1,7 +1,7 @@
#include "BootLoader/boot_loader.hpp"
#include <PSX/System/IOPorts/dMa_io.hpp>
#include <PSX/Timer/timer.hpp>
#include <PSX/Timer/high_res_timer.hpp>
#include <stdio.h>
namespace JabyEngine {
@@ -16,11 +16,11 @@ namespace JabyEngine {
SPU::stop_voices();
Timer::setup();
const auto start = GlobalTime::get_time_stamp();
const auto start = HighResTime::get_time_stamp();
printf("Start...\n");
GPU::setup();
GPU::display_logo();
const auto end = GlobalTime::get_time_stamp();
const auto end = HighResTime::get_time_stamp();
printf("GPU setup took %ims %ius\n", start.milliseconds_to(end), start.microseconds_to(end));
//Pause??

72
src/Library/src/BootLoader/timer_boot.cpp
View File

@@ -1,51 +1,37 @@
#include <PSX/System/IOPorts/interrupt_io.hpp>
#include <PSX/System/IOPorts/timer_io.hpp>
#include <PSX/System/syscalls.h>
#include <PSX/jabyengine_config.hpp>
#ifdef JABYENGINE_USE_HIGH_PERCISION_TIMER
#include <PSX/System/IOPorts/interrupt_io.hpp>
#include <PSX/System/syscalls.h>
#define private public
#include <PSX/Timer/high_res_timer.hpp>
#undef private
#include <GPU/gpu.hpp>
#include <stdio.h>
namespace JabyEngine {
namespace Timer {
extern InterrupCallback IRQCallback;
void setup() {
using namespace Timer_IO;
namespace JabyEngine {
namespace Timer {
extern InterrupCallback IRQCallback;
static constexpr auto Mode = CounterMode::with(CounterMode::FreeRun, Counter2::SyncMode::Freerun, CounterMode::ResetAfterTarget, CounterMode::IRQAtTarget, CounterMode::IRQEveryTime, CounterMode::IRQPulse, Counter2::Source::System_Clock_Div_8);
static constexpr double CPU_Frequency_Hz = 33868800.0;
static constexpr double CPU_Frequency_Hz_Div8 = (CPU_Frequency_Hz/8.0);
Interrupt::disable_irq(Interrupt::Timer2);
template<typename T>
static constexpr T NS_Per_Tick(double CPU_Frequency_Hz, double time = 1.0) {
return static_cast<T>((time/CPU_Frequency_Hz)*1000.0*1000.0*1000.0);
}
__syscall_EnterCriticalSection();
__syscall_SysEnqIntRP(Timer2Irq, &IRQCallback);
__syscall_ExitCriticalSection();
template<typename T>
static constexpr T US_Per_Tick(double CPU_Frequency_Hz, double time = 1.0) {
return static_cast<T>(((time*1000.0)/NS_Per_Tick<double>(CPU_Frequency_Hz)));
}
Counter2.target.write(CounterTarget::CounterTargetValue.with(HighResTime::TicksFor10ms));
Counter2.mode.write(Mode);
template<typename T>
static constexpr T MS_Per_Tick(double CPU_Frequency_Hz, double time = 1.0) {
return static_cast<T>(((time*1000.0*1000.0)/NS_Per_Tick<double>(CPU_Frequency_Hz)));
}
void setup() {
using namespace Timer_IO;
static constexpr auto Mode = CounterMode::with(CounterMode::FreeRun, Counter2::SyncMode::Freerun, CounterMode::ResetAfterTarget, CounterMode::IRQAtTarget, CounterMode::IRQEveryTime, CounterMode::IRQPulse, Counter2::Source::System_Clock_Div_8);
#ifdef JABYENGINE_USE_HIGH_PERCISION_TIMER
static constexpr uint16_t Target = US_Per_Tick<uint16_t>(CPU_Frequency_Hz, 100.0);
#else
static constexpr uint16_t Target = MS_Per_Tick<uint16_t>(CPU_Frequency_Hz_Div8, 10.0);
#endif //#ifdef JABYENGINE_USE_HIGH_PERCISION_TIMER
Interrupt::disable_irq(Interrupt::Timer2);
__syscall_EnterCriticalSection();
__syscall_SysEnqIntRP(Timer2Irq, &IRQCallback);
__syscall_ExitCriticalSection();
Counter2.target.write(CounterTarget::CounterTargetValue.with(Target));
Counter2.mode.write(Mode);
Interrupt::enable_irq(Interrupt::Timer2);
Interrupt::enable_irq(Interrupt::Timer2);
}
}
}
}
#else
namespace JabyEngine {
namespace Timer {
void setup() {
}
}
}
#endif //JABYENGINE_USE_HIGH_PERCISION_TIMER

38
src/Library/src/Timer/high_res_timer.cpp Normal file
View File

@@ -0,0 +1,38 @@
#include <PSX/jabyengine_config.hpp>
#ifdef JABYENGINE_USE_HIGH_PERCISION_TIMER
#define private public
#include <PSX/System/IOPorts/interrupt_io.hpp>
#include <PSX/System/IOPorts/timer_io.hpp>
#include <PSX/System/syscalls.h>
#include <PSX/Timer/high_res_timer.hpp>
#undef private
namespace JabyEngine {
volatile uint16_t HighResTime :: global_counter_10ms = 0;
namespace Timer {
static InterruptVerifierResult interrupt_verifier() {
if(Interrupt::is_irq(Interrupt::Timer2)) {
return InterruptVerifierResult::ExecuteHandler;
}
else {
return InterruptVerifierResult::SkipHandler;
}
}
static void interrupt_handler(uint32_t) {
HighResTime::global_counter_10ms = HighResTime::global_counter_10ms + 1;
Interrupt::ack_irq(Interrupt::Timer2);
__syscall_ReturnFromException();
}
InterrupCallback IRQCallback = {
.next = nullptr,
.handler_function = reinterpret_cast<InterruptHandler>(interrupt_handler),
.verifier_function = interrupt_verifier
};
}
}
#endif //JABYENGINE_USE_HIGH_PERCISION_TIMER

35
src/Library/src/Timer/timer.cpp
View File

@@ -1,35 +0,0 @@
#define private public
#include <PSX/System/IOPorts/interrupt_io.hpp>
#include <PSX/System/IOPorts/timer_io.hpp>
#include <PSX/System/syscalls.h>
#include <PSX/Timer/timer.hpp>
#undef private
namespace JabyEngine {
volatile size_t GlobalTime :: global_counter = 0;
namespace Timer {
static InterruptVerifierResult interrupt_verifier() {
if(Interrupt::is_irq(Interrupt::Timer2)) {
return InterruptVerifierResult::ExecuteHandler;
}
else {
return InterruptVerifierResult::SkipHandler;
}
}
static void interrupt_handler(uint32_t) {
GlobalTime::global_counter = GlobalTime::global_counter + 1;
Interrupt::ack_irq(Interrupt::Timer2);
__syscall_ReturnFromException();
}
InterrupCallback IRQCallback = {
.next = nullptr,
.handler_function = reinterpret_cast<InterruptHandler>(interrupt_handler),
.verifier_function = interrupt_verifier
};
}
}

2
src/Library/src/startup.cpp
View File

@@ -1,8 +1,6 @@
#include "../include/BootLoader/boot_loader.hpp"
#include <stdio.h>
#include <PSX/Timer/timer.hpp>
namespace JabyEngine {
static NextRoutine execute(NextRoutine routine) {
// Support currently only direct call