diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2022-09-09 22:09:11 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-09 22:09:11 -0300 |
| commit | c64524a240671cb3f8609e3454576e69e5948a60 (patch) | |
| tree | b02fe220963b33b4292adf7b4a5236dae6bc0b05 /ARMeilleure/Instructions/InstEmitMemoryHelper.cs | |
| parent | db45688aa8d0e63d3ffbe50351722ef32f8360f8 (diff) | |
Add ADD (zx imm12), NOP, MOV (rs), LDA, TBB, TBH, MOV (zx imm16) and CLZ thumb instructions (#3683)1.1.256
* Add ADD (zx imm12), NOP, MOV (register shifted), LDA, TBB, TBH, MOV (zx imm16) and CLZ thumb instructions, fix LDRD, STRD, CBZ, CBNZ and BLX (reg)
* Bump PPTC version
Diffstat (limited to 'ARMeilleure/Instructions/InstEmitMemoryHelper.cs')
| -rw-r--r-- | ARMeilleure/Instructions/InstEmitMemoryHelper.cs | 42 |
1 files changed, 41 insertions, 1 deletions
diff --git a/ARMeilleure/Instructions/InstEmitMemoryHelper.cs b/ARMeilleure/Instructions/InstEmitMemoryHelper.cs index 2877d53e..f97e395c 100644 --- a/ARMeilleure/Instructions/InstEmitMemoryHelper.cs +++ b/ARMeilleure/Instructions/InstEmitMemoryHelper.cs @@ -123,6 +123,41 @@ namespace ARMeilleure.Instructions context.CurrOp is OpCodeSimdMemSs); } + public static Operand EmitReadInt(ArmEmitterContext context, Operand address, int size) + { + Operand temp = context.AllocateLocal(size == 3 ? OperandType.I64 : OperandType.I32); + + Operand lblSlowPath = Label(); + Operand lblEnd = Label(); + + Operand physAddr = EmitPtPointerLoad(context, address, lblSlowPath, write: false, size); + + Operand value = default; + + switch (size) + { + case 0: value = context.Load8 (physAddr); break; + case 1: value = context.Load16(physAddr); break; + case 2: value = context.Load (OperandType.I32, physAddr); break; + case 3: value = context.Load (OperandType.I64, physAddr); break; + } + + context.Copy(temp, value); + + if (!context.Memory.Type.IsHostMapped()) + { + context.Branch(lblEnd); + + context.MarkLabel(lblSlowPath, BasicBlockFrequency.Cold); + + context.Copy(temp, EmitReadIntFallback(context, address, size)); + + context.MarkLabel(lblEnd); + } + + return temp; + } + private static void EmitReadInt(ArmEmitterContext context, Operand address, int rt, int size) { Operand lblSlowPath = Label(); @@ -420,6 +455,11 @@ namespace ARMeilleure.Instructions private static void EmitReadIntFallback(ArmEmitterContext context, Operand address, int rt, int size) { + SetInt(context, rt, EmitReadIntFallback(context, address, size)); + } + + private static Operand EmitReadIntFallback(ArmEmitterContext context, Operand address, int size) + { MethodInfo info = null; switch (size) @@ -430,7 +470,7 @@ namespace ARMeilleure.Instructions case 3: info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.ReadUInt64)); break; } - SetInt(context, rt, context.Call(info, address)); + return context.Call(info, address); } private static void EmitReadVectorFallback( |