mirror of
https://github.com/corda/corda.git
synced 2025-01-08 14:03:06 +00:00
use __MINGW32__ instead of __WINDOWS__ in x86.cpp and assume Linux if it's not defined
This commit is contained in:
parent
27d863790c
commit
0447d9bed3
@ -32,7 +32,7 @@ vmCall();
|
|||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
const bool DebugCompile = false;
|
const bool DebugCompile = true;
|
||||||
const bool DebugNatives = false;
|
const bool DebugNatives = false;
|
||||||
const bool DebugCallTable = false;
|
const bool DebugCallTable = false;
|
||||||
const bool DebugMethodTree = false;
|
const bool DebugMethodTree = false;
|
||||||
|
10
src/x86.cpp
10
src/x86.cpp
@ -2101,7 +2101,7 @@ class MyArchitecture: public Assembler::Architecture {
|
|||||||
}
|
}
|
||||||
|
|
||||||
virtual unsigned frameFootprint(unsigned footprint) {
|
virtual unsigned frameFootprint(unsigned footprint) {
|
||||||
#ifdef __WINDOWS__
|
#ifdef __MINGW32__
|
||||||
return max(footprint, StackAlignmentInWords);
|
return max(footprint, StackAlignmentInWords);
|
||||||
#else
|
#else
|
||||||
return max(footprint > argumentRegisterCount() ?
|
return max(footprint > argumentRegisterCount() ?
|
||||||
@ -2115,9 +2115,9 @@ class MyArchitecture: public Assembler::Architecture {
|
|||||||
}
|
}
|
||||||
|
|
||||||
virtual unsigned argumentRegisterCount() {
|
virtual unsigned argumentRegisterCount() {
|
||||||
#ifdef __WINDOWS__
|
#ifdef __MINGW32__
|
||||||
if (BytesPerWord == 8) return 4; else
|
if (BytesPerWord == 8) return 4; else
|
||||||
#elif defined __LINUX__
|
#else
|
||||||
if (BytesPerWord == 8) return 6; else
|
if (BytesPerWord == 8) return 6; else
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
@ -2126,7 +2126,7 @@ class MyArchitecture: public Assembler::Architecture {
|
|||||||
virtual int argumentRegister(unsigned index) {
|
virtual int argumentRegister(unsigned index) {
|
||||||
assert(&c, BytesPerWord == 8);
|
assert(&c, BytesPerWord == 8);
|
||||||
switch (index) {
|
switch (index) {
|
||||||
#ifdef __WINDOWS__
|
#ifdef __MINGW32__
|
||||||
case 0:
|
case 0:
|
||||||
return rcx;
|
return rcx;
|
||||||
case 1:
|
case 1:
|
||||||
@ -2135,7 +2135,7 @@ class MyArchitecture: public Assembler::Architecture {
|
|||||||
return r8;
|
return r8;
|
||||||
case 3:
|
case 3:
|
||||||
return r9;
|
return r9;
|
||||||
#elif defined __LINUX__
|
#else
|
||||||
case 0:
|
case 0:
|
||||||
return rdi;
|
return rdi;
|
||||||
case 1:
|
case 1:
|
||||||
|
Loading…
Reference in New Issue
Block a user