aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2022-04-12 09:01:55 +0200
committerJan Beulich <jbeulich@suse.com>2022-04-12 09:01:55 +0200
commit1a42a9fe4e60599bba1f047743a5b8b2ba96ee1f (patch)
tree24930b47a8f0bb86a8cfb18ee15949a73122284d /gas
parent50192212a72b48de7ae4d87c79d394f4e3461a5b (diff)
downloadgdb-1a42a9fe4e60599bba1f047743a5b8b2ba96ee1f.zip
gdb-1a42a9fe4e60599bba1f047743a5b8b2ba96ee1f.tar.gz
gdb-1a42a9fe4e60599bba1f047743a5b8b2ba96ee1f.tar.bz2
x86: make {disp16} work similarly to {disp32}
In a few places {disp32} was handled specially when really {disp16} wants handling just the same.
Diffstat (limited to 'gas')
-rw-r--r--gas/config/tc-i386.c6
-rw-r--r--gas/testsuite/gas/i386/inval-pseudo.l6
-rw-r--r--gas/testsuite/gas/i386/inval-pseudo.s3
-rw-r--r--gas/testsuite/gas/i386/pseudos.d4
-rw-r--r--gas/testsuite/gas/i386/pseudos.s7
5 files changed, 22 insertions, 4 deletions
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index c2678ea..c26b654 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -4937,7 +4937,7 @@ md_assemble (char *line)
/* Don't optimize displacement for movabs since it only takes 64bit
displacement. */
if (i.disp_operands
- && i.disp_encoding != disp_encoding_32bit
+ && i.disp_encoding <= disp_encoding_8bit
&& (flag_code != CODE_64BIT
|| strcmp (mnemonic, "movabs") != 0))
optimize_disp ();
@@ -6304,7 +6304,7 @@ check_VecOperands (const insn_template *t)
/* Check vector Disp8 operand. */
if (t->opcode_modifier.disp8memshift
- && i.disp_encoding != disp_encoding_32bit)
+ && i.disp_encoding <= disp_encoding_8bit)
{
if (i.broadcast.type)
i.memshift = t->opcode_modifier.broadcast - 1;
@@ -8772,7 +8772,7 @@ output_branch (void)
}
code16 = flag_code == CODE_16BIT ? CODE16 : 0;
- size = i.disp_encoding == disp_encoding_32bit ? BIG : SMALL;
+ size = i.disp_encoding > disp_encoding_8bit ? BIG : SMALL;
prefix = 0;
if (i.prefix[DATA_PREFIX] != 0)
diff --git a/gas/testsuite/gas/i386/inval-pseudo.l b/gas/testsuite/gas/i386/inval-pseudo.l
index 9df0a98..f3b0274 100644
--- a/gas/testsuite/gas/i386/inval-pseudo.l
+++ b/gas/testsuite/gas/i386/inval-pseudo.l
@@ -2,6 +2,8 @@
.*:3: Error: .*
.*:5: Error: .*
.*:6: Error: .*
+.*:7: Error: .*
+.*:9: Error: .*
GAS LISTING .*
@@ -11,5 +13,7 @@ GAS LISTING .*
[ ]*4[ ]+\?\?\?\? 90 nop
[ ]*5[ ]+\{disp32\} movb \(%bp\),%al
[ ]*6[ ]+\{disp16\} movb \(%ebp\),%al
-[ ]*7[ ]+\?\?\?\? 00000000 \.p2align 4,0
+[ ]*7[ ]+\{disp16\} jmp \.
+[ ]*8[ ]+\.code16
+[ ]*9[ ]+\{disp32\} jmp \.
#...
diff --git a/gas/testsuite/gas/i386/inval-pseudo.s b/gas/testsuite/gas/i386/inval-pseudo.s
index b5a6233..5184b67 100644
--- a/gas/testsuite/gas/i386/inval-pseudo.s
+++ b/gas/testsuite/gas/i386/inval-pseudo.s
@@ -4,4 +4,7 @@
nop
{disp32} movb (%bp),%al
{disp16} movb (%ebp),%al
+ {disp16} jmp .
+ .code16
+ {disp32} jmp .
.p2align 4,0
diff --git a/gas/testsuite/gas/i386/pseudos.d b/gas/testsuite/gas/i386/pseudos.d
index 4f029f1..0772c63 100644
--- a/gas/testsuite/gas/i386/pseudos.d
+++ b/gas/testsuite/gas/i386/pseudos.d
@@ -25,6 +25,7 @@ Disassembly of section .text:
+[a-f0-9]+: c5 f8 28 90 80 00 00 00 vmovaps 0x80\(%eax\),%xmm2
+[a-f0-9]+: c5 f8 28 90 80 00 00 00 vmovaps 0x80\(%eax\),%xmm2
+[a-f0-9]+: 62 f1 7c 08 28 50 08 vmovaps 0x80\(%eax\),%xmm2
+ +[a-f0-9]+: 67 62 f1 7c 08 28 97 80 00 vmovaps 0x80\(%bx\),%xmm2
+[a-f0-9]+: 62 f1 7c 08 28 90 80 00 00 00 vmovaps 0x80\(%eax\),%xmm2
+[a-f0-9]+: 89 c8 mov %ecx,%eax
+[a-f0-9]+: 8b c1 mov %ecx,%eax
@@ -324,6 +325,7 @@ Disassembly of section .text:
+[a-f0-9]+: c5 f8 28 90 80 00 00 00 vmovaps 0x80\(%eax\),%xmm2
+[a-f0-9]+: c5 f8 28 90 80 00 00 00 vmovaps 0x80\(%eax\),%xmm2
+[a-f0-9]+: 62 f1 7c 08 28 50 08 vmovaps 0x80\(%eax\),%xmm2
+ +[a-f0-9]+: 67 62 f1 7c 08 28 97 80 00 vmovaps 0x80\(%bx\),%xmm2
+[a-f0-9]+: 62 f1 7c 08 28 90 80 00 00 00 vmovaps 0x80\(%eax\),%xmm2
+[a-f0-9]+: 89 c8 mov %ecx,%eax
+[a-f0-9]+: 8b c1 mov %ecx,%eax
@@ -354,4 +356,6 @@ Disassembly of section .text:
+[a-f0-9]+: 67 8a 46 00 mov 0x0\(%bp\),%al
+[a-f0-9]+: 67 8a 46 00 mov 0x0\(%bp\),%al
+[a-f0-9]+: 67 8a 86 00 00 mov 0x0\(%bp\),%al
+ +[a-f0-9]+: e9 fb ff ff ff jmp [0-9a-f]* <.*>
+ +[a-f0-9]+: e9 fd ff ff ff jmp [0-9a-f]* <.*>
#pass
diff --git a/gas/testsuite/gas/i386/pseudos.s b/gas/testsuite/gas/i386/pseudos.s
index 603e112..34a461c 100644
--- a/gas/testsuite/gas/i386/pseudos.s
+++ b/gas/testsuite/gas/i386/pseudos.s
@@ -20,6 +20,7 @@ _start:
{vex} {disp8} vmovaps 128(%eax),%xmm2
{vex} {disp32} vmovaps 128(%eax),%xmm2
{evex} {disp8} vmovaps 128(%eax),%xmm2
+ {evex} {disp16} vmovaps 128(%bx),%xmm2
{evex} {disp32} vmovaps 128(%eax),%xmm2
mov %ecx, %eax
@@ -337,6 +338,7 @@ _start:
{vex} {disp8} vmovaps xmm2,XMMWORD PTR [eax+128]
{vex} {disp32} vmovaps xmm2,XMMWORD PTR [eax+128]
{evex} {disp8} vmovaps xmm2,XMMWORD PTR [eax+128]
+ {evex} {disp16} vmovaps xmm2,XMMWORD PTR [bx+128]
{evex} {disp32} vmovaps xmm2,XMMWORD PTR [eax+128]
mov eax,ecx
@@ -373,3 +375,8 @@ _start:
mov al, BYTE PTR [bp]
{disp8} mov al, BYTE PTR [bp]
{disp16} mov al, BYTE PTR [bp]
+
+ {disp32} jmp .
+ .code16
+ {disp16} jmp .
+ .byte -1, -1