summaryrefslogtreecommitdiff
path: root/Source/Core/Common/x64Emitter.cpp
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2014-04-30 18:55:36 +0200
committerPierre Bourdon <delroth@gmail.com>2014-04-30 18:55:36 +0200
commit951612f08e1db15aeef35512bcb37d93dcb30b25 (patch)
tree3939d563a82f39ed7d87077039659cb498b6be7f /Source/Core/Common/x64Emitter.cpp
parent664496a2a80952e0e46379bf6f4c8ab4611eb9fb (diff)
parent36dbde0f3c1471caba972931fbaa80ed786f87bc (diff)
Merge pull request #325 from Tilka/nop
Fix NOP padding
Diffstat (limited to 'Source/Core/Common/x64Emitter.cpp')
-rw-r--r--Source/Core/Common/x64Emitter.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/Core/Common/x64Emitter.cpp b/Source/Core/Common/x64Emitter.cpp
index 23c3d2647e..89d5ddf564 100644
--- a/Source/Core/Common/x64Emitter.cpp
+++ b/Source/Core/Common/x64Emitter.cpp
@@ -6,6 +6,7 @@
#include "Common/Common.h"
#include "Common/CPUDetect.h"
+#include "Common/Log.h"
#include "Common/x64Emitter.h"
namespace Gen
@@ -516,8 +517,9 @@ void XEmitter::RET() {Write8(0xC3);}
void XEmitter::RET_FAST() {Write8(0xF3); Write8(0xC3);} //two-byte return (rep ret) - recommended by AMD optimization manual for the case of jumping to a ret
// The first sign of decadence: optimized NOPs.
-void XEmitter::NOP(int size)
+void XEmitter::NOP(size_t size)
{
+ _dbg_assert_(DYNA_REC, (int)size > 0);
while (true)
{
switch (size)