Translate higher quality code for indirect jumps aswell, and on some cases that were missed when lower quality (tier 0) code was available

ChocolArm64/Instructions/InstEmitFlow.cs

@@ -1,6 +1,7 @@
 using ChocolArm64.Decoders;
 using ChocolArm64.State;
 using ChocolArm64.Translation;
+using System.Reflection;
 using System.Reflection.Emit;
 
 namespace ChocolArm64.Instructions
@@ -61,6 +62,20 @@ namespace ChocolArm64.Instructions
             context.EmitStoreState();
             context.EmitLdintzr(op.Rn);
 
+            context.Emit(OpCodes.Dup);
+
+            context.EmitSttmp();
+            context.EmitLdarg(TranslatedSub.StateArgIdx);
+
+            context.EmitFieldLoad(typeof(CpuThreadState).GetField(nameof(CpuThreadState.CurrentTranslator),
+                BindingFlags.Instance |
+                BindingFlags.NonPublic));
+
+            context.EmitLdarg(TranslatedSub.StateArgIdx);
+            context.EmitLdtmp();
+
+            context.EmitPrivateCall(typeof(Translator), nameof(Translator.TranslateVirtualSubroutine));
+
             context.Emit(OpCodes.Ret);
         }
 

ChocolArm64/Translation/Translator.cs

@@ -72,16 +72,27 @@ namespace ChocolArm64.Translation
             state.CurrentTranslator = null;
         }
 
-        internal TranslatedSub GetOrTranslateVirtualSubroutine(CpuThreadState state, long position)
+        internal void TranslateVirtualSubroutine(CpuThreadState state, long position)
         {
-            if (!_cache.TryGetSubroutine(position, out TranslatedSub subroutine))
+            if (!_cache.TryGetSubroutine(position, out TranslatedSub sub) || sub.Tier == TranslationTier.Tier0)
             {
                 _queue.Enqueue(new TranslatorQueueItem(position, state.GetExecutionMode(), TranslationTier.Tier1));
+            }
+        }
 
-                subroutine = TranslateLowCq(position, state.GetExecutionMode());
+        internal TranslatedSub GetOrTranslateVirtualSubroutine(CpuThreadState state, long position)
+        {
+            if (!_cache.TryGetSubroutine(position, out TranslatedSub sub))
+            {
+                sub = TranslateLowCq(position, state.GetExecutionMode());
             }
 
-            return subroutine;
+            if (sub.Tier == TranslationTier.Tier0)
+            {
+                _queue.Enqueue(new TranslatorQueueItem(position, state.GetExecutionMode(), TranslationTier.Tier1));
+            }
+
+            return sub;
         }
 
         internal TranslatedSub GetOrTranslateSubroutine(CpuThreadState state, long position)

ChocolArm64/Translation/TranslatorQueue.cs

@@ -31,6 +31,8 @@ namespace ChocolArm64.Translation
         {
             ConcurrentStack<TranslatorQueueItem> queue = _translationQueue[(int)item.Tier];
 
+            System.Console.WriteLine("qc " + queue.Count);
+
             if (queue.Count >= MaxQueueSize)
             {
                 queue.TryPop(out _);