Permalink
Browse files

Merge pull request #7368 from lioncash/const-cast

Arm64Emitter: Make the Align* functions return a non-const data pointer
  • Loading branch information...
delroth committed Aug 27, 2018
2 parents 6a22f1b + 208be26 commit 25898cfa55e26b5ebc5cf307e47cfaf8896cfc74
@@ -328,15 +328,15 @@ void ARM64XEmitter::ReserveCodeSpace(u32 bytes)
BRK(0);
}
const u8* ARM64XEmitter::AlignCode16()
u8* ARM64XEmitter::AlignCode16()
{
int c = int((u64)m_code & 15);
if (c)
ReserveCodeSpace(16 - c);
return m_code;
}
const u8* ARM64XEmitter::AlignCodePage()
u8* ARM64XEmitter::AlignCodePage()
{
int c = int((u64)m_code & 4095);
if (c)
@@ -543,8 +543,8 @@ class ARM64XEmitter
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);
@@ -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

0 comments on commit 25898cf

Please sign in to comment.