diff options
Diffstat (limited to 'ARMeilleure/Decoders/Decoder.cs')
| -rw-r--r-- | ARMeilleure/Decoders/Decoder.cs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ARMeilleure/Decoders/Decoder.cs b/ARMeilleure/Decoders/Decoder.cs index 46774f41..e4839bf7 100644 --- a/ARMeilleure/Decoders/Decoder.cs +++ b/ARMeilleure/Decoders/Decoder.cs @@ -18,7 +18,7 @@ namespace ARMeilleure.Decoders // For lower code quality translation, we set a lower limit since we're blocking execution. private const int MaxInstsPerFunctionLowCq = 500; - public static Block[] Decode(IMemoryManager memory, ulong address, ExecutionMode mode, bool highCq, bool singleBlock) + public static Block[] Decode(IMemoryManager memory, ulong address, ExecutionMode mode, bool highCq, DecoderMode dMode) { List<Block> blocks = new List<Block>(); @@ -38,7 +38,7 @@ namespace ARMeilleure.Decoders { block = new Block(blkAddress); - if ((singleBlock && visited.Count >= 1) || opsCount > instructionLimit || !memory.IsMapped(blkAddress)) + if ((dMode != DecoderMode.MultipleBlocks && visited.Count >= 1) || opsCount > instructionLimit || !memory.IsMapped(blkAddress)) { block.Exit = true; block.EndAddress = blkAddress; @@ -96,6 +96,12 @@ namespace ARMeilleure.Decoders } } + if (dMode == DecoderMode.SingleInstruction) + { + // Only read at most one instruction + limitAddress = currBlock.Address + 1; + } + FillBlock(memory, mode, currBlock, limitAddress); opsCount += currBlock.OpCodes.Count; @@ -143,7 +149,7 @@ namespace ARMeilleure.Decoders throw new InvalidOperationException($"Decoded a single empty exit block. Entry point = 0x{address:X}."); } - if (!singleBlock) + if (dMode == DecoderMode.MultipleBlocks) { return TailCallRemover.RunPass(address, blocks); } |