From: Debian Common Lisp Team Date: Wed, 11 Apr 2018 17:47:18 +0000 (+0100) Subject: mips-r6 X-Git-Tag: archive/raspbian/2.1-2+rpi1^2~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c970b3f94959dbb1c611bb495465f0b341a40d15;p=ffcall.git mips-r6 Gbp-Pq: Name mips-r6.patch --- diff --git a/avcall/avcall-mips64eb-macro.S b/avcall/avcall-mips64eb-macro.S index 63ccc9a..e9921e3 100644 --- a/avcall/avcall-mips64eb-macro.S +++ b/avcall/avcall-mips64eb-macro.S @@ -197,14 +197,22 @@ avcall_call: li $2,1 .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $4,$2,.L120 +#else + beq $4,$2,.L120 +#endif move $sp,$fp .set macro .set reorder .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $4,$0,.L121 +#else + beq $4,$0,.L121 +#endif ld $2,16($16) .set macro .set reorder @@ -310,7 +318,11 @@ avcall_call: .set noreorder .set nomacro +#if __mips_isa_rev < 6 bnel $4,$2,.L120 +#else + bne $4,$2,.L120 +#endif move $sp,$fp .set macro .set reorder @@ -326,7 +338,11 @@ avcall_call: .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $2,$0,.L73 +#else + beq $2,$0,.L73 +#endif ld $7,32($16) .set macro .set reorder @@ -356,7 +372,11 @@ avcall_call: .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $3,$2,.L121 +#else + beq $3,$2,.L121 +#endif ld $2,16($16) .set macro .set reorder @@ -420,7 +440,11 @@ avcall_call: andi $2,$3,0x80 .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $2,$0,.L119 +#else + beq $2,$0,.L119 +#endif lw $3,72($16) .set macro .set reorder @@ -589,7 +613,11 @@ avcall_call: andi $2,$3,0x80 .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $2,$0,.L118 +#else + beq $2,$0,.L118 +#endif slt $2,$6,9 .set macro .set reorder @@ -670,7 +698,11 @@ avcall_call: sltu $2,$7,9 .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $2,$0,.L85 +#else + beq $2,$0,.L85 +#endif dsll $4,$8,3 .set macro .set reorder diff --git a/avcall/avcall-mips64el-macro.S b/avcall/avcall-mips64el-macro.S index 375a69e..3bf48e8 100644 --- a/avcall/avcall-mips64el-macro.S +++ b/avcall/avcall-mips64el-macro.S @@ -197,14 +197,22 @@ avcall_call: li $2,1 .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $4,$2,.L120 +#else + beq $4,$2,.L120 +#endif move $sp,$fp .set macro .set reorder .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $4,$0,.L121 +#else + beq $4,$0,.L121 +#endif ld $2,16($16) .set macro .set reorder @@ -310,7 +318,11 @@ avcall_call: .set noreorder .set nomacro +#if __mips_isa_rev < 6 bnel $4,$2,.L120 +#else + bne $4,$2,.L120 +#endif move $sp,$fp .set macro .set reorder @@ -326,7 +338,11 @@ avcall_call: .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $2,$0,.L73 +#else + beq $2,$0,.L73 +#endif ld $6,32($16) .set macro .set reorder @@ -356,7 +372,11 @@ avcall_call: .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $3,$2,.L121 +#else + beq $3,$2,.L121 +#endif ld $2,16($16) .set macro .set reorder @@ -420,7 +440,11 @@ avcall_call: andi $2,$3,0x80 .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $2,$0,.L119 +#else + beq $2,$0,.L119 +#endif lw $3,72($16) .set macro .set reorder @@ -589,7 +613,11 @@ avcall_call: andi $2,$3,0x80 .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $2,$0,.L118 +#else + beq $2,$0,.L118 +#endif slt $2,$6,9 .set macro .set reorder diff --git a/avcall/avcall-mipsn32eb-macro.S b/avcall/avcall-mipsn32eb-macro.S index 6cc1801..694062f 100644 --- a/avcall/avcall-mipsn32eb-macro.S +++ b/avcall/avcall-mipsn32eb-macro.S @@ -196,14 +196,22 @@ avcall_call: li $2,1 .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $4,$2,.L120 +#else + beq $4,$2,.L120 +#endif move $sp,$fp .set macro .set reorder .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $4,$0,.L121 +#else + beq $4,$0,.L121 +#endif lw $2,8($16) .set macro .set reorder @@ -309,7 +317,11 @@ avcall_call: .set noreorder .set nomacro +#if __mips_isa_rev < 6 bnel $4,$2,.L120 +#else + bne $4,$2,.L120 +#endif move $sp,$fp .set macro .set reorder @@ -325,7 +337,11 @@ avcall_call: .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $2,$0,.L72 +#else + beq $2,$0,.L72 +#endif lw $8,16($16) .set macro .set reorder @@ -355,7 +371,11 @@ avcall_call: .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $3,$2,.L121 +#else + beq $3,$2,.L121 +#endif lw $2,8($16) .set macro .set reorder @@ -419,7 +439,11 @@ avcall_call: andi $2,$3,0x80 .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $2,$0,.L119 +#else + beq $2,$0,.L119 +#endif lw $3,40($16) .set macro .set reorder @@ -588,7 +612,11 @@ avcall_call: andi $2,$3,0x80 .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $2,$0,.L118 +#else + beq $2,$0,.L118 +#endif slt $2,$6,9 .set macro .set reorder diff --git a/avcall/avcall-mipsn32el-macro.S b/avcall/avcall-mipsn32el-macro.S index eea52e6..5f05634 100644 --- a/avcall/avcall-mipsn32el-macro.S +++ b/avcall/avcall-mipsn32el-macro.S @@ -196,14 +196,22 @@ avcall_call: li $2,1 .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $4,$2,.L120 +#else + beq $4,$2,.L120 +#endif move $sp,$fp .set macro .set reorder .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $4,$0,.L121 +#else + beq $4,$0,.L121 +#endif lw $2,8($16) .set macro .set reorder @@ -309,7 +317,11 @@ avcall_call: .set noreorder .set nomacro +#if __mips_isa_rev < 6 bnel $4,$2,.L120 +#else + bne $4,$2,.L120 +#endif move $sp,$fp .set macro .set reorder @@ -325,7 +337,11 @@ avcall_call: .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $2,$0,.L72 +#else + beq $2,$0,.L72 +#endif lw $6,16($16) .set macro .set reorder @@ -355,7 +371,11 @@ avcall_call: .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $3,$2,.L121 +#else + beq $3,$2,.L121 +#endif lw $2,8($16) .set macro .set reorder @@ -419,7 +439,11 @@ avcall_call: andi $2,$3,0x80 .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $2,$0,.L119 +#else + beq $2,$0,.L119 +#endif lw $3,40($16) .set macro .set reorder @@ -588,7 +612,11 @@ avcall_call: andi $2,$3,0x80 .set noreorder .set nomacro +#if __mips_isa_rev < 6 beql $2,$0,.L118 +#else + beq $2,$0,.L118 +#endif slt $2,$6,9 .set macro .set reorder diff --git a/callback/vacall_r/vacall-mips64eb-macro.S b/callback/vacall_r/vacall-mips64eb-macro.S index 8cbf6e6..c0bd0c7 100644 --- a/callback/vacall_r/vacall-mips64eb-macro.S +++ b/callback/vacall_r/vacall-mips64eb-macro.S @@ -102,7 +102,11 @@ callback_receiver: beq $13,$12,.L65 li $12,15 +#if __mips_isa_rev < 6 bnel $13,$12,.L79 +#else + bne $13,$12,.L79 +#endif move $sp,$fp lw $20,0($fp) @@ -110,7 +114,11 @@ callback_receiver: beq $12,$0,.L60 andi $12,$20,0x4 +#if __mips_isa_rev < 6 beql $12,$0,.L34 +#else + beq $12,$0,.L34 +#endif ld $19,48($fp) ld $13,48($fp) @@ -124,7 +132,11 @@ callback_receiver: beq $13,$12,.L76 li $12,8 +#if __mips_isa_rev < 6 bnel $13,$12,.L79 +#else + bne $13,$12,.L79 +#endif move $sp,$fp ld $12,32($fp) @@ -242,7 +254,11 @@ callback_receiver: beq $19,$12,.L78 li $12,16 +#if __mips_isa_rev < 6 bnel $19,$12,.L79 +#else + bne $19,$12,.L79 +#endif move $sp,$fp ld $12,32($fp) diff --git a/callback/vacall_r/vacall-mips64el-macro.S b/callback/vacall_r/vacall-mips64el-macro.S index d32018f..04a4d95 100644 --- a/callback/vacall_r/vacall-mips64el-macro.S +++ b/callback/vacall_r/vacall-mips64el-macro.S @@ -101,7 +101,11 @@ callback_receiver: beq $13,$12,.L65 li $12,15 +#if __mips_isa_rev < 6 bnel $13,$12,.L79 +#else + bne $13,$12,.L79 +#endif move $sp,$fp lw $19,0($fp) @@ -109,7 +113,11 @@ callback_receiver: beq $12,$0,.L60 andi $12,$19,0x4 +#if __mips_isa_rev < 6 beql $12,$0,.L34 +#else + beq $12,$0,.L34 +#endif ld $18,48($fp) ld $13,48($fp) @@ -123,7 +131,11 @@ callback_receiver: beq $13,$12,.L76 li $12,8 +#if __mips_isa_rev < 6 bnel $13,$12,.L79 +#else + bne $13,$12,.L79 +#endif move $sp,$fp ld $12,32($fp) @@ -240,7 +252,11 @@ callback_receiver: beq $18,$12,.L78 li $12,16 +#if __mips_isa_rev < 6 bnel $18,$12,.L79 +#else + bne $18,$12,.L79 +#endif move $sp,$fp ld $12,32($fp) diff --git a/callback/vacall_r/vacall-mipsn32eb-macro.S b/callback/vacall_r/vacall-mipsn32eb-macro.S index 1b99ac7..296bddc 100644 --- a/callback/vacall_r/vacall-mipsn32eb-macro.S +++ b/callback/vacall_r/vacall-mipsn32eb-macro.S @@ -101,7 +101,11 @@ callback_receiver: beq $13,$12,.L64 li $12,15 +#if __mips_isa_rev < 6 bnel $13,$12,.L77 +#else + bne $13,$12,.L77 +#endif move $sp,$fp lw $19,0($fp) @@ -109,7 +113,11 @@ callback_receiver: beq $12,$0,.L60 andi $12,$19,0x4 +#if __mips_isa_rev < 6 beql $12,$0,.L34 +#else + beq $12,$0,.L34 +#endif lw $18,36($fp) lw $13,36($fp) @@ -123,7 +131,11 @@ callback_receiver: beq $13,$12,.L74 li $12,8 +#if __mips_isa_rev < 6 bnel $13,$12,.L77 +#else + bne $13,$12,.L77 +#endif move $sp,$fp lw $12,28($fp) @@ -236,7 +248,11 @@ callback_receiver: beq $18,$12,.L76 li $12,16 +#if __mips_isa_rev < 6 bnel $18,$12,.L77 +#else + bne $18,$12,.L77 +#endif move $sp,$fp lw $12,28($fp) @@ -251,7 +267,11 @@ callback_receiver: .L45: sltu $12,$13,17 +#if __mips_isa_rev < 6 beql $12,$0,.L49 +#else + beq $12,$0,.L49 +#endif ld $17,16($24) sll $12,$13,3 diff --git a/callback/vacall_r/vacall-mipsn32el-macro.S b/callback/vacall_r/vacall-mipsn32el-macro.S index 656aa62..7e5a62e 100644 --- a/callback/vacall_r/vacall-mipsn32el-macro.S +++ b/callback/vacall_r/vacall-mipsn32el-macro.S @@ -101,7 +101,11 @@ callback_receiver: beq $13,$12,.L64 li $12,15 +#if __mips_isa_rev < 6 bnel $13,$12,.L77 +#else + bne $13,$12,.L77 +#endif move $sp,$fp lw $19,0($fp) @@ -109,7 +113,11 @@ callback_receiver: beq $12,$0,.L60 andi $12,$19,0x4 +#if __mips_isa_rev < 6 beql $12,$0,.L34 +#else + beq $12,$0,.L34 +#endif lw $18,36($fp) lw $13,36($fp) @@ -123,7 +131,11 @@ callback_receiver: beq $13,$12,.L74 li $12,8 +#if __mips_isa_rev < 6 bnel $13,$12,.L77 +#else + bne $13,$12,.L77 +#endif move $sp,$fp lw $12,28($fp) @@ -237,7 +249,11 @@ callback_receiver: beq $18,$12,.L76 li $12,16 +#if __mips_isa_rev < 6 bnel $18,$12,.L77 +#else + bne $18,$12,.L77 +#endif move $sp,$fp lw $12,28($fp) diff --git a/vacall/vacall-mips64eb-macro.S b/vacall/vacall-mips64eb-macro.S index c99498e..6abfc8a 100644 --- a/vacall/vacall-mips64eb-macro.S +++ b/vacall/vacall-mips64eb-macro.S @@ -107,7 +107,11 @@ vacall_receiver: beq $13,$12,.L65 li $12,15 +#if __mips_isa_rev < 6 bnel $13,$12,.L79 +#else + bne $13,$12,.L79 +#endif move $sp,$fp lw $20,0($fp) @@ -115,7 +119,11 @@ vacall_receiver: beq $12,$0,.L60 andi $12,$20,0x4 +#if __mips_isa_rev < 6 beql $12,$0,.L34 +#else + beq $12,$0,.L34 +#endif ld $19,48($fp) ld $13,48($fp) @@ -129,7 +137,11 @@ vacall_receiver: beq $13,$12,.L76 li $12,8 +#if __mips_isa_rev < 6 bnel $13,$12,.L79 +#else + bne $13,$12,.L79 +#endif move $sp,$fp ld $12,32($fp) @@ -249,7 +261,11 @@ vacall_receiver: beq $19,$12,.L78 li $12,16 +#if __mips_isa_rev < 6 bnel $19,$12,.L79 +#else + bne $19,$12,.L79 +#endif move $sp,$fp ld $12,32($fp) diff --git a/vacall/vacall-mips64el-macro.S b/vacall/vacall-mips64el-macro.S index 00bc2c5..a671d37 100644 --- a/vacall/vacall-mips64el-macro.S +++ b/vacall/vacall-mips64el-macro.S @@ -106,7 +106,11 @@ vacall_receiver: beq $13,$12,.L65 li $12,15 +#if __mips_isa_rev < 6 bnel $13,$12,.L79 +#else + bne $13,$12,.L79 +#endif move $sp,$fp lw $19,0($fp) @@ -114,7 +118,11 @@ vacall_receiver: beq $12,$0,.L60 andi $12,$19,0x4 +#if __mips_isa_rev < 6 beql $12,$0,.L34 +#else + beq $12,$0,.L34 +#endif ld $18,48($fp) ld $13,48($fp) @@ -128,7 +136,11 @@ vacall_receiver: beq $13,$12,.L76 li $12,8 +#if __mips_isa_rev < 6 bnel $13,$12,.L79 +#else + bne $13,$12,.L79 +#endif move $sp,$fp ld $12,32($fp) @@ -247,7 +259,11 @@ vacall_receiver: beq $18,$12,.L78 li $12,16 +#if __mips_isa_rev < 6 bnel $18,$12,.L79 +#else + bne $18,$12,.L79 +#endif move $sp,$fp ld $12,32($fp) diff --git a/vacall/vacall-mipsn32eb-macro.S b/vacall/vacall-mipsn32eb-macro.S index 9379636..926b6a9 100644 --- a/vacall/vacall-mipsn32eb-macro.S +++ b/vacall/vacall-mipsn32eb-macro.S @@ -106,7 +106,11 @@ vacall_receiver: beq $13,$12,.L64 li $12,15 +#if __mips_isa_rev < 6 bnel $13,$12,.L77 +#else + bne $13,$12,.L77 +#endif move $sp,$fp lw $19,0($fp) @@ -114,7 +118,11 @@ vacall_receiver: beq $12,$0,.L60 andi $12,$19,0x4 +#if __mips_isa_rev < 6 beql $12,$0,.L34 +#else + beq $12,$0,.L34 +#endif lw $18,36($fp) lw $13,36($fp) @@ -128,7 +136,11 @@ vacall_receiver: beq $13,$12,.L74 li $12,8 +#if __mips_isa_rev < 6 bnel $13,$12,.L77 +#else + bne $13,$12,.L77 +#endif move $sp,$fp lw $12,28($fp) @@ -243,7 +255,11 @@ vacall_receiver: beq $18,$12,.L76 li $12,16 +#if __mips_isa_rev < 6 bnel $18,$12,.L77 +#else + bne $18,$12,.L77 +#endif move $sp,$fp lw $12,28($fp) @@ -258,7 +274,11 @@ vacall_receiver: .L45: sltu $12,$13,17 +#if __mips_isa_rev < 6 beql $12,$0,.L49 +#else + beq $12,$0,.L49 +#endif ld $17,16($24) sll $12,$13,3 diff --git a/vacall/vacall-mipsn32el-macro.S b/vacall/vacall-mipsn32el-macro.S index c0af829..0a77479 100644 --- a/vacall/vacall-mipsn32el-macro.S +++ b/vacall/vacall-mipsn32el-macro.S @@ -106,7 +106,11 @@ vacall_receiver: beq $13,$12,.L64 li $12,15 +#if __mips_isa_rev < 6 bnel $13,$12,.L77 +#else + bne $13,$12,.L77 +#endif move $sp,$fp lw $19,0($fp) @@ -114,7 +118,11 @@ vacall_receiver: beq $12,$0,.L60 andi $12,$19,0x4 +#if __mips_isa_rev < 6 beql $12,$0,.L34 +#else + beq $12,$0,.L34 +#endif lw $18,36($fp) lw $13,36($fp) @@ -128,7 +136,11 @@ vacall_receiver: beq $13,$12,.L74 li $12,8 +#if __mips_isa_rev < 6 bnel $13,$12,.L77 +#else + bne $13,$12,.L77 +#endif move $sp,$fp lw $12,28($fp) @@ -244,7 +256,11 @@ vacall_receiver: beq $18,$12,.L76 li $12,16 +#if __mips_isa_rev < 6 bnel $18,$12,.L77 +#else + bne $18,$12,.L77 +#endif move $sp,$fp lw $12,28($fp)