diff --git a/qemu/tcg/i386/tcg-target.c b/qemu/tcg/i386/tcg-target.c index ecf7615b..26527430 100644 --- a/qemu/tcg/i386/tcg-target.c +++ b/qemu/tcg/i386/tcg-target.c @@ -65,7 +65,7 @@ static const int tcg_target_reg_alloc_order[] = { static const int tcg_target_call_iarg_regs[] = { #if TCG_TARGET_REG_BITS == 64 -#if (defined(_WIN64)||defined(__CYGWIN__)) +#if (defined(_WIN64) || defined(__CYGWIN__)) TCG_REG_RCX, TCG_REG_RDX, #else @@ -2191,7 +2191,7 @@ static int tcg_target_callee_save_regs[] = { #if TCG_TARGET_REG_BITS == 64 TCG_REG_RBP, TCG_REG_RBX, -#if (defined(_WIN64)||defined(__CYGWIN__)) +#if (defined(_WIN64) || defined(__CYGWIN__)) TCG_REG_RDI, TCG_REG_RSI, #endif @@ -2316,7 +2316,7 @@ static void tcg_target_init(TCGContext *s) tcg_regset_set_reg(s->tcg_target_call_clobber_regs, TCG_REG_EDX); tcg_regset_set_reg(s->tcg_target_call_clobber_regs, TCG_REG_ECX); if (TCG_TARGET_REG_BITS == 64) { -#if !(defined(_WIN64)||defined(__CYGWIN__)) +#if !(defined(_WIN64) || defined(__CYGWIN__)) tcg_regset_set_reg(s->tcg_target_call_clobber_regs, TCG_REG_RDI); tcg_regset_set_reg(s->tcg_target_call_clobber_regs, TCG_REG_RSI); #endif diff --git a/qemu/tcg/i386/tcg-target.h b/qemu/tcg/i386/tcg-target.h index 7d350d90..fdea43b7 100644 --- a/qemu/tcg/i386/tcg-target.h +++ b/qemu/tcg/i386/tcg-target.h @@ -67,7 +67,7 @@ typedef enum { /* used for function call generation */ #define TCG_REG_CALL_STACK TCG_REG_ESP #define TCG_TARGET_STACK_ALIGN 16 -#if defined(_WIN64) || (defined(__CYGWIN__)&&defined(__x86_64__)) +#if defined(_WIN64) || (defined(__CYGWIN__) && defined(__x86_64__)) #define TCG_TARGET_CALL_STACK_OFFSET 32 #else #define TCG_TARGET_CALL_STACK_OFFSET 0