From 150a872f2cdbd73b0273b5e7915d923149118e37 Mon Sep 17 00:00:00 2001 From: Marco Satti Date: Wed, 8 Aug 2018 23:14:09 +0800 Subject: [PATCH] Add in missing cereal includes. --- .../src/Common/Types/FifoQueue/DmaFifoQueue.hpp | 2 ++ liborbum/src/Common/Types/Mips/BranchDelaySlot.hpp | 2 ++ liborbum/src/Common/Types/Primitive.hpp | 2 ++ .../src/Common/Types/Register/SizedByteRegister.hpp | 2 ++ .../Common/Types/Register/SizedDwordRegister.hpp | 2 ++ .../Common/Types/Register/SizedHwordRegister.hpp | 3 +++ .../Common/Types/Register/SizedQwordRegister.hpp | 2 ++ .../src/Common/Types/Register/SizedWordRegister.hpp | 2 ++ liborbum/src/Resources/Cdvd/CdvdNvrams.hpp | 2 ++ liborbum/src/Resources/Cdvd/CdvdRegisters.hpp | 1 + liborbum/src/Resources/Cdvd/CdvdRtc.hpp | 4 ++++ liborbum/src/Resources/Cdvd/RCdvd.hpp | 2 ++ liborbum/src/Resources/Ee/Core/EeCoreCop0.hpp | 2 ++ .../src/Resources/Ee/Core/EeCoreCop0Registers.hpp | 1 + liborbum/src/Resources/Ee/Core/EeCoreFpu.hpp | 2 ++ liborbum/src/Resources/Ee/Core/EeCoreR5900.hpp | 2 ++ liborbum/src/Resources/Ee/Core/EeCoreTlb.hpp | 2 ++ liborbum/src/Resources/Ee/Core/EeCoreTlbEntry.hpp | 2 ++ liborbum/src/Resources/Ee/Core/REeCore.hpp | 2 ++ .../Resources/Ee/Dmac/EeDmacChannelRegisters.hpp | 1 + liborbum/src/Resources/Ee/Dmac/EeDmacChannels.hpp | 1 + liborbum/src/Resources/Ee/Dmac/EeDmatag.hpp | 2 ++ liborbum/src/Resources/Ee/Dmac/REeDmac.hpp | 2 ++ liborbum/src/Resources/Ee/EeRegisters.hpp | 1 + liborbum/src/Resources/Ee/Gif/RGif.hpp | 2 ++ liborbum/src/Resources/Ee/Intc/REeIntc.hpp | 2 ++ liborbum/src/Resources/Ee/Ipu/RIpu.hpp | 2 ++ liborbum/src/Resources/Ee/REe.hpp | 2 ++ .../Resources/Ee/Timers/EeTimersUnitRegisters.hpp | 1 + liborbum/src/Resources/Ee/Timers/EeTimersUnits.hpp | 2 ++ liborbum/src/Resources/Ee/Timers/REeTimers.hpp | 2 ++ liborbum/src/Resources/Ee/Vpu/RVpu.hpp | 2 ++ liborbum/src/Resources/Ee/Vpu/Vif/RVif.hpp | 2 ++ liborbum/src/Resources/Ee/Vpu/Vif/VifUnits.hpp | 2 ++ liborbum/src/Resources/Ee/Vpu/Vu/RVu.hpp | 2 ++ liborbum/src/Resources/Ee/Vpu/Vu/VuUnits.hpp | 3 +++ liborbum/src/Resources/Gs/RGs.hpp | 2 ++ liborbum/src/Resources/Iop/Core/IopCoreCop0.hpp | 2 ++ .../src/Resources/Iop/Core/IopCoreCop0Registers.hpp | 1 + liborbum/src/Resources/Iop/Core/IopCoreR3000.hpp | 2 ++ liborbum/src/Resources/Iop/Core/RIopCore.hpp | 2 ++ .../Resources/Iop/Dmac/IopDmacChannelRegisters.hpp | 1 + liborbum/src/Resources/Iop/Dmac/IopDmacChannels.hpp | 13 +++++++++++++ liborbum/src/Resources/Iop/Dmac/IopDmatag.hpp | 2 ++ liborbum/src/Resources/Iop/Dmac/RIopDmac.hpp | 2 ++ liborbum/src/Resources/Iop/Intc/RIopIntc.hpp | 2 ++ liborbum/src/Resources/Iop/RIop.hpp | 2 ++ liborbum/src/Resources/Iop/Sio0/RSio0.hpp | 2 ++ liborbum/src/Resources/Iop/Sio0/Sio0Registers.hpp | 4 ++++ liborbum/src/Resources/Iop/Sio2/RSio2.hpp | 2 ++ .../src/Resources/Iop/Sio2/Sio2PortRegisters.hpp | 3 +++ liborbum/src/Resources/Iop/Sio2/Sio2Ports.hpp | 4 ++++ liborbum/src/Resources/Iop/Sio2/Sio2Registers.hpp | 1 + .../Resources/Iop/Timers/IopTimersUnitRegisters.hpp | 1 + .../src/Resources/Iop/Timers/IopTimersUnits.hpp | 2 ++ liborbum/src/Resources/Iop/Timers/RIopTimers.hpp | 2 ++ liborbum/src/Resources/RResources.hpp | 2 ++ liborbum/src/Resources/Spu2/RSpu2.hpp | 2 ++ liborbum/src/Resources/Spu2/Spu2CoreRegisters.hpp | 1 + liborbum/src/Resources/Spu2/Spu2CoreVoice.hpp | 2 ++ liborbum/src/Resources/Spu2/Spu2Cores.hpp | 2 ++ utilities/src/Queues.hpp | 3 ++- 62 files changed, 133 insertions(+), 1 deletion(-) diff --git a/liborbum/src/Common/Types/FifoQueue/DmaFifoQueue.hpp b/liborbum/src/Common/Types/FifoQueue/DmaFifoQueue.hpp index 9a3b7333..7f455dea 100644 --- a/liborbum/src/Common/Types/FifoQueue/DmaFifoQueue.hpp +++ b/liborbum/src/Common/Types/FifoQueue/DmaFifoQueue.hpp @@ -3,6 +3,8 @@ #include #include +#include + #include #include "Common/Types/FifoQueue/FifoQueue.hpp" diff --git a/liborbum/src/Common/Types/Mips/BranchDelaySlot.hpp b/liborbum/src/Common/Types/Mips/BranchDelaySlot.hpp index 3d8ae5e9..f90726ee 100644 --- a/liborbum/src/Common/Types/Mips/BranchDelaySlot.hpp +++ b/liborbum/src/Common/Types/Mips/BranchDelaySlot.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Types/Primitive.hpp" #include "Common/Types/Register/PcRegisters.hpp" diff --git a/liborbum/src/Common/Types/Primitive.hpp b/liborbum/src/Common/Types/Primitive.hpp index 843f165f..def66cec 100644 --- a/liborbum/src/Common/Types/Primitive.hpp +++ b/liborbum/src/Common/Types/Primitive.hpp @@ -5,6 +5,8 @@ #include #include +#include + /// PS2 Primative Data Types. /// These types should be used throughout the emulator when operating on the PS2 system state. /// The PS2 and SCE manuals use this size terminology: diff --git a/liborbum/src/Common/Types/Register/SizedByteRegister.hpp b/liborbum/src/Common/Types/Register/SizedByteRegister.hpp index 8a4568b0..a2ef8446 100644 --- a/liborbum/src/Common/Types/Register/SizedByteRegister.hpp +++ b/liborbum/src/Common/Types/Register/SizedByteRegister.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Types/Register/ByteRegister.hpp" /// Sized Byte register. diff --git a/liborbum/src/Common/Types/Register/SizedDwordRegister.hpp b/liborbum/src/Common/Types/Register/SizedDwordRegister.hpp index 28b52796..61e02b45 100644 --- a/liborbum/src/Common/Types/Register/SizedDwordRegister.hpp +++ b/liborbum/src/Common/Types/Register/SizedDwordRegister.hpp @@ -2,6 +2,8 @@ #include +#include + #include "Common/Types/Primitive.hpp" #include "Common/Types/Register/DwordRegister.hpp" diff --git a/liborbum/src/Common/Types/Register/SizedHwordRegister.hpp b/liborbum/src/Common/Types/Register/SizedHwordRegister.hpp index 7d17d47b..ea3052c1 100644 --- a/liborbum/src/Common/Types/Register/SizedHwordRegister.hpp +++ b/liborbum/src/Common/Types/Register/SizedHwordRegister.hpp @@ -2,6 +2,9 @@ #include + +#include + #include "Common/Types/Primitive.hpp" #include "Common/Types/Register/HwordRegister.hpp" diff --git a/liborbum/src/Common/Types/Register/SizedQwordRegister.hpp b/liborbum/src/Common/Types/Register/SizedQwordRegister.hpp index d49dd6ae..243438d4 100644 --- a/liborbum/src/Common/Types/Register/SizedQwordRegister.hpp +++ b/liborbum/src/Common/Types/Register/SizedQwordRegister.hpp @@ -2,6 +2,8 @@ #include +#include + #include "Common/Types/Primitive.hpp" #include "Common/Types/Register/QwordRegister.hpp" diff --git a/liborbum/src/Common/Types/Register/SizedWordRegister.hpp b/liborbum/src/Common/Types/Register/SizedWordRegister.hpp index f3e24b71..39af1b23 100644 --- a/liborbum/src/Common/Types/Register/SizedWordRegister.hpp +++ b/liborbum/src/Common/Types/Register/SizedWordRegister.hpp @@ -2,6 +2,8 @@ #include +#include + #include "Common/Types/Primitive.hpp" #include "Common/Types/Register/WordRegister.hpp" diff --git a/liborbum/src/Resources/Cdvd/CdvdNvrams.hpp b/liborbum/src/Resources/Cdvd/CdvdNvrams.hpp index a630d4f9..cc921f46 100644 --- a/liborbum/src/Resources/Cdvd/CdvdNvrams.hpp +++ b/liborbum/src/Resources/Cdvd/CdvdNvrams.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Types/Memory/ArrayHwordMemory.hpp" /// Contains information about the CDVD NVRAM state, used to store various data. diff --git a/liborbum/src/Resources/Cdvd/CdvdRegisters.hpp b/liborbum/src/Resources/Cdvd/CdvdRegisters.hpp index a586150a..87a9896e 100644 --- a/liborbum/src/Resources/Cdvd/CdvdRegisters.hpp +++ b/liborbum/src/Resources/Cdvd/CdvdRegisters.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include #include "Common/Types/Bitfield.hpp" diff --git a/liborbum/src/Resources/Cdvd/CdvdRtc.hpp b/liborbum/src/Resources/Cdvd/CdvdRtc.hpp index d24ea4e2..0efb63a2 100644 --- a/liborbum/src/Resources/Cdvd/CdvdRtc.hpp +++ b/liborbum/src/Resources/Cdvd/CdvdRtc.hpp @@ -1,3 +1,7 @@ +#pragma once + +#include + #include "Common/Types/Primitive.hpp" /// Real time clock of the CDVD. diff --git a/liborbum/src/Resources/Cdvd/RCdvd.hpp b/liborbum/src/Resources/Cdvd/RCdvd.hpp index f7ac1e4a..338776b7 100644 --- a/liborbum/src/Resources/Cdvd/RCdvd.hpp +++ b/liborbum/src/Resources/Cdvd/RCdvd.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Resources/Cdvd/CdvdFifoQueues.hpp" #include "Resources/Cdvd/CdvdNvrams.hpp" #include "Resources/Cdvd/CdvdRegisters.hpp" diff --git a/liborbum/src/Resources/Ee/Core/EeCoreCop0.hpp b/liborbum/src/Resources/Ee/Core/EeCoreCop0.hpp index 05b42e7f..eae1c518 100644 --- a/liborbum/src/Resources/Ee/Core/EeCoreCop0.hpp +++ b/liborbum/src/Resources/Ee/Core/EeCoreCop0.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Constants.hpp" #include "Common/Types/Mips/MipsCoprocessor0.hpp" #include "Common/Types/Register/SizedWordRegister.hpp" diff --git a/liborbum/src/Resources/Ee/Core/EeCoreCop0Registers.hpp b/liborbum/src/Resources/Ee/Core/EeCoreCop0Registers.hpp index 8fa0a9be..443490c8 100644 --- a/liborbum/src/Resources/Ee/Core/EeCoreCop0Registers.hpp +++ b/liborbum/src/Resources/Ee/Core/EeCoreCop0Registers.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include #include "Common/Types/Mips/MipsCoprocessor0.hpp" diff --git a/liborbum/src/Resources/Ee/Core/EeCoreFpu.hpp b/liborbum/src/Resources/Ee/Core/EeCoreFpu.hpp index cd13440e..52e62994 100644 --- a/liborbum/src/Resources/Ee/Core/EeCoreFpu.hpp +++ b/liborbum/src/Resources/Ee/Core/EeCoreFpu.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Constants.hpp" #include "Common/Types/Mips/MipsCoprocessor.hpp" #include "Common/Types/Register/SizedWordRegister.hpp" diff --git a/liborbum/src/Resources/Ee/Core/EeCoreR5900.hpp b/liborbum/src/Resources/Ee/Core/EeCoreR5900.hpp index d0bf76ef..3263b4f7 100644 --- a/liborbum/src/Resources/Ee/Core/EeCoreR5900.hpp +++ b/liborbum/src/Resources/Ee/Core/EeCoreR5900.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Constants.hpp" #include "Common/Types/Mips/BranchDelaySlot.hpp" #include "Common/Types/Register/PcRegisters.hpp" diff --git a/liborbum/src/Resources/Ee/Core/EeCoreTlb.hpp b/liborbum/src/Resources/Ee/Core/EeCoreTlb.hpp index f383b8b7..a6550d95 100644 --- a/liborbum/src/Resources/Ee/Core/EeCoreTlb.hpp +++ b/liborbum/src/Resources/Ee/Core/EeCoreTlb.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Constants.hpp" #include "Common/Types/Primitive.hpp" #include "Resources/Ee/Core/EeCoreTlbEntry.hpp" diff --git a/liborbum/src/Resources/Ee/Core/EeCoreTlbEntry.hpp b/liborbum/src/Resources/Ee/Core/EeCoreTlbEntry.hpp index 80bcc9ac..f8ad9032 100644 --- a/liborbum/src/Resources/Ee/Core/EeCoreTlbEntry.hpp +++ b/liborbum/src/Resources/Ee/Core/EeCoreTlbEntry.hpp @@ -1,5 +1,7 @@ #pragma once +#include + /// Custom Mask type, provides useful cached values when constructed. class Mask { diff --git a/liborbum/src/Resources/Ee/Core/REeCore.hpp b/liborbum/src/Resources/Ee/Core/REeCore.hpp index 51e9af37..2f15eca8 100644 --- a/liborbum/src/Resources/Ee/Core/REeCore.hpp +++ b/liborbum/src/Resources/Ee/Core/REeCore.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Types/Memory/ArrayByteMemory.hpp" #include "Resources/Ee/Core/EeCoreCop0.hpp" #include "Resources/Ee/Core/EeCoreFpu.hpp" diff --git a/liborbum/src/Resources/Ee/Dmac/EeDmacChannelRegisters.hpp b/liborbum/src/Resources/Ee/Dmac/EeDmacChannelRegisters.hpp index 815b0174..dc1f58a0 100644 --- a/liborbum/src/Resources/Ee/Dmac/EeDmacChannelRegisters.hpp +++ b/liborbum/src/Resources/Ee/Dmac/EeDmacChannelRegisters.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include #include "Common/Types/Register/SizedWordRegister.hpp" diff --git a/liborbum/src/Resources/Ee/Dmac/EeDmacChannels.hpp b/liborbum/src/Resources/Ee/Dmac/EeDmacChannels.hpp index 7e7207a5..45dbabd3 100644 --- a/liborbum/src/Resources/Ee/Dmac/EeDmacChannels.hpp +++ b/liborbum/src/Resources/Ee/Dmac/EeDmacChannels.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include #include "Common/Types/FifoQueue/DmaFifoQueue.hpp" diff --git a/liborbum/src/Resources/Ee/Dmac/EeDmatag.hpp b/liborbum/src/Resources/Ee/Dmac/EeDmatag.hpp index 9e72c107..d753ac15 100644 --- a/liborbum/src/Resources/Ee/Dmac/EeDmatag.hpp +++ b/liborbum/src/Resources/Ee/Dmac/EeDmatag.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Types/Bitfield.hpp" #include "Common/Types/Primitive.hpp" diff --git a/liborbum/src/Resources/Ee/Dmac/REeDmac.hpp b/liborbum/src/Resources/Ee/Dmac/REeDmac.hpp index e2030bbd..def728b7 100644 --- a/liborbum/src/Resources/Ee/Dmac/REeDmac.hpp +++ b/liborbum/src/Resources/Ee/Dmac/REeDmac.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Types/Memory/ArrayByteMemory.hpp" #include "Common/Types/Register/SizedWordRegister.hpp" #include "Resources/Ee/Dmac/EeDmacChannels.hpp" diff --git a/liborbum/src/Resources/Ee/EeRegisters.hpp b/liborbum/src/Resources/Ee/EeRegisters.hpp index b6d5ea41..82e5a84f 100644 --- a/liborbum/src/Resources/Ee/EeRegisters.hpp +++ b/liborbum/src/Resources/Ee/EeRegisters.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include #include #include diff --git a/liborbum/src/Resources/Ee/Gif/RGif.hpp b/liborbum/src/Resources/Ee/Gif/RGif.hpp index 34a39845..bc13650e 100644 --- a/liborbum/src/Resources/Ee/Gif/RGif.hpp +++ b/liborbum/src/Resources/Ee/Gif/RGif.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Types/Memory/ArrayByteMemory.hpp" #include "Common/Types/Register/SizedWordRegister.hpp" diff --git a/liborbum/src/Resources/Ee/Intc/REeIntc.hpp b/liborbum/src/Resources/Ee/Intc/REeIntc.hpp index 8e4b17ae..f136ea85 100644 --- a/liborbum/src/Resources/Ee/Intc/REeIntc.hpp +++ b/liborbum/src/Resources/Ee/Intc/REeIntc.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Types/Memory/ArrayByteMemory.hpp" #include "Resources/Ee/Intc/EeIntcRegisters.hpp" diff --git a/liborbum/src/Resources/Ee/Ipu/RIpu.hpp b/liborbum/src/Resources/Ee/Ipu/RIpu.hpp index 99306bbe..3786fa00 100644 --- a/liborbum/src/Resources/Ee/Ipu/RIpu.hpp +++ b/liborbum/src/Resources/Ee/Ipu/RIpu.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Types/Memory/ArrayByteMemory.hpp" #include "Common/Types/Register/SizedDwordRegister.hpp" #include "Common/Types/Register/SizedWordRegister.hpp" diff --git a/liborbum/src/Resources/Ee/REe.hpp b/liborbum/src/Resources/Ee/REe.hpp index 78f79b9d..0125484b 100644 --- a/liborbum/src/Resources/Ee/REe.hpp +++ b/liborbum/src/Resources/Ee/REe.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Types/Bus/ByteBus.hpp" #include "Common/Types/Memory/ArrayByteMemory.hpp" #include "Common/Types/Primitive.hpp" diff --git a/liborbum/src/Resources/Ee/Timers/EeTimersUnitRegisters.hpp b/liborbum/src/Resources/Ee/Timers/EeTimersUnitRegisters.hpp index 4ac84ecf..f9427971 100644 --- a/liborbum/src/Resources/Ee/Timers/EeTimersUnitRegisters.hpp +++ b/liborbum/src/Resources/Ee/Timers/EeTimersUnitRegisters.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include #include "Common/Types/Register/SizedWordRegister.hpp" diff --git a/liborbum/src/Resources/Ee/Timers/EeTimersUnits.hpp b/liborbum/src/Resources/Ee/Timers/EeTimersUnits.hpp index a7b432f9..2e526821 100644 --- a/liborbum/src/Resources/Ee/Timers/EeTimersUnits.hpp +++ b/liborbum/src/Resources/Ee/Timers/EeTimersUnits.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Types/Register/SizedWordRegister.hpp" #include "Resources/Ee/Timers/EeTimersUnitRegisters.hpp" diff --git a/liborbum/src/Resources/Ee/Timers/REeTimers.hpp b/liborbum/src/Resources/Ee/Timers/REeTimers.hpp index ce94af48..44895004 100644 --- a/liborbum/src/Resources/Ee/Timers/REeTimers.hpp +++ b/liborbum/src/Resources/Ee/Timers/REeTimers.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Constants.hpp" #include "Resources/Ee/Timers/EeTimersUnits.hpp" diff --git a/liborbum/src/Resources/Ee/Vpu/RVpu.hpp b/liborbum/src/Resources/Ee/Vpu/RVpu.hpp index 48bcb016..7c8e3477 100644 --- a/liborbum/src/Resources/Ee/Vpu/RVpu.hpp +++ b/liborbum/src/Resources/Ee/Vpu/RVpu.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Resources/Ee/Vpu/Vif/RVif.hpp" #include "Resources/Ee/Vpu/VpuRegisters.hpp" #include "Resources/Ee/Vpu/Vu/RVu.hpp" diff --git a/liborbum/src/Resources/Ee/Vpu/Vif/RVif.hpp b/liborbum/src/Resources/Ee/Vpu/Vif/RVif.hpp index 613e9d0a..b965611b 100644 --- a/liborbum/src/Resources/Ee/Vpu/Vif/RVif.hpp +++ b/liborbum/src/Resources/Ee/Vpu/Vif/RVif.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Constants.hpp" #include "Resources/Ee/Vpu/Vif/VifUnits.hpp" diff --git a/liborbum/src/Resources/Ee/Vpu/Vif/VifUnits.hpp b/liborbum/src/Resources/Ee/Vpu/Vif/VifUnits.hpp index 8273473a..5bb7bf23 100644 --- a/liborbum/src/Resources/Ee/Vpu/Vif/VifUnits.hpp +++ b/liborbum/src/Resources/Ee/Vpu/Vif/VifUnits.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Types/FifoQueue/DmaFifoQueue.hpp" #include "Resources/Ee/Vpu/Vif/VifUnitRegisters.hpp" diff --git a/liborbum/src/Resources/Ee/Vpu/Vu/RVu.hpp b/liborbum/src/Resources/Ee/Vpu/Vu/RVu.hpp index b2b798c6..cfcfc7a4 100644 --- a/liborbum/src/Resources/Ee/Vpu/Vu/RVu.hpp +++ b/liborbum/src/Resources/Ee/Vpu/Vu/RVu.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Constants.hpp" #include "Resources/Ee/Vpu/Vu/VuRegisters.hpp" #include "Resources/Ee/Vpu/Vu/VuUnits.hpp" diff --git a/liborbum/src/Resources/Ee/Vpu/Vu/VuUnits.hpp b/liborbum/src/Resources/Ee/Vpu/Vu/VuUnits.hpp index 465a8dda..7b37c64c 100644 --- a/liborbum/src/Resources/Ee/Vpu/Vu/VuUnits.hpp +++ b/liborbum/src/Resources/Ee/Vpu/Vu/VuUnits.hpp @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "Common/Constants.hpp" #include "Common/Types/Bus/ByteBus.hpp" #include "Common/Types/Memory/ArrayByteMemory.hpp" diff --git a/liborbum/src/Resources/Gs/RGs.hpp b/liborbum/src/Resources/Gs/RGs.hpp index 7b8f165d..9c45cfd2 100644 --- a/liborbum/src/Resources/Gs/RGs.hpp +++ b/liborbum/src/Resources/Gs/RGs.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Types/Memory/ArrayByteMemory.hpp" #include "Common/Types/Register/SizedDwordRegister.hpp" #include "Resources/Gs/Crtc/RCrtc.hpp" diff --git a/liborbum/src/Resources/Iop/Core/IopCoreCop0.hpp b/liborbum/src/Resources/Iop/Core/IopCoreCop0.hpp index 1c67660c..e7500432 100644 --- a/liborbum/src/Resources/Iop/Core/IopCoreCop0.hpp +++ b/liborbum/src/Resources/Iop/Core/IopCoreCop0.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Constants.hpp" #include "Common/Types/Mips/MipsCoprocessor0.hpp" #include "Common/Types/Register/SizedWordRegister.hpp" diff --git a/liborbum/src/Resources/Iop/Core/IopCoreCop0Registers.hpp b/liborbum/src/Resources/Iop/Core/IopCoreCop0Registers.hpp index 0c611e3a..ce68e7b2 100644 --- a/liborbum/src/Resources/Iop/Core/IopCoreCop0Registers.hpp +++ b/liborbum/src/Resources/Iop/Core/IopCoreCop0Registers.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include #include "Common/Types/Mips/MipsCoprocessor0.hpp" diff --git a/liborbum/src/Resources/Iop/Core/IopCoreR3000.hpp b/liborbum/src/Resources/Iop/Core/IopCoreR3000.hpp index 39bc2eb1..f533ee73 100644 --- a/liborbum/src/Resources/Iop/Core/IopCoreR3000.hpp +++ b/liborbum/src/Resources/Iop/Core/IopCoreR3000.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Constants.hpp" #include "Common/Types/Mips/BranchDelaySlot.hpp" #include "Common/Types/Register/PcRegisters.hpp" diff --git a/liborbum/src/Resources/Iop/Core/RIopCore.hpp b/liborbum/src/Resources/Iop/Core/RIopCore.hpp index 63f62214..d44aa2c2 100644 --- a/liborbum/src/Resources/Iop/Core/RIopCore.hpp +++ b/liborbum/src/Resources/Iop/Core/RIopCore.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Types/Memory/ArrayByteMemory.hpp" #include "Resources/Iop/Core/IopCoreCop0.hpp" #include "Resources/Iop/Core/IopCoreR3000.hpp" diff --git a/liborbum/src/Resources/Iop/Dmac/IopDmacChannelRegisters.hpp b/liborbum/src/Resources/Iop/Dmac/IopDmacChannelRegisters.hpp index 2e88e7eb..ba2e86f7 100644 --- a/liborbum/src/Resources/Iop/Dmac/IopDmacChannelRegisters.hpp +++ b/liborbum/src/Resources/Iop/Dmac/IopDmacChannelRegisters.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include #include "Common/Types/Register/SizedWordRegister.hpp" diff --git a/liborbum/src/Resources/Iop/Dmac/IopDmacChannels.hpp b/liborbum/src/Resources/Iop/Dmac/IopDmacChannels.hpp index f06ee15b..bc3ebe48 100644 --- a/liborbum/src/Resources/Iop/Dmac/IopDmacChannels.hpp +++ b/liborbum/src/Resources/Iop/Dmac/IopDmacChannels.hpp @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "Common/Types/FifoQueue/DmaFifoQueue.hpp" #include "Common/Types/Register/SizedWordRegister.hpp" #include "Resources/Iop/Dmac/IopDmacChannelRegisters.hpp" @@ -65,4 +68,14 @@ public: } SizedWordRegister tadr; + +public: + template + void serialize(Archive & archive) + { + archive( + cereal::base_class>(this), + CEREAL_NVP(tadr) + ); + } }; \ No newline at end of file diff --git a/liborbum/src/Resources/Iop/Dmac/IopDmatag.hpp b/liborbum/src/Resources/Iop/Dmac/IopDmatag.hpp index ba933d80..4bc53a65 100644 --- a/liborbum/src/Resources/Iop/Dmac/IopDmatag.hpp +++ b/liborbum/src/Resources/Iop/Dmac/IopDmatag.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Types/Primitive.hpp" /// An IOP DMAtag type, as explained by wisi and SP193's IOP DMA docs. diff --git a/liborbum/src/Resources/Iop/Dmac/RIopDmac.hpp b/liborbum/src/Resources/Iop/Dmac/RIopDmac.hpp index ebbbb466..08db6620 100644 --- a/liborbum/src/Resources/Iop/Dmac/RIopDmac.hpp +++ b/liborbum/src/Resources/Iop/Dmac/RIopDmac.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Constants.hpp" #include "Common/Types/Register/SizedWordRegister.hpp" #include "Resources/Iop/Dmac/IopDmacChannelRegisters.hpp" diff --git a/liborbum/src/Resources/Iop/Intc/RIopIntc.hpp b/liborbum/src/Resources/Iop/Intc/RIopIntc.hpp index 53e223a0..5781b3c8 100644 --- a/liborbum/src/Resources/Iop/Intc/RIopIntc.hpp +++ b/liborbum/src/Resources/Iop/Intc/RIopIntc.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Resources/Iop/Intc/IopIntcRegisters.hpp" /// IOP INTC resources. diff --git a/liborbum/src/Resources/Iop/RIop.hpp b/liborbum/src/Resources/Iop/RIop.hpp index eaaca110..7df81f4f 100644 --- a/liborbum/src/Resources/Iop/RIop.hpp +++ b/liborbum/src/Resources/Iop/RIop.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Constants.hpp" #include "Common/Types/Bus/ByteBus.hpp" #include "Common/Types/Memory/ArrayByteMemory.hpp" diff --git a/liborbum/src/Resources/Iop/Sio0/RSio0.hpp b/liborbum/src/Resources/Iop/Sio0/RSio0.hpp index b40865bb..861ce3ba 100644 --- a/liborbum/src/Resources/Iop/Sio0/RSio0.hpp +++ b/liborbum/src/Resources/Iop/Sio0/RSio0.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Types/Register/SizedHwordRegister.hpp" #include "Resources/Iop/Sio0/Sio0Registers.hpp" diff --git a/liborbum/src/Resources/Iop/Sio0/Sio0Registers.hpp b/liborbum/src/Resources/Iop/Sio0/Sio0Registers.hpp index cfe00092..229a022c 100644 --- a/liborbum/src/Resources/Iop/Sio0/Sio0Registers.hpp +++ b/liborbum/src/Resources/Iop/Sio0/Sio0Registers.hpp @@ -1,3 +1,7 @@ +#pragma once + +#include + #include "Common/Types/Bitfield.hpp" #include "Common/Types/FifoQueue/DmaFifoQueue.hpp" #include "Common/Types/Register/ByteRegister.hpp" diff --git a/liborbum/src/Resources/Iop/Sio2/RSio2.hpp b/liborbum/src/Resources/Iop/Sio2/RSio2.hpp index 4e2c2df9..894ccb92 100644 --- a/liborbum/src/Resources/Iop/Sio2/RSio2.hpp +++ b/liborbum/src/Resources/Iop/Sio2/RSio2.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Constants.hpp" #include "Common/Types/FifoQueue/DmaFifoQueue.hpp" #include "Common/Types/Register/SizedWordRegister.hpp" diff --git a/liborbum/src/Resources/Iop/Sio2/Sio2PortRegisters.hpp b/liborbum/src/Resources/Iop/Sio2/Sio2PortRegisters.hpp index 8f0c5dd3..5314b5d1 100644 --- a/liborbum/src/Resources/Iop/Sio2/Sio2PortRegisters.hpp +++ b/liborbum/src/Resources/Iop/Sio2/Sio2PortRegisters.hpp @@ -1,3 +1,6 @@ +#pragma once + +#include #include #include "Common/Types/Bitfield.hpp" diff --git a/liborbum/src/Resources/Iop/Sio2/Sio2Ports.hpp b/liborbum/src/Resources/Iop/Sio2/Sio2Ports.hpp index 673b750c..dc5d2b3b 100644 --- a/liborbum/src/Resources/Iop/Sio2/Sio2Ports.hpp +++ b/liborbum/src/Resources/Iop/Sio2/Sio2Ports.hpp @@ -1,3 +1,7 @@ +#pragma once + +#include + #include "Resources/Iop/Sio2/Sio2PortRegisters.hpp" /// Describes an abstract SIO2 port. diff --git a/liborbum/src/Resources/Iop/Sio2/Sio2Registers.hpp b/liborbum/src/Resources/Iop/Sio2/Sio2Registers.hpp index 20c4cc89..c977329d 100644 --- a/liborbum/src/Resources/Iop/Sio2/Sio2Registers.hpp +++ b/liborbum/src/Resources/Iop/Sio2/Sio2Registers.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include #include "Common/Types/FifoQueue/DmaFifoQueue.hpp" diff --git a/liborbum/src/Resources/Iop/Timers/IopTimersUnitRegisters.hpp b/liborbum/src/Resources/Iop/Timers/IopTimersUnitRegisters.hpp index 3ee3c1c5..24c552ad 100644 --- a/liborbum/src/Resources/Iop/Timers/IopTimersUnitRegisters.hpp +++ b/liborbum/src/Resources/Iop/Timers/IopTimersUnitRegisters.hpp @@ -2,6 +2,7 @@ #include +#include #include #include "Common/Types/Register/SizedWordRegister.hpp" diff --git a/liborbum/src/Resources/Iop/Timers/IopTimersUnits.hpp b/liborbum/src/Resources/Iop/Timers/IopTimersUnits.hpp index 68ee72d2..012fc676 100644 --- a/liborbum/src/Resources/Iop/Timers/IopTimersUnits.hpp +++ b/liborbum/src/Resources/Iop/Timers/IopTimersUnits.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Types/Register/SizedWordRegister.hpp" #include "Resources/Iop/Timers/IopTimersUnitRegisters.hpp" diff --git a/liborbum/src/Resources/Iop/Timers/RIopTimers.hpp b/liborbum/src/Resources/Iop/Timers/RIopTimers.hpp index 1de6e025..66920435 100644 --- a/liborbum/src/Resources/Iop/Timers/RIopTimers.hpp +++ b/liborbum/src/Resources/Iop/Timers/RIopTimers.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Constants.hpp" #include "Resources/Iop/Timers/IopTimersUnits.hpp" diff --git a/liborbum/src/Resources/RResources.hpp b/liborbum/src/Resources/RResources.hpp index e17c6cf2..b38177e1 100644 --- a/liborbum/src/Resources/RResources.hpp +++ b/liborbum/src/Resources/RResources.hpp @@ -2,6 +2,8 @@ #include +#include + #include "Common/Types/FifoQueue/DmaFifoQueue.hpp" #include "Common/Types/Memory/ArrayByteMemory.hpp" #include "Common/Types/Register/SizedWordRegister.hpp" diff --git a/liborbum/src/Resources/Spu2/RSpu2.hpp b/liborbum/src/Resources/Spu2/RSpu2.hpp index 7f8c7d3d..11b14801 100644 --- a/liborbum/src/Resources/Spu2/RSpu2.hpp +++ b/liborbum/src/Resources/Spu2/RSpu2.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Constants.hpp" #include "Common/Types/Memory/ArrayByteMemory.hpp" #include "Common/Types/Memory/ArrayHwordMemory.hpp" diff --git a/liborbum/src/Resources/Spu2/Spu2CoreRegisters.hpp b/liborbum/src/Resources/Spu2/Spu2CoreRegisters.hpp index c27f864c..7ac6460c 100644 --- a/liborbum/src/Resources/Spu2/Spu2CoreRegisters.hpp +++ b/liborbum/src/Resources/Spu2/Spu2CoreRegisters.hpp @@ -2,6 +2,7 @@ #include +#include #include #include "Common/Types/Bitfield.hpp" diff --git a/liborbum/src/Resources/Spu2/Spu2CoreVoice.hpp b/liborbum/src/Resources/Spu2/Spu2CoreVoice.hpp index 2f075cae..5cfa4f69 100644 --- a/liborbum/src/Resources/Spu2/Spu2CoreVoice.hpp +++ b/liborbum/src/Resources/Spu2/Spu2CoreVoice.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Types/Register/SizedHwordRegister.hpp" #include "Resources/Spu2/Spu2CoreVoiceRegisters.hpp" diff --git a/liborbum/src/Resources/Spu2/Spu2Cores.hpp b/liborbum/src/Resources/Spu2/Spu2Cores.hpp index b9fb5c77..d50c6d3b 100644 --- a/liborbum/src/Resources/Spu2/Spu2Cores.hpp +++ b/liborbum/src/Resources/Spu2/Spu2Cores.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include "Common/Constants.hpp" #include "Common/Types/FifoQueue/DmaFifoQueue.hpp" #include "Resources/Spu2/Spu2CoreConstants.hpp" diff --git a/utilities/src/Queues.hpp b/utilities/src/Queues.hpp index 5b09f53a..9791edd5 100644 --- a/utilities/src/Queues.hpp +++ b/utilities/src/Queues.hpp @@ -4,10 +4,11 @@ #include #include #include +#include #include -#include +#include // TODO: the Mpsc/Spmc/Spsc classes are just Mpmc aliases... // In order to support the "events" a mutex is needed