diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2020-07-30 11:29:28 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-30 11:29:28 -0300 |
| commit | 9878fc2d3cf4c64f56c44c2a5de013acb6bcbade (patch) | |
| tree | 8f5e5cde68fec213ab61dbee0e121448f0970ca2 /ARMeilleure/Instructions | |
| parent | 57bb0abda3dc277dc7575250fdb080edb83abcbc (diff) | |
Implement inline memory load/store exclusive and ordered (#1413)
* Implement inline memory load/store exclusive
* Fix missing REX prefix on 8-bits CMPXCHG
* Increment PTC version due to bugfix
* Remove redundant memory checks
* Address PR feedback
* Increment PPTC version
Diffstat (limited to 'ARMeilleure/Instructions')
| -rw-r--r-- | ARMeilleure/Instructions/InstEmitMemoryEx.cs | 15 | ||||
| -rw-r--r-- | ARMeilleure/Instructions/InstEmitMemoryEx32.cs | 23 | ||||
| -rw-r--r-- | ARMeilleure/Instructions/InstEmitMemoryExHelper.cs | 185 | ||||
| -rw-r--r-- | ARMeilleure/Instructions/InstEmitMemoryHelper.cs | 119 | ||||
| -rw-r--r-- | ARMeilleure/Instructions/NativeInterface.cs | 195 |
5 files changed, 267 insertions, 270 deletions
diff --git a/ARMeilleure/Instructions/InstEmitMemoryEx.cs b/ARMeilleure/Instructions/InstEmitMemoryEx.cs index 7ca019de..977f23d3 100644 --- a/ARMeilleure/Instructions/InstEmitMemoryEx.cs +++ b/ARMeilleure/Instructions/InstEmitMemoryEx.cs @@ -23,7 +23,7 @@ namespace ARMeilleure.Instructions public static void Clrex(ArmEmitterContext context) { - context.Call(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ClearExclusive))); + EmitClearExclusive(context); } public static void Dmb(ArmEmitterContext context) => EmitBarrier(context); @@ -139,8 +139,6 @@ namespace ARMeilleure.Instructions Operand t = GetIntOrZR(context, op.Rt); - Operand s = null; - if (pair) { Debug.Assert(op.Size == 2 || op.Size == 3, "Invalid size for pairwise store."); @@ -159,18 +157,11 @@ namespace ARMeilleure.Instructions value = context.VectorInsert(value, t2, 1); } - s = EmitStoreExclusive(context, address, value, exclusive, op.Size + 1); + EmitStoreExclusive(context, address, value, exclusive, op.Size + 1, op.Rs, a32: false); } else { - s = EmitStoreExclusive(context, address, t, exclusive, op.Size); - } - - if (s != null) - { - // This is only needed for exclusive stores. The function returns 0 - // when the store is successful, and 1 otherwise. - SetIntOrZR(context, op.Rs, s); + EmitStoreExclusive(context, address, t, exclusive, op.Size, op.Rs, a32: false); } } diff --git a/ARMeilleure/Instructions/InstEmitMemoryEx32.cs b/ARMeilleure/Instructions/InstEmitMemoryEx32.cs index e8e660ee..abe61cd8 100644 --- a/ARMeilleure/Instructions/InstEmitMemoryEx32.cs +++ b/ARMeilleure/Instructions/InstEmitMemoryEx32.cs @@ -13,7 +13,7 @@ namespace ARMeilleure.Instructions { public static void Clrex(ArmEmitterContext context) { - context.Call(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ClearExclusive))); + EmitClearExclusive(context); } public static void Dmb(ArmEmitterContext context) => EmitBarrier(context); @@ -198,34 +198,21 @@ namespace ARMeilleure.Instructions context.BranchIfTrue(lblBigEndian, GetFlag(PState.EFlag)); Operand leResult = context.BitwiseOr(lo, context.ShiftLeft(hi, Const(32))); - Operand leS = EmitStoreExclusive(context, address, leResult, exclusive, size); - if (exclusive) - { - SetIntA32(context, op.Rd, leS); - } + EmitStoreExclusive(context, address, leResult, exclusive, size, op.Rd, a32: true); context.Branch(lblEnd); context.MarkLabel(lblBigEndian); Operand beResult = context.BitwiseOr(hi, context.ShiftLeft(lo, Const(32))); - Operand beS = EmitStoreExclusive(context, address, beResult, exclusive, size); - if (exclusive) - { - SetIntA32(context, op.Rd, beS); - } + EmitStoreExclusive(context, address, beResult, exclusive, size, op.Rd, a32: true); context.MarkLabel(lblEnd); } else { - Operand s = EmitStoreExclusive(context, address, context.ZeroExtend32(OperandType.I64, GetIntA32(context, op.Rt)), exclusive, size); - // This is only needed for exclusive stores. The function returns 0 - // when the store is successful, and 1 otherwise. - if (exclusive) - { - SetIntA32(context, op.Rd, s); - } + Operand value = context.ZeroExtend32(OperandType.I64, GetIntA32(context, op.Rt)); + EmitStoreExclusive(context, address, value, exclusive, size, op.Rd, a32: true); } } } diff --git a/ARMeilleure/Instructions/InstEmitMemoryExHelper.cs b/ARMeilleure/Instructions/InstEmitMemoryExHelper.cs index 059b9b6a..a22cd235 100644 --- a/ARMeilleure/Instructions/InstEmitMemoryExHelper.cs +++ b/ARMeilleure/Instructions/InstEmitMemoryExHelper.cs @@ -1,87 +1,180 @@ using ARMeilleure.IntermediateRepresentation; +using ARMeilleure.State; using ARMeilleure.Translation; -using System.Reflection; + +using static ARMeilleure.Instructions.InstEmitHelper; +using static ARMeilleure.IntermediateRepresentation.OperandHelper; namespace ARMeilleure.Instructions { static class InstEmitMemoryExHelper { - public static Operand EmitLoadExclusive( - ArmEmitterContext context, - Operand address, - bool exclusive, - int size) - { - MethodInfo info = null; + private const int ErgSizeLog2 = 4; + public static Operand EmitLoadExclusive(ArmEmitterContext context, Operand address, bool exclusive, int size) + { if (exclusive) { - switch (size) + Operand value; + + if (size == 4) { - case 0: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadByteExclusive)); break; - case 1: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadUInt16Exclusive)); break; - case 2: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadUInt32Exclusive)); break; - case 3: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadUInt64Exclusive)); break; - case 4: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadVector128Exclusive)); break; + Operand isUnalignedAddr = InstEmitMemoryHelper.EmitAddressCheck(context, address, size); + + Operand lblFastPath = Label(); + + context.BranchIfFalse(lblFastPath, isUnalignedAddr); + + // The call is not expected to return (it should throw). + context.Call(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ThrowInvalidMemoryAccess)), address); + + context.MarkLabel(lblFastPath); + + // Only 128-bit CAS is guaranteed to have a atomic load. + Operand physAddr = InstEmitMemoryHelper.EmitPtPointerLoad(context, address, null, write: false); + + Operand zero = context.VectorZero(); + + value = context.CompareAndSwap(physAddr, zero, zero); } + else + { + value = InstEmitMemoryHelper.EmitReadIntAligned(context, address, size); + } + + Operand arg0 = context.LoadArgument(OperandType.I64, 0); + + Operand exAddrPtr = context.Add(arg0, Const((long)NativeContext.GetExclusiveAddressOffset())); + Operand exValuePtr = context.Add(arg0, Const((long)NativeContext.GetExclusiveValueOffset())); + + context.Store(exAddrPtr, context.BitwiseAnd(address, Const(address.Type, GetExclusiveAddressMask()))); + context.Store(exValuePtr, value); + + return value; } else { - switch (size) - { - case 0: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadByte)); break; - case 1: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadUInt16)); break; - case 2: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadUInt32)); break; - case 3: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadUInt64)); break; - case 4: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadVector128)); break; - } + return InstEmitMemoryHelper.EmitReadIntAligned(context, address, size); } - - return context.Call(info, address); } - public static Operand EmitStoreExclusive( + public static void EmitStoreExclusive( ArmEmitterContext context, Operand address, Operand value, bool exclusive, - int size) + int size, + int rs, + bool a32) { if (size < 3) { value = context.ConvertI64ToI32(value); } - MethodInfo info = null; - if (exclusive) { - switch (size) + void SetRs(Operand value) { - case 0: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteByteExclusive)); break; - case 1: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteUInt16Exclusive)); break; - case 2: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteUInt32Exclusive)); break; - case 3: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteUInt64Exclusive)); break; - case 4: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteVector128Exclusive)); break; + if (a32) + { + SetIntA32(context, rs, value); + } + else + { + SetIntOrZR(context, rs, value); + } } - return context.Call(info, address, value); - } - else - { - switch (size) + Operand arg0 = context.LoadArgument(OperandType.I64, 0); + + Operand exAddrPtr = context.Add(arg0, Const((long)NativeContext.GetExclusiveAddressOffset())); + Operand exAddr = context.Load(address.Type, exAddrPtr); + + // STEP 1: Check if we have exclusive access to this memory region. If not, fail and skip store. + Operand maskedAddress = context.BitwiseAnd(address, Const(GetExclusiveAddressMask())); + + Operand exFailed = context.ICompareNotEqual(exAddr, maskedAddress); + + Operand lblExit = Label(); + + SetRs(exFailed); + + context.BranchIfTrue(lblExit, exFailed); + + // STEP 2: We have exclusive access, make sure that the address is valid. + Operand isUnalignedAddr = InstEmitMemoryHelper.EmitAddressCheck(context, address, size); + + Operand lblFastPath = Label(); + + context.BranchIfFalse(lblFastPath, isUnalignedAddr); + + // The call is not expected to return (it should throw). + context.Call(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ThrowInvalidMemoryAccess)), address); + + // STEP 3: We have exclusive access and the address is valid, attempt the store using CAS. + context.MarkLabel(lblFastPath); + + Operand physAddr = InstEmitMemoryHelper.EmitPtPointerLoad(context, address, null, write: true); + + Operand exValuePtr = context.Add(arg0, Const((long)NativeContext.GetExclusiveValueOffset())); + Operand exValue = size switch { - case 0: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteByte)); break; - case 1: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteUInt16)); break; - case 2: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteUInt32)); break; - case 3: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteUInt64)); break; - case 4: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.WriteVector128)); break; + 0 => context.Load8(exValuePtr), + 1 => context.Load16(exValuePtr), + 2 => context.Load(OperandType.I32, exValuePtr), + 3 => context.Load(OperandType.I64, exValuePtr), + _ => context.Load(OperandType.V128, exValuePtr) + }; + + Operand currValue = size switch + { + 0 => context.CompareAndSwap8(physAddr, exValue, value), + 1 => context.CompareAndSwap16(physAddr, exValue, value), + _ => context.CompareAndSwap(physAddr, exValue, value) + }; + + // STEP 4: Check if we succeeded by comparing expected and in-memory values. + Operand storeFailed; + + if (size == 4) + { + Operand currValueLow = context.VectorExtract(OperandType.I64, currValue, 0); + Operand currValueHigh = context.VectorExtract(OperandType.I64, currValue, 1); + + Operand exValueLow = context.VectorExtract(OperandType.I64, exValue, 0); + Operand exValueHigh = context.VectorExtract(OperandType.I64, exValue, 1); + + storeFailed = context.BitwiseOr( + context.ICompareNotEqual(currValueLow, exValueLow), + context.ICompareNotEqual(currValueHigh, exValueHigh)); + } + else + { + storeFailed = context.ICompareNotEqual(currValue, exValue); } - context.Call(info, address, value); + SetRs(storeFailed); - return null; + context.MarkLabel(lblExit); + } + else + { + InstEmitMemoryHelper.EmitWriteIntAligned(context, address, value, size); } } + + public static void EmitClearExclusive(ArmEmitterContext context) + { + Operand arg0 = context.LoadArgument(OperandType.I64, 0); + + Operand exAddrPtr = context.Add(arg0, Const((long)NativeContext.GetExclusiveAddressOffset())); + + // We store ULONG max to force any exclusive address checks to fail, + // since this value is not aligned to the ERG mask. + context.Store(exAddrPtr, Const(ulong.MaxValue)); + } + + private static long GetExclusiveAddressMask() => ~((4L << ErgSizeLog2) - 1); } } diff --git a/ARMeilleure/Instructions/InstEmitMemoryHelper.cs b/ARMeilleure/Instructions/InstEmitMemoryHelper.cs index 0c47be61..1fe82b62 100644 --- a/ARMeilleure/Instructions/InstEmitMemoryHelper.cs +++ b/ARMeilleure/Instructions/InstEmitMemoryHelper.cs @@ -140,7 +140,7 @@ namespace ARMeilleure.Instructions context.MarkLabel(lblFastPath); - Operand physAddr = EmitPtPointerLoad(context, address, lblSlowPath); + Operand physAddr = EmitPtPointerLoad(context, address, lblSlowPath, write: false); Operand value = null; @@ -157,6 +157,36 @@ namespace ARMeilleure.Instructions context.MarkLabel(lblEnd); } + public static Operand EmitReadIntAligned(ArmEmitterContext context, Operand address, int size) + { + if ((uint)size > 4) + { + throw new ArgumentOutOfRangeException(nameof(size)); + } + + Operand isUnalignedAddr = EmitAddressCheck(context, address, size); + + Operand lblFastPath = Label(); + + context.BranchIfFalse(lblFastPath, isUnalignedAddr); + + // The call is not expected to return (it should throw). + context.Call(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ThrowInvalidMemoryAccess)), address); + + context.MarkLabel(lblFastPath); + + Operand physAddr = EmitPtPointerLoad(context, address, null, write: false); + + return size switch + { + 0 => context.Load8(physAddr), + 1 => context.Load16(physAddr), + 2 => context.Load(OperandType.I32, physAddr), + 3 => context.Load(OperandType.I64, physAddr), + _ => context.Load(OperandType.V128, physAddr) + }; + } + private static void EmitReadVector( ArmEmitterContext context, Operand address, @@ -181,7 +211,7 @@ namespace ARMeilleure.Instructions context.MarkLabel(lblFastPath); - Operand physAddr = EmitPtPointerLoad(context, address, lblSlowPath); + Operand physAddr = EmitPtPointerLoad(context, address, lblSlowPath, write: false); Operand value = null; @@ -222,7 +252,7 @@ namespace ARMeilleure.Instructions context.MarkLabel(lblFastPath); - Operand physAddr = EmitPtPointerLoad(context, address, lblSlowPath); + Operand physAddr = EmitPtPointerLoad(context, address, lblSlowPath, write: true); Operand value = GetInt(context, rt); @@ -242,6 +272,45 @@ namespace ARMeilleure.Instructions context.MarkLabel(lblEnd); } + public static void EmitWriteIntAligned(ArmEmitterContext context, Operand address, Operand value, int size) + { + if ((uint)size > 4) + { + throw new ArgumentOutOfRangeException(nameof(size)); + } + + Operand isUnalignedAddr = EmitAddressCheck(context, address, size); + + Operand lblFastPath = Label(); + + context.BranchIfFalse(lblFastPath, isUnalignedAddr); + + // The call is not expected to return (it should throw). + context.Call(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ThrowInvalidMemoryAccess)), address); + + context.MarkLabel(lblFastPath); + + Operand physAddr = EmitPtPointerLoad(context, address, null, write: true); + + if (size < 3 && value.Type == OperandType.I64) + { + value = context.ConvertI64ToI32(value); + } + + if (size == 0) + { + context.Store8(physAddr, value); + } + else if (size == 1) + { + context.Store16(physAddr, value); + } + else + { + context.Store(physAddr, value); + } + } + private static void EmitWriteVector( ArmEmitterContext context, Operand address, @@ -265,7 +334,7 @@ namespace ARMeilleure.Instructions context.MarkLabel(lblFastPath); - Operand physAddr = EmitPtPointerLoad(context, address, lblSlowPath); + Operand physAddr = EmitPtPointerLoad(context, address, lblSlowPath, write: true); Operand value = GetVec(rt); @@ -281,7 +350,7 @@ namespace ARMeilleure.Instructions context.MarkLabel(lblEnd); } - private static Operand EmitAddressCheck(ArmEmitterContext context, Operand address, int size) + public static Operand EmitAddressCheck(ArmEmitterContext context, Operand address, int size) { ulong addressCheckMask = ~((1UL << context.Memory.AddressSpaceBits) - 1); @@ -290,7 +359,7 @@ namespace ARMeilleure.Instructions return context.BitwiseAnd(address, Const(address.Type, (long)addressCheckMask)); } - private static Operand EmitPtPointerLoad(ArmEmitterContext context, Operand address, Operand lblSlowPath) + public static Operand EmitPtPointerLoad(ArmEmitterContext context, Operand address, Operand lblSlowPath, bool write) { int ptLevelBits = context.Memory.AddressSpaceBits - 12; // 12 = Number of page bits. int ptLevelSize = 1 << ptLevelBits; @@ -302,6 +371,12 @@ namespace ARMeilleure.Instructions int bit = PageBits; + // Load page table entry from the page table. + // This was designed to support multi-level page tables of any size, however right + // now we only use flat page tables (so there's only one level). + // The page table entry contains the host address where the page is located. + // Additionally, the higher 16-bits of the host address may contain extra information + // used for write tracking, so this must be handled here aswell. do { Operand addrPart = context.ShiftRightUI(address, Const(bit)); @@ -326,7 +401,37 @@ namespace ARMeilleure.Instructions } while (bit < context.Memory.AddressSpaceBits); - context.BranchIfTrue(lblSlowPath, context.ICompareLessOrEqual(pte, Const(0L))); + if (lblSlowPath != null) + { + context.BranchIfTrue(lblSlowPath, context.ICompareLessOrEqual(pte, Const(0L))); + } + else + { + // When no label is provided to jump to a slow path if the address is invalid, + // we do the validation ourselves, and throw if needed. + if (write) + { + Operand lblNotWatched = Label(); + + // Is the page currently being monitored for modifications? If so we need to call MarkRegionAsModified. + context.BranchIfTrue(lblNotWatched, context.ICompareGreaterOrEqual(pte, Const(0L))); + + // Mark the region as modified. Size here doesn't matter as address is assumed to be size aligned here. + context.Call(typeof(NativeInterface).GetMethod(nameof(NativeInterface.MarkRegionAsModified)), address, Const(1UL)); + context.MarkLabel(lblNotWatched); + } + + Operand lblNonNull = Label(); + + // Skip exception if the PTE address is non-null (not zero). + context.BranchIfTrue(lblNonNull, pte); + + // The call is not expected to return (it should throw). + context.Call(typeof(NativeInterface).GetMethod(nameof(NativeInterface.ThrowInvalidMemoryAccess)), address); + context.MarkLabel(lblNonNull); + + pte = context.BitwiseAnd(pte, Const(0xffffffffffffUL)); + } Operand pageOffset = context.BitwiseAnd(address, Const(address.Type, PageMask)); diff --git a/ARMeilleure/Instructions/NativeInterface.cs b/ARMeilleure/Instructions/NativeInterface.cs index 1b2a9288..e8f0db84 100644 --- a/ARMeilleure/Instructions/NativeInterface.cs +++ b/ARMeilleure/Instructions/NativeInterface.cs @@ -3,38 +3,29 @@ using ARMeilleure.State; using ARMeilleure.Translation; using System; using System.Runtime.InteropServices; -using System.Threading; namespace ARMeilleure.Instructions { static class NativeInterface { - private const int ErgSizeLog2 = 4; - private class ThreadContext { - public State.ExecutionContext Context { get; } + public ExecutionContext Context { get; } public IMemoryManager Memory { get; } public Translator Translator { get; } - public ulong ExclusiveAddress { get; set; } - public ulong ExclusiveValueLow { get; set; } - public ulong ExclusiveValueHigh { get; set; } - - public ThreadContext(State.ExecutionContext context, IMemoryManager memory, Translator translator) + public ThreadContext(ExecutionContext context, IMemoryManager memory, Translator translator) { Context = context; Memory = memory; Translator = translator; - - ExclusiveAddress = ulong.MaxValue; } } [ThreadStatic] private static ThreadContext _context; - public static void RegisterThread(State.ExecutionContext context, IMemoryManager memory, Translator translator) + public static void RegisterThread(ExecutionContext context, IMemoryManager memory, Translator translator) { _context = new ThreadContext(context, memory, translator); } @@ -202,63 +193,6 @@ namespace ARMeilleure.Instructions } #endregion - #region "Read exclusive" - public static byte ReadByteExclusive(ulong address) - { - byte value = _context.Memory.Read<byte>(address); - - _context.ExclusiveAddress = GetMaskedExclusiveAddress(address); - _context.ExclusiveValueLow = value; - _context.ExclusiveValueHigh = 0; - - return value; - } - - public static ushort ReadUInt16Exclusive(ulong address) - { - ushort value = _context.Memory.Read<ushort>(address); - - _context.ExclusiveAddress = GetMaskedExclusiveAddress(address); - _context.ExclusiveValueLow = value; - _context.ExclusiveValueHigh = 0; - - return value; - } - - public static uint ReadUInt32Exclusive(ulong address) - { - uint value = _context.Memory.Read<uint>(address); - - _context.ExclusiveAddress = GetMaskedExclusiveAddress(address); - _context.ExclusiveValueLow = value; - _context.ExclusiveValueHigh = 0; - - return value; - } - - public static ulong ReadUInt64Exclusive(ulong address) - { - ulong value = _context.Memory.Read<ulong>(address); - - _context.ExclusiveAddress = GetMaskedExclusiveAddress(address); - _context.ExclusiveValueLow = value; - _context.ExclusiveValueHigh = 0; - - return value; - } - - public static V128 ReadVector128Exclusive(ulong address) - { - V128 value = MemoryManagerPal.AtomicLoad128(ref _context.Memory.GetRef<V128>(address)); - - _context.ExclusiveAddress = GetMaskedExclusiveAddress(address); - _context.ExclusiveValueLow = value.Extract<ulong>(0); - _context.ExclusiveValueHigh = value.Extract<ulong>(1); - - return value; - } - #endregion - #region "Write" public static void WriteByte(ulong address, byte value) { @@ -286,122 +220,14 @@ namespace ARMeilleure.Instructions } #endregion - #region "Write exclusive" - public static int WriteByteExclusive(ulong address, byte value) - { - bool success = _context.ExclusiveAddress == GetMaskedExclusiveAddress(address); - - if (success) - { - ref int valueRef = ref _context.Memory.GetRefNoChecks<int>(address); - - int currentValue = valueRef; - - byte expected = (byte)_context.ExclusiveValueLow; - - int expected32 = (currentValue & ~byte.MaxValue) | expected; - int desired32 = (currentValue & ~byte.MaxValue) | value; - - success = Interlocked.CompareExchange(ref valueRef, desired32, expected32) == expected32; - - if (success) - { - ClearExclusive(); - } - } - - return success ? 0 : 1; - } - - public static int WriteUInt16Exclusive(ulong address, ushort value) + public static void MarkRegionAsModified(ulong address, ulong size) { - bool success = _context.ExclusiveAddress == GetMaskedExclusiveAddress(address); - - if (success) - { - ref int valueRef = ref _context.Memory.GetRefNoChecks<int>(address); - - int currentValue = valueRef; - - ushort expected = (ushort)_context.ExclusiveValueLow; - - int expected32 = (currentValue & ~ushort.MaxValue) | expected; - int desired32 = (currentValue & ~ushort.MaxValue) | value; - - success = Interlocked.CompareExchange(ref valueRef, desired32, expected32) == expected32; - - if (success) - { - ClearExclusive(); - } - } - - return success ? 0 : 1; + GetMemoryManager().MarkRegionAsModified(address, size); } - public static int WriteUInt32Exclusive(ulong address, uint value) + public static void ThrowInvalidMemoryAccess(ulong address) { - bool success = _context.ExclusiveAddress == GetMaskedExclusiveAddress(address); - - if (success) - { - ref int valueRef = ref _context.Memory.GetRef<int>(address); - - success = Interlocked.CompareExchange(ref valueRef, (int)value, (int)_context.ExclusiveValueLow) == (int)_context.ExclusiveValueLow; - - if (success) - { - ClearExclusive(); - } - } - - return success ? 0 : 1; - } - - public static int WriteUInt64Exclusive(ulong address, ulong value) - { - bool success = _context.ExclusiveAddress == GetMaskedExclusiveAddress(address); - - if (success) - { - ref long valueRef = ref _context.Memory.GetRef<long>(address); - - success = Interlocked.CompareExchange(ref valueRef, (long)value, (long)_context.ExclusiveValueLow) == (long)_context.ExclusiveValueLow; - - if (success) - { - ClearExclusive(); - } - } - - return success ? 0 : 1; - } - - public static int WriteVector128Exclusive(ulong address, V128 value) - { - bool success = _context.ExclusiveAddress == GetMaskedExclusiveAddress(address); - - if (success) - { - V128 expected = new V128(_context.ExclusiveValueLow, _context.ExclusiveValueHigh); - - ref V128 location = ref _context.Memory.GetRef<V128>(address); - - success = MemoryManagerPal.CompareAndSwap128(ref location, expected, value) == expected; - - if (success) - { - ClearExclusive(); - } - } - - return success ? 0 : 1; - } - #endregion - - private static ulong GetMaskedExclusiveAddress(ulong address) - { - return address & ~((4UL << ErgSizeLog2) - 1); + throw new InvalidAccessException(address); } public static ulong GetFunctionAddress(ulong address) @@ -426,11 +252,6 @@ namespace ARMeilleure.Instructions return ptr; } - public static void ClearExclusive() - { - _context.ExclusiveAddress = ulong.MaxValue; - } - public static bool CheckSynchronization() { Statistics.PauseTimer(); @@ -444,7 +265,7 @@ namespace ARMeilleure.Instructions return context.Running; } - public static State.ExecutionContext GetContext() + public static ExecutionContext GetContext() { return _context.Context; } |
