From a363f4fa3ee5712750078092abbeeebeeb211a9c Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Wed, 20 Aug 2014 02:54:30 +0200 Subject: [PATCH 1/2] x64Emitter: make 'packed' parameter a bool --- Source/Core/Common/x64Emitter.cpp | 2 +- Source/Core/Common/x64Emitter.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Common/x64Emitter.cpp b/Source/Core/Common/x64Emitter.cpp index 206a48196e..6a04e2b20d 100644 --- a/Source/Core/Common/x64Emitter.cpp +++ b/Source/Core/Common/x64Emitter.cpp @@ -151,7 +151,7 @@ void OpArg::WriteRex(XEmitter *emit, int opBits, int bits, int customOp) const } } -void OpArg::WriteVex(XEmitter* emit, int size, int packed, Gen::X64Reg regOp1, Gen::X64Reg regOp2) const +void OpArg::WriteVex(XEmitter* emit, int size, bool packed, Gen::X64Reg regOp1, Gen::X64Reg regOp2) const { int R = !(regOp1 & 8); int X = !(indexReg & 8); diff --git a/Source/Core/Common/x64Emitter.h b/Source/Core/Common/x64Emitter.h index 020954a33d..1d220a30b0 100644 --- a/Source/Core/Common/x64Emitter.h +++ b/Source/Core/Common/x64Emitter.h @@ -123,7 +123,7 @@ struct OpArg offset = _offset; } void WriteRex(XEmitter *emit, int opBits, int bits, int customOp = -1) const; - void WriteVex(XEmitter* emit, int size, int packed, Gen::X64Reg regOp1, X64Reg regOp2) const; + void WriteVex(XEmitter* emit, int size, bool packed, Gen::X64Reg regOp1, X64Reg regOp2) const; void WriteRest(XEmitter *emit, int extraBytes=0, X64Reg operandReg=(X64Reg)0xFF, bool warn_64bit_offset = true) const; void WriteFloatModRM(XEmitter *emit, FloatOp op); void WriteSingleByteOp(XEmitter *emit, u8 op, X64Reg operandReg, int bits); From 80be585feff48b934943f23714f77ae94e4776b7 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Wed, 20 Aug 2014 02:56:07 +0200 Subject: [PATCH 2/2] x64Emitter: remove redundant "Gen::" --- Source/Core/Common/x64Emitter.cpp | 2 +- Source/Core/Common/x64Emitter.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/Common/x64Emitter.cpp b/Source/Core/Common/x64Emitter.cpp index 6a04e2b20d..654dee26be 100644 --- a/Source/Core/Common/x64Emitter.cpp +++ b/Source/Core/Common/x64Emitter.cpp @@ -151,7 +151,7 @@ void OpArg::WriteRex(XEmitter *emit, int opBits, int bits, int customOp) const } } -void OpArg::WriteVex(XEmitter* emit, int size, bool packed, Gen::X64Reg regOp1, Gen::X64Reg regOp2) const +void OpArg::WriteVex(XEmitter* emit, int size, bool packed, X64Reg regOp1, X64Reg regOp2) const { int R = !(regOp1 & 8); int X = !(indexReg & 8); diff --git a/Source/Core/Common/x64Emitter.h b/Source/Core/Common/x64Emitter.h index 1d220a30b0..234d61e0cc 100644 --- a/Source/Core/Common/x64Emitter.h +++ b/Source/Core/Common/x64Emitter.h @@ -123,7 +123,7 @@ struct OpArg offset = _offset; } void WriteRex(XEmitter *emit, int opBits, int bits, int customOp = -1) const; - void WriteVex(XEmitter* emit, int size, bool packed, Gen::X64Reg regOp1, X64Reg regOp2) const; + void WriteVex(XEmitter* emit, int size, bool packed, X64Reg regOp1, X64Reg regOp2) const; void WriteRest(XEmitter *emit, int extraBytes=0, X64Reg operandReg=(X64Reg)0xFF, bool warn_64bit_offset = true) const; void WriteFloatModRM(XEmitter *emit, FloatOp op); void WriteSingleByteOp(XEmitter *emit, u8 op, X64Reg operandReg, int bits); @@ -708,12 +708,12 @@ public: void ABI_CallFunctionCCCP(void *func, u32 param1, u32 param2,u32 param3, void *param4); void ABI_CallFunctionPC(void *func, void *param1, u32 param2); void ABI_CallFunctionPPC(void *func, void *param1, void *param2,u32 param3); - void ABI_CallFunctionAC(void *func, const Gen::OpArg &arg1, u32 param2); - void ABI_CallFunctionA(void *func, const Gen::OpArg &arg1); + void ABI_CallFunctionAC(void *func, const OpArg &arg1, u32 param2); + void ABI_CallFunctionA(void *func, const OpArg &arg1); // Pass a register as a parameter. - void ABI_CallFunctionR(void *func, Gen::X64Reg reg1); - void ABI_CallFunctionRR(void *func, Gen::X64Reg reg1, Gen::X64Reg reg2, bool noProlog = false); + void ABI_CallFunctionR(void *func, X64Reg reg1); + void ABI_CallFunctionRR(void *func, X64Reg reg1, X64Reg reg2, bool noProlog = false); // A function that doesn't have any control over what it will do to regs, // such as the dispatcher, should be surrounded by these.