[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Lightning] [PATCH 2/3] Use Windows calling convention on MinGW too
|
From: |
Paul Cercueil |
|
Subject: |
[Lightning] [PATCH 2/3] Use Windows calling convention on MinGW too |
|
Date: |
Wed, 25 Sep 2019 00:55:09 +0200 |
Use the _WIN32 macro in place of __CYGWIN__ in places that are not
Cygwin-specific, but rather specific to Windows.
Signed-off-by: Paul Cercueil <address@hidden>
---
lib/jit_x86-cpu.c | 16 ++++++++--------
lib/jit_x86-sz.c | 4 ++--
lib/jit_x86.c | 28 ++++++++++++++--------------
3 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/lib/jit_x86-cpu.c b/lib/jit_x86-cpu.c
index 0a386fd..40b27f7 100644
--- a/lib/jit_x86-cpu.c
+++ b/lib/jit_x86-cpu.c
@@ -47,7 +47,7 @@
((im) >= 0 && (im) < 0x80000000LL)
# define fits_uint32_p(im) (((im) & 0xffffffff00000000LL) == 0)
# endif
-# if __X32 || __CYGWIN__ || __X64_32
+# if __X32 || _WIN32 || __X64_32
# define reg8_p(rn) \
((rn) >= _RAX_REGNO && (rn) <= _RBX_REGNO)
# else
@@ -3469,7 +3469,7 @@ _prolog(jit_state_t *_jit, jit_node_t *node)
}
if (_jitc->function->allocar)
_jitc->function->self.aoff &= -16;
-#if __X64 && __CYGWIN__
+#if __X64 && _WIN32
_jitc->function->stack = (((/* first 32 bytes must be allocated */
(_jitc->function->self.alen > 32 ?
_jitc->function->self.alen : 32) -
@@ -3491,7 +3491,7 @@ _prolog(jit_state_t *_jit, jit_node_t *node)
if (jit_regset_tstbit(&_jitc->function->regset, _RBX))
stxi( 4, _RSP_REGNO, _RBX_REGNO);
#else
-# if __CYGWIN__
+# if _WIN32
if (jit_regset_tstbit(&_jitc->function->regset, _XMM15))
sse_stxi_d(136, _RSP_REGNO, _XMM15_REGNO);
if (jit_regset_tstbit(&_jitc->function->regset, _XMM14))
@@ -3551,7 +3551,7 @@ _prolog(jit_state_t *_jit, jit_node_t *node)
jit_unget_reg(reg);
}
-#if __X64 && !__CYGWIN__
+#if __X64 && !_WIN32
if (_jitc->function->self.call & jit_call_varargs) {
jit_word_t nofp_code;
@@ -3600,7 +3600,7 @@ _epilog(jit_state_t *_jit, jit_node_t *node)
if (jit_regset_tstbit(&_jitc->function->regset, _RBX))
ldxi(_RBX_REGNO, _RSP_REGNO, 4);
#else
-# if __CYGWIN__
+# if _WIN32
if (jit_regset_tstbit(&_jitc->function->regset, _XMM15))
sse_ldxi_d(_XMM15_REGNO, _RSP_REGNO, 136);
if (jit_regset_tstbit(&_jitc->function->regset, _XMM14))
@@ -3657,7 +3657,7 @@ _epilog(jit_state_t *_jit, jit_node_t *node)
static void
_vastart(jit_state_t *_jit, jit_int32_t r0)
{
-#if __X32 || __CYGWIN__
+#if __X32 || _WIN32
assert(_jitc->function->self.call & jit_call_varargs);
addi(r0, _RBP_REGNO, _jitc->function->self.size);
#else
@@ -3692,7 +3692,7 @@ _vastart(jit_state_t *_jit, jit_int32_t r0)
static void
_vaarg(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)
{
-#if __X32 || __CYGWIN__
+#if __X32 || _WIN32
assert(_jitc->function->self.call & jit_call_varargs);
ldr(r0, r1);
addi(r1, r1, va_gp_increment);
@@ -3757,7 +3757,7 @@ _vaarg(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)
static void
_vaarg_d(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_bool_t x87)
{
-#if __X32 || __CYGWIN__
+#if __X32 || _WIN32
assert(_jitc->function->self.call & jit_call_varargs);
if (x87)
x87_ldr_d(r0, r1);
diff --git a/lib/jit_x86-sz.c b/lib/jit_x86-sz.c
index 87370ab..94112b5 100644
--- a/lib/jit_x86-sz.c
+++ b/lib/jit_x86-sz.c
@@ -405,7 +405,7 @@
#endif
#if __X64
-#if __CYGWIN__
+#if _WIN32
#define JIT_INSTR_MAX 130
0, /* data */
0, /* live */
@@ -1617,6 +1617,6 @@
0, /* movi_d_ww */
0, /* movr_d_w */
0, /* movi_d_w */
-#endif /* __CYGWIN__ */
+#endif /* _WIN32 */
# endif /* __X64_32 */
#endif /* __X64 */
diff --git a/lib/jit_x86.c b/lib/jit_x86.c
index bddbd05..df0abaa 100644
--- a/lib/jit_x86.c
+++ b/lib/jit_x86.c
@@ -30,7 +30,7 @@
# define va_gp_increment 4
# define va_fp_increment 8
#else
-# if __CYGWIN__
+# if _WIN32
# define jit_arg_reg_p(i) ((i) >= 0 && (i) < 4)
# define jit_arg_f_reg_p(i) jit_arg_reg_p(i)
# define stack_framesize 152
@@ -62,7 +62,7 @@
/*
* Types
*/
-#if __X32 || __CYGWIN__
+#if __X32 || _WIN32
typedef jit_pointer_t jit_va_list_t;
#else
typedef struct jit_va_list {
@@ -147,7 +147,7 @@ jit_register_t _rvs[] = {
{ rc(fpr) | 6, "st(6)" },
{ rc(fpr) | 7, "st(7)" },
#else
-# if __CYGWIN__
+# if _WIN32
{ rc(gpr) | rc(rg8) | 0, "%rax" },
{ rc(gpr) | rc(rg8) | rc(rg8) | 10, "%r10" },
{ rc(gpr) | rc(rg8) | rc(rg8) | 11, "%r11" },
@@ -597,7 +597,7 @@ _jit_ellipsis(jit_state_t *_jit)
assert(!(_jitc->function->self.call & jit_call_varargs));
_jitc->function->self.call |= jit_call_varargs;
-#if __X64 && !__CYGWIN__
+#if __X64 && !_WIN32
/* Allocate va_list like object in the stack.
* If applicable, with enough space to save all argument
* registers, and use fixed offsets for them. */
@@ -638,7 +638,7 @@ _jit_arg(jit_state_t *_jit)
#if __X64
if (jit_arg_reg_p(_jitc->function->self.argi)) {
offset = _jitc->function->self.argi++;
-# if __CYGWIN__
+# if _WIN32
_jitc->function->self.size += sizeof(jit_word_t);
# endif
}
@@ -662,7 +662,7 @@ _jit_arg_f(jit_state_t *_jit)
assert(_jitc->function);
assert(!(_jitc->function->self.call & jit_call_varargs));
#if __X64
-# if __CYGWIN__
+# if _WIN32
if (jit_arg_reg_p(_jitc->function->self.argi)) {
offset = _jitc->function->self.argi++;
_jitc->function->self.size += sizeof(jit_word_t);
@@ -691,7 +691,7 @@ _jit_arg_d(jit_state_t *_jit)
assert(_jitc->function);
assert(!(_jitc->function->self.call & jit_call_varargs));
#if __X64
-# if __CYGWIN__
+# if _WIN32
if (jit_arg_reg_p(_jitc->function->self.argi)) {
offset = _jitc->function->self.argi++;
_jitc->function->self.size += sizeof(jit_word_t);
@@ -953,7 +953,7 @@ _jit_pushargr(jit_state_t *_jit, jit_int32_t u)
if (jit_arg_reg_p(_jitc->function->call.argi)) {
jit_movr(JIT_RA0 - _jitc->function->call.argi, u);
++_jitc->function->call.argi;
-# if __CYGWIN__
+# if _WIN32
if (_jitc->function->call.call & jit_call_varargs)
jit_stxi(_jitc->function->call.size, _RSP, u);
_jitc->function->call.size += sizeof(jit_word_t);
@@ -978,7 +978,7 @@ _jit_pushargi(jit_state_t *_jit, jit_word_t u)
#if __X64
if (jit_arg_reg_p(_jitc->function->call.argi)) {
jit_movi(JIT_RA0 - _jitc->function->call.argi, u);
-# if __CYGWIN__
+# if _WIN32
if (_jitc->function->call.call & jit_call_varargs)
jit_stxi(_jitc->function->call.size, _RSP,
JIT_RA0 - _jitc->function->call.argi);
@@ -1005,7 +1005,7 @@ _jit_pushargr_f(jit_state_t *_jit, jit_int32_t u)
jit_inc_synth_w(pushargr_f, u);
jit_link_prepare();
#if __X64
-# if __CYGWIN__
+# if _WIN32
if (jit_arg_reg_p(_jitc->function->call.argi)) {
jit_movr_f(_XMM0 - _jitc->function->call.argi, u);
if (_jitc->function->call.call & jit_call_varargs) {
@@ -1040,7 +1040,7 @@ _jit_pushargi_f(jit_state_t *_jit, jit_float32_t u)
jit_inc_synth_f(pushargi_f, u);
jit_link_prepare();
#if __X64
-# if __CYGWIN__
+# if _WIN32
if (jit_arg_reg_p(_jitc->function->call.argi)) {
jit_movi_f(_XMM0 - _jitc->function->call.argi, u);
if (_jitc->function->call.call & jit_call_varargs) {
@@ -1077,7 +1077,7 @@ _jit_pushargr_d(jit_state_t *_jit, jit_int32_t u)
jit_inc_synth_w(pushargr_d, u);
jit_link_prepare();
#if __X64
-# if __CYGWIN__
+# if _WIN32
if (jit_arg_reg_p(_jitc->function->call.argi)) {
jit_movr_d(_XMM0 - _jitc->function->call.argi, u);
if (_jitc->function->call.call & jit_call_varargs) {
@@ -1112,7 +1112,7 @@ _jit_pushargi_d(jit_state_t *_jit, jit_float64_t u)
jit_inc_synth_d(pushargi_d, u);
jit_link_prepare();
#if __X64
-# if __CYGWIN__
+# if _WIN32
if (jit_arg_reg_p(_jitc->function->call.argi)) {
jit_movi_d(_XMM0 - _jitc->function->call.argi, u);
if (_jitc->function->call.call & jit_call_varargs) {
@@ -1176,7 +1176,7 @@ _jit_finishr(jit_state_t *_jit, jit_int32_t r0)
if (_jitc->function->self.alen < _jitc->function->call.size)
_jitc->function->self.alen = _jitc->function->call.size;
#if __X64
-# if !__CYGWIN__
+# if !_WIN32
if (_jitc->function->call.call & jit_call_varargs) {
if (jit_regno(reg) == _RAX) {
reg = jit_get_reg(jit_class_gpr);
--
2.23.0