Label A32 specific code appropriately

src/frontend/ir/location_descriptor.h

@@ -6,110 +6,42 @@
 
 #pragma once
 
-#include <functional>
 #include <iosfwd>
-#include <tuple>
+
 #include "common/common_types.h"
-#include "frontend/arm/FPSCR.h"
-#include "frontend/arm/PSR.h"
 
 namespace Dynarmic {
 namespace IR {
 
-/**
- * LocationDescriptor describes the location of a basic block.
- * The location is not solely based on the PC because other flags influence the way
- * instructions should be translated. The CPSR.T flag is most notable since it
- * tells us if the processor is in Thumb or Arm mode.
- */
 class LocationDescriptor {
 public:
-    // Indicates bits that should be preserved within descriptors.
-    static constexpr u32 CPSR_MODE_MASK  = 0x00000220;
-    static constexpr u32 FPSCR_MODE_MASK = 0x03F79F00;
-
-    LocationDescriptor(u32 arm_pc, Arm::PSR cpsr, Arm::FPSCR fpscr)
-            : arm_pc(arm_pc), cpsr(cpsr.Value() & CPSR_MODE_MASK), fpscr(fpscr.Value() & FPSCR_MODE_MASK) {}
-
-    u32 PC() const { return arm_pc; }
-    bool TFlag() const { return cpsr.T(); }
-    bool EFlag() const { return cpsr.E(); }
-
-    Arm::PSR CPSR() const { return cpsr; }
-    Arm::FPSCR FPSCR() const { return fpscr; }
-
     bool operator == (const LocationDescriptor& o) const {
-        return std::tie(arm_pc, cpsr, fpscr) == std::tie(o.arm_pc, o.cpsr, o.fpscr);
+        return value == o.value;
     }
 
     bool operator != (const LocationDescriptor& o) const {
         return !operator==(o);
     }
 
-    LocationDescriptor SetPC(u32 new_arm_pc) const {
-        return LocationDescriptor(new_arm_pc, cpsr, fpscr);
-    }
-
-    LocationDescriptor AdvancePC(int amount) const {
-        return LocationDescriptor(static_cast<u32>(arm_pc + amount), cpsr, fpscr);
-    }
-
-    LocationDescriptor SetTFlag(bool new_tflag) const {
-        Arm::PSR new_cpsr = cpsr;
-        new_cpsr.T(new_tflag);
-
-        return LocationDescriptor(arm_pc, new_cpsr, fpscr);
-    }
-
-    LocationDescriptor SetEFlag(bool new_eflag) const {
-        Arm::PSR new_cpsr = cpsr;
-        new_cpsr.E(new_eflag);
-
-        return LocationDescriptor(arm_pc, new_cpsr, fpscr);
-    }
-
-    LocationDescriptor SetFPSCR(u32 new_fpscr) const {
-        return LocationDescriptor(arm_pc, cpsr, Arm::FPSCR{new_fpscr & FPSCR_MODE_MASK});
-    }
-
-    u64 UniqueHash() const {
-        // This value MUST BE UNIQUE.
-        // This calculation has to match up with EmitX64::EmitTerminalPopRSBHint
-        u64 pc_u64 = u64(arm_pc) << 32;
-        u64 fpscr_u64 = u64(fpscr.Value());
-        u64 t_u64 = cpsr.T() ? 1 : 0;
-        u64 e_u64 = cpsr.E() ? 2 : 0;
-        return pc_u64 | fpscr_u64 | t_u64 | e_u64;
-    }
-
-private:
-    u32 arm_pc;       ///< Current program counter value.
-    Arm::PSR cpsr;    ///< Current program status register.
-    Arm::FPSCR fpscr; ///< Floating point status control register.
+    u64 value;
 };
 
-/**
- * Provides a string representation of a LocationDescriptor.
- *
- * @param o          Output stream
- * @param descriptor The descriptor to get a string representation of
- */
 std::ostream& operator<<(std::ostream& o, const LocationDescriptor& descriptor);
 
-} // namespace IR
+} // namespace A32
 } // namespace Dynarmic
 
 namespace std {
 template <>
 struct less<Dynarmic::IR::LocationDescriptor> {
     bool operator()(const Dynarmic::IR::LocationDescriptor& x, const Dynarmic::IR::LocationDescriptor& y) const {
-        return x.UniqueHash() < y.UniqueHash();
+        return x.value < y.value;
     }
 };
 template <>
 struct hash<Dynarmic::IR::LocationDescriptor> {
     size_t operator()(const Dynarmic::IR::LocationDescriptor& x) const {
-        return std::hash<u64>()(x.UniqueHash());
+        return std::hash<u64>()(x.value);
     }
 };
 } // namespace std