diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2018-08-27 15:54:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-27 15:54:05 +0200 |
| commit | 25898cfa55e26b5ebc5cf307e47cfaf8896cfc74 (patch) | |
| tree | 15a09154badf39ba85ec49e6af6aca190b53c566 /Source | |
| parent | 6a22f1b3e0a9208a327c745aecd22be6cc327f73 (diff) | |
| parent | 208be26bb4290adbfc1f799f0c3ca6e95cd7d734 (diff) | |
Merge pull request #7368 from lioncash/const-cast
Arm64Emitter: Make the Align* functions return a non-const data pointer
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Common/Arm64Emitter.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/Common/Arm64Emitter.h | 4 | ||||
| -rw-r--r-- | Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/Common/Arm64Emitter.cpp b/Source/Core/Common/Arm64Emitter.cpp index 124ae218a2..2864b2fc38 100644 --- a/Source/Core/Common/Arm64Emitter.cpp +++ b/Source/Core/Common/Arm64Emitter.cpp @@ -328,7 +328,7 @@ void ARM64XEmitter::ReserveCodeSpace(u32 bytes) BRK(0); } -const u8* ARM64XEmitter::AlignCode16() +u8* ARM64XEmitter::AlignCode16() { int c = int((u64)m_code & 15); if (c) @@ -336,7 +336,7 @@ const u8* ARM64XEmitter::AlignCode16() return m_code; } -const u8* ARM64XEmitter::AlignCodePage() +u8* ARM64XEmitter::AlignCodePage() { int c = int((u64)m_code & 4095); if (c) diff --git a/Source/Core/Common/Arm64Emitter.h b/Source/Core/Common/Arm64Emitter.h index 29df028e36..46ec6e9349 100644 --- a/Source/Core/Common/Arm64Emitter.h +++ b/Source/Core/Common/Arm64Emitter.h @@ -543,8 +543,8 @@ public: void SetCodePtr(u8* ptr); void SetCodePtrUnsafe(u8* ptr); void ReserveCodeSpace(u32 bytes); - const u8* AlignCode16(); - const u8* AlignCodePage(); + u8* AlignCode16(); + u8* AlignCodePage(); const u8* GetCodePtr() const; void FlushIcache(); void FlushIcacheSection(u8* start, u8* end); diff --git a/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp b/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp index 7913603807..097d7dfc50 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp @@ -338,7 +338,7 @@ void JitArm64::GenerateCommonAsm() JitRegister::Register(start, GetCodePtr(), "JIT_QuantizedLoad"); - paired_load_quantized = reinterpret_cast<const u8**>(const_cast<u8*>(AlignCode16())); + paired_load_quantized = reinterpret_cast<const u8**>(AlignCode16()); ReserveCodeSpace(8 * sizeof(u8*)); paired_load_quantized[0] = loadPairedFloatTwo; @@ -350,7 +350,7 @@ void JitArm64::GenerateCommonAsm() paired_load_quantized[6] = loadPairedS8Two; paired_load_quantized[7] = loadPairedS16Two; - single_load_quantized = reinterpret_cast<const u8**>(const_cast<u8*>(AlignCode16())); + single_load_quantized = reinterpret_cast<const u8**>(AlignCode16()); ReserveCodeSpace(8 * sizeof(u8*)); single_load_quantized[0] = loadPairedFloatOne; @@ -613,7 +613,7 @@ void JitArm64::GenerateCommonAsm() JitRegister::Register(start, GetCodePtr(), "JIT_QuantizedStore"); - paired_store_quantized = reinterpret_cast<const u8**>(const_cast<u8*>(AlignCode16())); + paired_store_quantized = reinterpret_cast<const u8**>(AlignCode16()); ReserveCodeSpace(32 * sizeof(u8*)); // Fast |