fix android x86 and x64 full build

* abuse namespace as done in 59f15d6819
This commit is contained in:
Jeffrey Clark 2016-07-01 00:57:46 +00:00
parent e3217681a7
commit 0b5860246f
3 changed files with 30 additions and 1 deletions

View File

@ -174,10 +174,23 @@
#include "drcbex64.h"
// This is a trick to make it build on Android where the ARM SDK declares ::REG_Rn
// and the x64 SDK declares ::REG_Exx and ::REG_Rxx
namespace drc {
using namespace uml;
using namespace x64emit;
using x64emit::REG_EAX;
using x64emit::REG_ECX;
using x64emit::REG_EDX;
using x64emit::REG_RAX;
using x64emit::REG_RCX;
using x64emit::REG_RDX;
using x64emit::REG_RBX;
using x64emit::REG_RSP;
using x64emit::REG_RBP;
using x64emit::REG_RSI;
using x64emit::REG_RDI;
using x64emit::REG_R8;
using x64emit::REG_R9;
using x64emit::REG_R10;

View File

@ -89,9 +89,19 @@
#include "drcuml.h"
#include "drcbex86.h"
// This is a trick to make it build on Android where the x86 SDK declares ::REG_Exx
namespace drc {
using namespace uml;
using namespace x86emit;
using x86emit::REG_EAX;
using x86emit::REG_ECX;
using x86emit::REG_EDX;
using x86emit::REG_EBX;
using x86emit::REG_ESP;
using x86emit::REG_EBP;
using x86emit::REG_ESI;
using x86emit::REG_EDI;
//**************************************************************************
// DEBUGGING
@ -6733,3 +6743,5 @@ int drcbe_x86::ddivs(UINT64 &dstlo, UINT64 &dsthi, INT64 src1, INT64 src2)
dsthi = src1 % src2;
return ((dstlo == 0) << 2) | ((dstlo >> 60) & FLAG_S);
}
} // namespace drc

View File

@ -22,6 +22,7 @@
namespace drc {
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
@ -336,5 +337,8 @@ private:
static opcode_generate_func s_opcode_table[uml::OP_MAX];
};
} // namespace drc
#endif /* __DRCBEC_H__ */
using drc::drcbe_x86;
#endif /* __DRCBEX86_H__ */