Bug 569819 - Fix nanojit compilation failure on mingw-w64. r=edwsmith

This commit is contained in:
Jacek Caban 2010-08-02 11:59:50 +02:00
parent d58dccb9fd
commit 558d88b22e
3 changed files with 3 additions and 3 deletions

View File

@ -824,7 +824,7 @@ namespace nanojit
_inExit = false;
//verbose_only( verbose_outputf(" LIR_xt/xf swapCodeChunks, _nIns is now %08X(%08X), _nExitIns is now %08X(%08X)",_nIns, *_nIns,_nExitIns,*_nExitIns) );
verbose_only( verbose_outputf("%010lx:", (unsigned long)jmpTarget);)
verbose_only( verbose_outputf("%p:", jmpTarget);)
verbose_only( verbose_outputf("----------------------------------- ## BEGIN exit block (LIR_xt|LIR_xf)") );
#ifdef NANOJIT_IA32

View File

@ -152,7 +152,7 @@ namespace nanojit {
#define asm_output(...) do { \
if (_logc->lcbits & LC_Native) { \
outline[0]='\0'; \
VMPI_sprintf(outline, "%010lx ", (unsigned long)_nIns); \
VMPI_sprintf(outline, "%p ", _nIns); \
sprintf(&outline[13], ##__VA_ARGS__); \
output(); \
} \

View File

@ -328,7 +328,7 @@ namespace nanojit
static const RegisterMask GpRegs = 0xffff;
static const RegisterMask FpRegs = 0xffff0000;
#ifdef _MSC_VER
#ifdef _WIN64
static const RegisterMask SavedRegs = 1<<RBX | 1<<RSI | 1<<RDI | 1<<R12 | 1<<R13 | 1<<R14 | 1<<R15;
static const int NumSavedRegs = 7; // rbx, rsi, rdi, r12-15
static const int NumArgRegs = 4;