# HG changeset patch # User Tassilo Philipp # Date 1582650973 -3600 # Node ID d982a00c2177ffaab473cc0bca919aa5168e475b # Parent 2f64957d6a46726dd5e690ff288135a96a2c51ce - PPC64 asm syntax fix, specifying explicitly comparison mode for cmpi (newer toolchains complain, older ones took optional field of instruction which happened to be same value) diff -r 2f64957d6a46 -r d982a00c2177 dyncall/dyncall_call_ppc32.S --- a/dyncall/dyncall_call_ppc32.S Tue Feb 25 16:07:45 2020 +0100 +++ b/dyncall/dyncall_call_ppc32.S Tue Feb 25 18:16:13 2020 +0100 @@ -100,7 +100,7 @@ srwi r5,r5,2 /* r5 = size in words */ - cmpi cr0,r5,0 /* if stacksize != 0 .. */ + cmpi cr0,0,r5,0 /* if stacksize != 0 .. */ beq cr0,.osx_done mtctr r5 /* copy loop */ @@ -214,7 +214,7 @@ srwi r5,r5,2 /* r5 = size in words */ - cmpi cr0,r5,0 /* if stacksize != 0 .. */ + cmpi cr0,0,r5,0 /* if stacksize != 0 .. */ beq cr0,.sysv_done mtctr r5 /* copy loop */ diff -r 2f64957d6a46 -r d982a00c2177 dyncall/dyncall_call_ppc64.S --- a/dyncall/dyncall_call_ppc64.S Tue Feb 25 16:07:45 2020 +0100 +++ b/dyncall/dyncall_call_ppc64.S Tue Feb 25 18:16:13 2020 +0100 @@ -116,7 +116,7 @@ srwi r5,r5,3 /* r5 = size in double words */ - cmpi cr0,r5,0 /* if stacksize != 0 .. */ + cmpi cr0,0,r5,0 /* if stacksize != 0 .. */ beq cr0,.copy_done mtctr r5 /* copy loop */ diff -r 2f64957d6a46 -r d982a00c2177 dyncallback/dyncall_callback_ppc32.S --- a/dyncallback/dyncall_callback_ppc32.S Tue Feb 25 16:07:45 2020 +0100 +++ b/dyncallback/dyncall_callback_ppc32.S Tue Feb 25 18:16:13 2020 +0100 @@ -123,9 +123,9 @@ mtctr r12 bctrl /* check result type */ - cmpi cr0, r3, 0x66 /* 'f */ + cmpi cr0, 0, r3, 0x66 /* 'f */ beq .f32 - cmpi cr0, r3, 0x64 /* 'd */ + cmpi cr0, 0, r3, 0x64 /* 'd */ beq .f64 .i64: lwz r3, SP_RESULT (r1) diff -r 2f64957d6a46 -r d982a00c2177 dyncallback/dyncall_callback_ppc32_apple.s --- a/dyncallback/dyncall_callback_ppc32_apple.s Tue Feb 25 16:07:45 2020 +0100 +++ b/dyncallback/dyncall_callback_ppc32_apple.s Tue Feb 25 18:16:13 2020 +0100 @@ -135,9 +135,9 @@ mtctr r12 bctrl /* switch on base result type */ - cmpi cr0, r3, 0x66 /* 'f */ + cmpi cr0, 0, r3, 0x66 /* 'f */ beq .f32 - cmpi cr0, r3, 0x64 /* 'd */ + cmpi cr0, 0, r3, 0x64 /* 'd */ beq .f64 .i64: lwz r3, RESULT_OFFSET (r1) diff -r 2f64957d6a46 -r d982a00c2177 dyncallback/dyncall_callback_ppc64.S --- a/dyncallback/dyncall_callback_ppc64.S Tue Feb 25 16:07:45 2020 +0100 +++ b/dyncallback/dyncall_callback_ppc64.S Tue Feb 25 18:16:13 2020 +0100 @@ -147,9 +147,9 @@ bctrl /* check result type */ - cmpi cr0, r3, 0x66 /* 'f */ + cmpi cr0, 0, r3, 0x66 /* 'f */ beq .f32 - cmpi cr0, r3, 0x64 /* 'd */ + cmpi cr0, 0, r3, 0x64 /* 'd */ beq .f64 .i64: ld r3, SP_RESULT(r1)