From edbd4bfc298b715b0e25680824136e3d528580a2 Mon Sep 17 00:00:00 2001 From: svc64 Date: Sat, 7 Oct 2023 13:34:54 +0300 Subject: [PATCH] Revert "Return the address of the current instruction in EmitSynchronization" This reverts commit 1331589a22ccf21c02951db96d0335a10738ae4c. --- src/ARMeilleure/Translation/Translator.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ARMeilleure/Translation/Translator.cs b/src/ARMeilleure/Translation/Translator.cs index 035005aa19..e68fd34d99 100644 --- a/src/ARMeilleure/Translation/Translator.cs +++ b/src/ARMeilleure/Translation/Translator.cs @@ -491,7 +491,7 @@ namespace ARMeilleure.Translation context.MarkLabel(lblEnd); } - internal static void EmitSynchronization(ArmEmitterContext context) + internal static void EmitSynchronization(EmitterContext context) { long countOffs = NativeContext.GetCounterOffset(); @@ -505,8 +505,7 @@ namespace ARMeilleure.Translation Operand running = context.Call(typeof(NativeInterface).GetMethod(nameof(NativeInterface.CheckSynchronization))); context.BranchIfTrue(lblExit, running, BasicBlockFrequency.Cold); - OpCode op = context.CurrOp; - context.Return(op != null ? Const(op.Address) : Const(0L)); + context.Return(Const(0L)); context.MarkLabel(lblNonZero); count = context.Subtract(count, Const(1));