From 86a8e0716fb02823dd99ac524b6580a424cefb1f Mon Sep 17 00:00:00 2001
From: Nekotekina <nekotekina@gmail.com>
Date: Sun, 25 Apr 2021 18:55:29 +0300
Subject: [PATCH] Test alterable aggregates via overriding be_t

Checking how it might look like without introducing too many changes.
Alteration of its behaviour as a "template template" argument allows:
 - normal access
 - easier aggregate inspection
 - memory access interception
---
 rpcs3/Emu/Cell/Modules/cellSail.cpp | 2 ++
 rpcs3/Emu/Cell/Modules/cellSail.h   | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/rpcs3/Emu/Cell/Modules/cellSail.cpp b/rpcs3/Emu/Cell/Modules/cellSail.cpp
index da3c7c6da5..3fd558beb6 100644
--- a/rpcs3/Emu/Cell/Modules/cellSail.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellSail.cpp
@@ -1065,6 +1065,8 @@ DECLARE(ppu_module_manager::cellSail)("cellSail", []()
 {
 	static ppu_static_module cellSailAvi("cellSailAvi");
 
+	[[maybe_unused]] vm::ptr<CellSailMp4MovieInfo<>> test;
+
 	REG_FUNC(cellSail, cellSailMemAllocatorInitialize);
 
 	REG_FUNC(cellSail, cellSailFutureInitialize);
diff --git a/rpcs3/Emu/Cell/Modules/cellSail.h b/rpcs3/Emu/Cell/Modules/cellSail.h
index 054f10dcf3..7cad924f6a 100644
--- a/rpcs3/Emu/Cell/Modules/cellSail.h
+++ b/rpcs3/Emu/Cell/Modules/cellSail.h
@@ -933,9 +933,10 @@ struct CellSailSourceCheckResource
 	CellSailSourceCheckStream runningError;
 };
 
+template <template <class T, usz A = alignof(T)> class be_t = ::be_t>
 struct CellSailMp4DateTime
 {
-	be_t<u16> second;
+	be_t<u16, 2> second;
 	be_t<u16> minute;
 	be_t<u16> hour;
 	be_t<u16> day;
@@ -950,10 +951,11 @@ struct CellSailMp4Movie
 	be_t<u64> internalData[16];
 };
 
+template <template <class T, usz A = alignof(T)> class be_t = ::be_t>
 struct CellSailMp4MovieInfo
 {
-	CellSailMp4DateTime creationDateTime;
-	CellSailMp4DateTime modificationDateTime;
+	CellSailMp4DateTime<be_t> creationDateTime;
+	CellSailMp4DateTime<be_t> modificationDateTime;
 	be_t<u32> trackCount;
 	be_t<u32> movieTimeScale;
 	be_t<u32> movieDuration;