Skip to content

Mirror DolRecomp's cycle_budget, and bump the CPU ABI to 4 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dougchansan wants to merge 1 commit into
base: moderngekko-vendor
Choose a base branch
from
Open

Mirror DolRecomp's cycle_budget, and bump the CPU ABI to 4 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion GXRuntime/include/core/cpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ extern "C" {
// consumes and resets it (Dolphin chassis: per-dispatch flush into
// ppc_state.downcount). Hosts that do not meter guest time may ignore it
// (s64: it cannot wrap in any realistic session).
#define GXRUNTIME_CPU_ABI_VERSION 3u
// - ABI v4 adds `cycle_budget` directly after `downcount`, mirroring the
// field DolRecomp added to its generated-code CPUState in f0a86be. The
// prefix is shared with generated code, so the field must sit at the same
// offset on both sides; hosts that do not meter guest time may ignore it.
#define GXRUNTIME_CPU_ABI_VERSION 4u
#define GXRUNTIME_CPU_ABI_DOLRECOMP_PREFIX 1u
#define GXRUNTIME_CPU_ABI_EXTERNAL_POINTER_EXTENSION 1u

Expand Down Expand Up @@ -153,6 +157,7 @@ struct CPUState {
u32 ram_size;
PPCExternalPointer external_pointer;
s64 downcount;
s64 cycle_budget;
u8* exram;
u32 exram_size;
PPCSPRRead spr_read;
Expand Down
6 changes: 5 additions & 1 deletion GXRuntime/tests/runtime_tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <stdio.h>
#include <string.h>

_Static_assert(GXRUNTIME_CPU_ABI_VERSION == 3u,
_Static_assert(GXRUNTIME_CPU_ABI_VERSION == 4u,
"update runtime ABI tests when the CPU ABI changes");
_Static_assert(GXRUNTIME_CPU_ABI_DOLRECOMP_PREFIX == 1u,
"GXRuntime generated-code prefix must stay explicit");
Expand All @@ -49,6 +49,10 @@ _Static_assert(offsetof(CPUState, downcount) > offsetof(CPUState, external_point
"ABI v2 downcount must remain the tail field");
_Static_assert(sizeof(((CPUState*)0)->downcount) == 8u,
"downcount is s64 so unconsumed charges cannot wrap");
_Static_assert(offsetof(CPUState, cycle_budget) > offsetof(CPUState, downcount),
"ABI v4 cycle_budget must follow downcount");
_Static_assert(sizeof(((CPUState*)0)->cycle_budget) == 8u,
"cycle_budget is s64 to match DolRecomp's generated-code prefix");
_Static_assert(offsetof(CPUState, spr_read) > offsetof(CPUState, exram_size),
"ABI v3 callbacks must remain tail fields");
_Static_assert(offsetof(CPUState, cache_control) > offsetof(CPUState, spr_write),
Expand Down