diff options
| author | magumagu9 <magumagu9@gmail.com> | 2008-11-22 20:20:14 +0000 |
|---|---|---|
| committer | magumagu9 <magumagu9@gmail.com> | 2008-11-22 20:20:14 +0000 |
| commit | 05058b9684db239d99076f08cfb0b7d6ed0be39e (patch) | |
| tree | 3a28ab312869f3e42bce636c3df2edf5260098b4 /Source/Core/Common | |
| parent | eab369321c2572e412718d2a8da5b73dce366325 (diff) | |
Another Linux build fix.
Also, some trivial changes I'm too lazy to separate out.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1249 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/Src/x64Emitter.cpp | 5 | ||||
| -rw-r--r-- | Source/Core/Common/Src/x64Emitter.h | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Source/Core/Common/Src/x64Emitter.cpp b/Source/Core/Common/Src/x64Emitter.cpp index be525c8035..fe839d8537 100644 --- a/Source/Core/Common/Src/x64Emitter.cpp +++ b/Source/Core/Common/Src/x64Emitter.cpp @@ -927,7 +927,7 @@ namespace Gen void AND (int bits, const OpArg &a1, const OpArg &a2) {WriteNormalOp(bits, nrmAND, a1, a2);}
void OR (int bits, const OpArg &a1, const OpArg &a2) {WriteNormalOp(bits, nrmOR , a1, a2);}
void XOR (int bits, const OpArg &a1, const OpArg &a2) {WriteNormalOp(bits, nrmXOR, a1, a2);}
- inline void MOV (int bits, const OpArg &a1, const OpArg &a2)
+ void MOV (int bits, const OpArg &a1, const OpArg &a2)
{
_assert_msg_(DYNA_REC, !a1.IsSimpleReg() || !a2.IsSimpleReg() || a1.GetSimpleReg() != a2.GetSimpleReg(), "Redundant MOV @ %p",
code);
@@ -1315,7 +1315,8 @@ namespace Gen Write8(0x9B);
}
-
+ void RTDSC() { Write8(0x0F); Write8(0x31); }
+
namespace Util
{
diff --git a/Source/Core/Common/Src/x64Emitter.h b/Source/Core/Common/Src/x64Emitter.h index b62b24f786..995143b91a 100644 --- a/Source/Core/Common/Src/x64Emitter.h +++ b/Source/Core/Common/Src/x64Emitter.h @@ -160,7 +160,7 @@ namespace Gen return false;
return GetSimpleReg() == reg;
}
- bool CanDoOpWith(OpArg &other) const
+ bool CanDoOpWith(const OpArg &other) const
{
if (IsSimpleReg()) return true;
if (!IsSimpleReg() && !other.IsSimpleReg() && !other.IsImm()) return false;
@@ -520,6 +520,8 @@ namespace Gen void PMOVMSKB(X64Reg dest, OpArg arg);
void PSHUFB(X64Reg dest, OpArg arg);
+ void RTDSC();
+
namespace Util
{
// Sets up a __cdecl function.
|
