From 108a6886f9ff4e0b905fa642de987a79d6348de2 Mon Sep 17 00:00:00 2001 From: merry Date: Fri, 11 Feb 2022 21:12:45 +0000 Subject: [PATCH] T16: Implement NOP --- ARMeilleure/Decoders/OpCodeT16.cs | 2 ++ ARMeilleure/Decoders/OpCodeTable.cs | 1 + 2 files changed, 3 insertions(+) diff --git a/ARMeilleure/Decoders/OpCodeT16.cs b/ARMeilleure/Decoders/OpCodeT16.cs index 2afd71bc8..4c7945f90 100644 --- a/ARMeilleure/Decoders/OpCodeT16.cs +++ b/ARMeilleure/Decoders/OpCodeT16.cs @@ -2,6 +2,8 @@ namespace ARMeilleure.Decoders { class OpCodeT16 : OpCode32 { + public new static OpCode Create(InstDescriptor inst, ulong address, int opCode, bool inITBlock) => new OpCodeT16(inst, address, opCode, inITBlock); + public OpCodeT16(InstDescriptor inst, ulong address, int opCode, bool inITBlock) : base(inst, address, opCode, inITBlock) { Cond = Condition.Al; diff --git a/ARMeilleure/Decoders/OpCodeTable.cs b/ARMeilleure/Decoders/OpCodeTable.cs index 37bdce2ca..4f99e26ce 100644 --- a/ARMeilleure/Decoders/OpCodeTable.cs +++ b/ARMeilleure/Decoders/OpCodeTable.cs @@ -1036,6 +1036,7 @@ namespace ARMeilleure.Decoders SetT16("1011101011xxxxxx", InstName.Revsh, InstEmit32.Revsh, OpCodeT16AluRegLow.Create); SetT16("101110x1xxxxxxxx", InstName.Cbnz, InstEmit32.Cbnz, OpCodeT16BImmCmp.Create); SetT16("1011110xxxxxxxxx", InstName.Pop, InstEmit32.Ldm, OpCodeT16MemStack.Create); + SetT16("10111111xxxx0000", InstName.Nop, InstEmit32.Nop, OpCodeT16.Create); #endregion FillFastLookupTable(InstA32FastLookup, AllInstA32, ToFastLookupIndexA);