Core: Fixes some compilation errors based on recent changes

shadergz · May 17, 2024 · 2f16b1f · 2f16b1f
1 parent ada17a7
commit 2f16b1f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/app/src/main/cpp/cosmic/engine/copctrl/cop0.cpp b/app/src/main/cpp/cosmic/engine/copctrl/cop0.cpp
@@ -63,15 +63,15 @@ namespace cosmic::engine::copctrl {
 
     void CtrlCop::redoTlbMapping() {
         if (status.exception || status.error || status.mode == Ksu::Kernel)
-            virtMap = virtCache->kernelVtlb;
+            virtMap = virtCache->kernelVirt;
 
         switch (status.mode) {
         case Ksu::Supervisor:
-            virtMap = virtCache->supervisorVtlb;
+            virtMap = virtCache->supervisorVirt;
         case Ksu::User:
-            virtMap = virtCache->userVtlb;
+            virtMap = virtCache->userVirt;
         default:
-            virtMap = virtCache->kernelVtlb;
+            virtMap = virtCache->kernelVirt;
         }
     }
     // https://rust-console.github.io/ps2-bios-book

diff --git a/app/src/main/cpp/cosmic/mio/dma_ctrl.h b/app/src/main/cpp/cosmic/mio/dma_ctrl.h
@@ -141,6 +141,7 @@ namespace cosmic::mio {
     private:
         std::list<DmaChannel> queued;
         using ChannelIterator = std::list<DmaChannel>::iterator;
+
         u32 intStatus;
         OwnerChannel hasOwner;
         i64 highCycles;

diff --git a/app/src/main/cpp/cosmic/mio/mem_pipe.cpp b/app/src/main/cpp/cosmic/mio/mem_pipe.cpp
@@ -54,7 +54,7 @@ namespace cosmic::mio {
         u32 counter, control, target;
     };
     std::array<IopTimersCct, 1> iopTimersArea {
-        {{0x1F801120, 0x1F801124, 0x1F801128}}
+        {{0x1f801120, 0x1f801124, 0x1f801128}}
     };
 
     VirtualPointer MemoryPipe::iopHalLookup(u32 address) {
@@ -67,7 +67,7 @@ namespace cosmic::mio {
             // checking if the processor supports PS1 mode
             return &hwIoCfg;
         }
-        ranges::for_each(iopTimersArea, [&](auto& tXMap) {
+        ranges::for_each(iopTimersArea, [&](const auto& tXMap) {
             if (tXMap.counter == address) {
             }
             if (tXMap.control == address) {