Project: Rename the references container to Ref

shadergz · Jan 21, 2024 · 0d7e74b · 0d7e74b
1 parent 286ea28
commit 0d7e74b
Show file tree

Hide file tree

Showing 36 changed files with 93 additions and 88 deletions.
diff --git a/app/src/main/cpp/cosmic/common/alias.h b/app/src/main/cpp/cosmic/common/alias.h
@@ -15,6 +15,7 @@ namespace cosmic {
     using i64 = std::int64_t;
     using u64 = std::uint64_t;
 
+    using u128 = uint64x2_t;
     using u256 = uint64x1x4_t;
 
     using f32 = float32_t;

diff --git a/app/src/main/cpp/cosmic/common/types.h b/app/src/main/cpp/cosmic/common/types.h
@@ -10,10 +10,10 @@
 #include <common/alias.h>
 namespace cosmic {
     template <typename T>
-    class RawReference {
+    class Ref {
     public:
-        RawReference() = default;
-        RawReference(T& save) {
+        Ref() = default;
+        Ref(T& save) {
             safe = save;
         }
         auto operator=(std::reference_wrapper<T>& wrapper) {

diff --git a/app/src/main/cpp/cosmic/console/backdoor.cpp b/app/src/main/cpp/cosmic/console/backdoor.cpp
@@ -5,11 +5,11 @@ namespace cosmic {
 }
 namespace cosmic::console {
     BackDoor::BackDoor(vm::EmuVm& aliveVm) {
-        vm = std::make_unique<RawReference<vm::EmuVm>>(std::ref(aliveVm));
+        vm = std::make_unique<Ref<vm::EmuVm>>(std::ref(aliveVm));
         echo.lock();
         vmRefs = 1;
     }
-    RawReference<vm::EmuVm> BackDoor::openVm() {
+    Ref<vm::EmuVm> BackDoor::openVm() {
         std::thread::id nub{};
         if (owner == nub && owner != std::this_thread::get_id()) {
             while (echo.try_lock()) {
@@ -22,22 +22,22 @@ namespace cosmic::console {
         }
         if (owner != std::this_thread::get_id())
             throw AppFail("This resource should have the lock held until the object is released");
-        RawReference<vm::EmuVm> vmRef{};
+        Ref<vm::EmuVm> vmRef{};
         if (vmRefs) {
             vmRef = *vm;
             vmRefs++;
         }
         return vmRef;
     }
-    void BackDoor::leaveVm(RawReference<vm::EmuVm> lvm) {
+    void BackDoor::leaveVm(Ref<vm::EmuVm> lvm) {
         if (echo.try_lock()) {
             if (owner != std::this_thread::get_id())
                 throw AppFail("The program flow is broken, review the usage of BackDoor in the code");
         }
         vmRefs--;
         if (!vm || vmRefs <= 0) {
             vm.reset();
-            vm = std::make_unique<RawReference<vm::EmuVm>>(lvm);
+            vm = std::make_unique<Ref<vm::EmuVm>>(lvm);
             vmRefs = 1;
         }
         owner = {};

diff --git a/app/src/main/cpp/cosmic/console/backdoor.h b/app/src/main/cpp/cosmic/console/backdoor.h
@@ -10,12 +10,12 @@ namespace cosmic::console {
     class BackDoor {
     public:
         BackDoor(vm::EmuVm& aliveVm);
-        RawReference<vm::EmuVm> openVm();
-        void leaveVm(RawReference<vm::EmuVm> lvm);
+        Ref<vm::EmuVm> openVm();
+        void leaveVm(Ref<vm::EmuVm> lvm);
     private:
         std::thread::id owner;
         std::mutex echo;
-        std::unique_ptr<RawReference<vm::EmuVm>> vm;
+        std::unique_ptr<Ref<vm::EmuVm>> vm;
         i32 vmRefs;
     };
 }

diff --git a/app/src/main/cpp/cosmic/creeper/ee/cop_isa.cpp b/app/src/main/cpp/cosmic/creeper/ee/cop_isa.cpp
@@ -44,7 +44,7 @@ namespace cosmic::creeper::ee {
         cpu->setTlbByIndex();
     }
     void MipsIvInterpreter::eret(Operands ops) {
-        RawReference<engine::copctrl::CtrlCop> c0{cpu->cop0};
+        Ref<engine::copctrl::CtrlCop> c0{cpu->cop0};
         if (c0->status.error) {
             cpu->chPc(c0->errorPC);
             c0->status.error = false;

diff --git a/app/src/main/cpp/cosmic/creeper/ee/mipsiv_cached.cpp b/app/src/main/cpp/cosmic/creeper/ee/mipsiv_cached.cpp
@@ -28,7 +28,7 @@ namespace cosmic::creeper::ee {
         auto endIterator{std::end(run)};
 
         for (; opIterator != run.end(); executedInst++) {
-            RawReference<CachedMultiOp> opcInside{*opIterator};
+            Ref<CachedMultiOp> opcInside{*opIterator};
             bool isLastABr{false};
             // Todo: May not work as expected
             if (opIterator != run.begin()) {
@@ -45,7 +45,7 @@ namespace cosmic::creeper::ee {
             if ((opIterator + 1) != endIterator) {
                 // Simulating the pipeline execution with the aim of resolving one or more instructions
                 // within the same cycle
-                RawReference<CachedMultiOp> opcSuper{*(opIterator + 1)};
+                Ref<CachedMultiOp> opcSuper{*(opIterator + 1)};
                 // Execute only two instructions if the operations use different pipelines
                 if ((opcInside->infoCallable.pipe ^ opcSuper->infoCallable.pipe) != invPipe) {
                     performOp(opcInside->infoCallable, false);
@@ -89,7 +89,7 @@ namespace cosmic::creeper::ee {
             block = localPc32;
         }
     }
-    MipsIvInterpreter::MipsIvInterpreter(RawReference<engine::EeMipsCore> mips) :
+    MipsIvInterpreter::MipsIvInterpreter(Ref<engine::EeMipsCore> mips) :
         engine::EeExecutor(mips) {
         lastCleaned = 0;
         memset(metrics.data(), 0, sizeof(metrics));
@@ -112,7 +112,7 @@ namespace cosmic::creeper::ee {
         do {
             PCs[0] = *cpu->eePc;
             PCs[1] = PCs[0] & cleanPcBlock;
-            RawReference<BlockFrequency> chosen;
+            Ref<BlockFrequency> chosen;
             ranges::for_each(metrics, [&](auto& met){
                 if (met.blockPc == PCs[1])
                     chosen = std::ref(met);

diff --git a/app/src/main/cpp/cosmic/creeper/ee/mipsiv_cached.h b/app/src/main/cpp/cosmic/creeper/ee/mipsiv_cached.h
@@ -62,7 +62,7 @@ namespace cosmic::creeper::ee {
 
     class MipsIvInterpreter : public engine::EeExecutor {
     public:
-        MipsIvInterpreter(RawReference<engine::EeMipsCore> mips);
+        MipsIvInterpreter(Ref<engine::EeMipsCore> mips);
         u32 executeCode() override;
         void performInvalidation(u32 address) override;
     private:
@@ -84,9 +84,9 @@ namespace cosmic::creeper::ee {
         std::map<u32, CachedBlock> cached;
         u32 lastCleaned;
 
-        RawReference<vm::EmuVm> vm;
-        RawReference<engine::FpuCop> fpu;
-        RawReference<engine::copctrl::CtrlCop> control;
+        Ref<vm::EmuVm> vm;
+        Ref<engine::FpuCop> fpu;
+        Ref<engine::copctrl::CtrlCop> control;
 
         void addi(Operands ops);
         void slti(Operands ops);

diff --git a/app/src/main/cpp/cosmic/creeper/psx/iop_interpreter.cpp b/app/src/main/cpp/cosmic/creeper/psx/iop_interpreter.cpp
@@ -214,9 +214,9 @@ namespace cosmic::creeper::psx {
         }
     }
     IopInterpreter::IopInterpreter(
-            RawReference<iop::IoMipsCore> core) :
+            Ref<iop::IoMipsCore> core) :
         IopExecVe(core) {
-        RawReference<vm::EmuVm> vmInter{outside->openVm()};
+        Ref<vm::EmuVm> vmInter{outside->openVm()};
 
         vm = vmInter;
         outside->leaveVm(vm);

diff --git a/app/src/main/cpp/cosmic/creeper/psx/iop_interpreter.h b/app/src/main/cpp/cosmic/creeper/psx/iop_interpreter.h
@@ -9,7 +9,7 @@ namespace cosmic::vm {
 namespace cosmic::creeper::psx {
     class IopInterpreter : public iop::IopExecVe {
     public:
-        IopInterpreter(RawReference<iop::IoMipsCore> core);
+        IopInterpreter(Ref<iop::IoMipsCore> core);
         u32 executeCode() override;
         u32 execPsx(u32 opcode, std::array<u8, 3> opeRegs);
         u32 execCop(u32 opcode, std::array<u8, 3> opeRegs);
@@ -19,7 +19,7 @@ namespace cosmic::creeper::psx {
         CachedFastPc fastPc;
 
         u32 fetchPcInst() override;
-        RawReference<vm::EmuVm> vm;
+        Ref<vm::EmuVm> vm;
         void issueInterruptSignal();
 
         void sltiu(Operands ops);

diff --git a/app/src/main/cpp/cosmic/engine/copctrl/cop0.h b/app/src/main/cpp/cosmic/engine/copctrl/cop0.h
@@ -124,7 +124,7 @@ namespace cosmic::engine::copctrl {
         bool isIntEnabled();
     private:
         void incPerfByEvent(u32 mask, u32 cycles, u8 perfEv);
-        RawReference<CopCacheLine> getCache(u32 mem, bool write, CacheMode mode = Instruction);
+        Ref<CopCacheLine> getCache(u32 mem, bool write, CacheMode mode = Instruction);
 
         std::array<CopCacheLine, 128> inCache;
         std::array<CopCacheLine, 64> dataCache;

diff --git a/app/src/main/cpp/cosmic/engine/copctrl/cop_cache.cpp b/app/src/main/cpp/cosmic/engine/copctrl/cop_cache.cpp
@@ -6,7 +6,7 @@ namespace cosmic::engine::copctrl {
     // We don't check for a cache miss here
     os::vec CtrlCop::readCache(u32 address, CacheMode mode) {
         u32 tag{getCachePfn(address, mode)};
-        RawReference<CopCacheLine> cache;
+        Ref<CopCacheLine> cache;
         cache = getCache(address, false, mode);
         u8 fix{};
         if (cache->tags[0] == tag)
@@ -43,7 +43,7 @@ namespace cosmic::engine::copctrl {
         return {};
     }
     void CtrlCop::loadCacheLine(u32 address, EeMipsCore& core, CacheMode mode) {
-        RawReference<CopCacheLine> pear{};
+        Ref<CopCacheLine> pear{};
         u16 logical{getCachePfn(address, mode)};
 
         pear = getCache(address, true, mode);
@@ -120,7 +120,7 @@ namespace cosmic::engine::copctrl {
             eec.tags[assign] |= dirtyBit;
         }
     }
-    RawReference<CopCacheLine> CtrlCop::getCache(u32 mem, bool write, CacheMode mode) {
+    Ref<CopCacheLine> CtrlCop::getCache(u32 mem, bool write, CacheMode mode) {
         std::array<u8*, 2> wb;
         std::array<bool, 2> valid;
         u32 ci;

diff --git a/app/src/main/cpp/cosmic/engine/ee_core.cpp b/app/src/main/cpp/cosmic/engine/ee_core.cpp
@@ -134,7 +134,7 @@ namespace cosmic::engine {
         cop0.configureGlobalTlb(selectedLb);
         cop0.virtCache->mapTlb(selectedLb);
     }
-    RawReference<mio::TlbPageEntry> EeMipsCore::fetchTlbFromCop(u32* c0Regs) {
+    Ref<mio::TlbPageEntry> EeMipsCore::fetchTlbFromCop(u32* c0Regs) {
         u16 c0id{*reinterpret_cast<u16*>(c0Regs[0])};
         return cop0.virtCache->entries[c0id];
     }

diff --git a/app/src/main/cpp/cosmic/engine/ee_core.h b/app/src/main/cpp/cosmic/engine/ee_core.h
@@ -106,7 +106,7 @@ namespace cosmic::engine {
         void branchByCondition(bool cond, i32 jumpRel);
         void branchOnLikely(bool cond, i32 jumpRel);
 
-        RawReference<mio::TlbPageEntry> fetchTlbFromCop(u32* c0Regs);
+        Ref<mio::TlbPageEntry> fetchTlbFromCop(u32* c0Regs);
         void updateTlb();
         void setTlbByIndex();
 

diff --git a/app/src/main/cpp/cosmic/engine/ee_info.h b/app/src/main/cpp/cosmic/engine/ee_info.h
@@ -5,14 +5,14 @@ namespace cosmic::engine {
     class EeMipsCore;
     class EeExecutor {
     public:
-        EeExecutor(RawReference<EeMipsCore> mips) :
+        EeExecutor(Ref<EeMipsCore> mips) :
             cpu(mips) {}
         virtual u32 executeCode() = 0;
         virtual u32 fetchPcInst(u32 pc) = 0;
         virtual void performInvalidation(u32 address) = 0;
         virtual ~EeExecutor() = default;
     protected:
-        RawReference<EeMipsCore> cpu;
+        Ref<EeMipsCore> cpu;
     };
 
     enum MipsRegsHw : u8 {

diff --git a/app/src/main/cpp/cosmic/fs/bios_loader.cpp b/app/src/main/cpp/cosmic/fs/bios_loader.cpp
@@ -49,14 +49,14 @@ namespace cosmic::fs {
         biosf.readFrom(here, 0);
         romHeader.release();
     }
-    RawReference<RomEntry> BiosLoader::getModule(const std::string model) {
+    Ref<RomEntry> BiosLoader::getModule(const std::string model) {
         std::span<u8> modelBin{BitCast<u8*>(model.c_str()), model.size()};
         std::span<u8> hdrBin{romHeader->operator*(), hdrSize};
         auto indexInt{ranges::search(hdrBin, modelBin)};
 
         return *BitCast<RomEntry*>(indexInt.data());
     }
-    bool BiosLoader::loadVersionInfo(RawReference<RomEntry>, std::span<u8> info) {
+    bool BiosLoader::loadVersionInfo(Ref<RomEntry>, std::span<u8> info) {
         auto reset{getModule("RESET")};
         auto directory{getModule("ROMDIR")};
 

diff --git a/app/src/main/cpp/cosmic/fs/bios_loader.h b/app/src/main/cpp/cosmic/fs/bios_loader.h
@@ -26,8 +26,8 @@ namespace cosmic::fs {
     private:
         bool isABios();
 
-        RawReference<RomEntry> getModule(const std::string model);
-        bool loadVersionInfo(RawReference<RomEntry> entry, std::span<u8> info);
+        Ref<RomEntry> getModule(const std::string model);
+        bool loadVersionInfo(Ref<RomEntry> entry, std::span<u8> info);
         void fillVersion(JNIEnv* android, hle::BiosInfo& bios, std::span<char> info);
 
         DescriptorRaii biosf{};

diff --git a/app/src/main/cpp/cosmic/gpu/vulcano/vram_allocator.cpp b/app/src/main/cpp/cosmic/gpu/vulcano/vram_allocator.cpp
@@ -1,7 +1,7 @@
 #include <gpu/vulcano/vram_allocator.h>
 
 namespace cosmic::gpu::vulcano {
-    VramManager::VramManager(RawReference<GraphicsLayer> gpu) : graphics(gpu) {
+    VramManager::VramManager(Ref<GraphicsLayer> gpu) : graphics(gpu) {
         VmaAllocatorCreateInfo allocatorInfo{};
         vmaCreateAllocator(&allocatorInfo, &vma);
     }

diff --git a/app/src/main/cpp/cosmic/gpu/vulcano/vram_allocator.h b/app/src/main/cpp/cosmic/gpu/vulcano/vram_allocator.h
@@ -6,10 +6,10 @@ namespace cosmic::gpu::vulcano {
     class GraphicsLayer;
     class VramManager {
     public:
-        VramManager(RawReference<GraphicsLayer> gpu);
+        VramManager(Ref<GraphicsLayer> gpu);
         ~VramManager();
     private:
         VmaAllocator vma{VK_NULL_HANDLE};
-        RawReference<GraphicsLayer> graphics;
+        Ref<GraphicsLayer> graphics;
     };
 }
diff --git a/app/src/main/cpp/cosmic/gs/gif_bridge.h b/app/src/main/cpp/cosmic/gs/gif_bridge.h
@@ -45,7 +45,7 @@ namespace cosmic::gs {
         void resumeDmacPath();
         void reqADmacAtPath(u8 path, bool intPath3 = false);
     private:
-        RawReference<GsEngine> gs;
+        Ref<GsEngine> gs;
         std::array<GifPath, 4> paths;
 
         GifStatus status;

diff --git a/app/src/main/cpp/cosmic/hle/syscall_gate.h b/app/src/main/cpp/cosmic/hle/syscall_gate.h
@@ -24,6 +24,6 @@ namespace cosmic::hle {
         void doSyscall(SyscallOrigin origin, i16 sys);
     private:
         void resetEe();
-        RawReference<vm::EmuVm> vm;
+        Ref<vm::EmuVm> vm;
     };
 }
diff --git a/app/src/main/cpp/cosmic/iop/iop_dma.cpp b/app/src/main/cpp/cosmic/iop/iop_dma.cpp
@@ -23,7 +23,7 @@ namespace cosmic::iop {
     void IopDma::pulseSpu2Chain() {
         // When true, it means that we will write into the SPU2 device
         bool write2Spu;
-        RawReference<IopChan> channel;
+        Ref<IopChan> channel;
         std::array<u32, 2> packet;
 
         channel = std::ref(channels[IopSpu2]);

diff --git a/app/src/main/cpp/cosmic/iop/iop_info.h b/app/src/main/cpp/cosmic/iop/iop_info.h
@@ -5,14 +5,14 @@ namespace cosmic::iop {
 
     class IopExecVe {
     public:
-        IopExecVe(RawReference<IoMipsCore> mips) :
+        IopExecVe(Ref<IoMipsCore> mips) :
             cpu(mips) {}
 
         virtual u32 executeCode() = 0;
         virtual u32 fetchPcInst() = 0;
         virtual ~IopExecVe() = default;
     protected:
-        RawReference<IoMipsCore> cpu;
+        Ref<IoMipsCore> cpu;
     };
 
     enum IopSpecial {