From 0fc1ca01693a4098fe3748f26ecd6aebef91747e Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 12 Sep 2013 12:26:20 -0500 Subject: [PATCH] Make Bochs_disasm not depend on Common. --- Externals/Bochs_disasm/PowerPCDisasm.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Externals/Bochs_disasm/PowerPCDisasm.cpp b/Externals/Bochs_disasm/PowerPCDisasm.cpp index 56719ff662..f6de85d845 100644 --- a/Externals/Bochs_disasm/PowerPCDisasm.cpp +++ b/Externals/Bochs_disasm/PowerPCDisasm.cpp @@ -39,11 +39,6 @@ #include "PowerPCDisasm.h" -#ifndef _MSC_VER -// Pull in rotate functions for non-msvc -#include "Common.h" -#endif - namespace PPCDisasm { @@ -580,7 +575,8 @@ typedef unsigned int ppc_word; if (me < mb) mask = ~mask; //rotate the mask so it can be applied to source reg - return _rotl(mask, 32 - r); + //return _rotl(mask, 32 - r); + return (mask << (32 - r)) | (mask >> r); }