From e0eb152fb93151c5da2c15911964355ff068bbd0 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sat, 23 Nov 2013 11:05:19 +0100 Subject: [PATCH] VLD1/VST1: Change argument ordering again. --- Common/ArmEmitter.cpp | 4 ++-- Common/ArmEmitter.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Common/ArmEmitter.cpp b/Common/ArmEmitter.cpp index 176fd2f9b9..0546e0f6e0 100644 --- a/Common/ArmEmitter.cpp +++ b/Common/ArmEmitter.cpp @@ -2371,7 +2371,7 @@ static int RegCountToType(int nRegs, NEONAlignment align) { -void ARMXEmitter::VLD1(u32 Size, ARMReg Vd, ARMReg Rn, int regCount, ARMReg Rm, NEONAlignment align) +void ARMXEmitter::VLD1(u32 Size, ARMReg Vd, ARMReg Rn, int regCount, NEONAlignment align, ARMReg Rm) { u32 spacing = RegCountToType(regCount, align); // Only support loading to 1 reg // Gets encoded as a double register @@ -2382,7 +2382,7 @@ void ARMXEmitter::VLD1(u32 Size, ARMReg Vd, ARMReg Rn, int regCount, ARMReg Rm, | (align << 4) | Rm); } -void ARMXEmitter::VST1(u32 Size, ARMReg Vd, ARMReg Rn, int regCount, ARMReg Rm, NEONAlignment align) +void ARMXEmitter::VST1(u32 Size, ARMReg Vd, ARMReg Rn, int regCount, NEONAlignment align, ARMReg Rm) { u32 spacing = RegCountToType(regCount, align); // Only support loading to 1 reg // Gets encoded as a double register diff --git a/Common/ArmEmitter.h b/Common/ArmEmitter.h index e9fc0bfc31..6bcea2dfd5 100644 --- a/Common/ArmEmitter.h +++ b/Common/ArmEmitter.h @@ -724,8 +724,8 @@ public: // Load/store multiple registers full of elements (a register is a D register) - void VLD1(u32 Size, ARMReg Vd, ARMReg Rn, int regCount, ARMReg Rm = _PC, NEONAlignment align = ALIGN_NONE); - void VST1(u32 Size, ARMReg Vd, ARMReg Rn, int regCount, ARMReg Rm = _PC, NEONAlignment align = ALIGN_NONE); + void VLD1(u32 Size, ARMReg Vd, ARMReg Rn, int regCount, NEONAlignment align = ALIGN_NONE, ARMReg Rm = _PC); + void VST1(u32 Size, ARMReg Vd, ARMReg Rn, int regCount, NEONAlignment align = ALIGN_NONE, ARMReg Rm = _PC); // Load/store single lanes of D registers // TODO