gas/

2007-09-15  H.J. Lu  <hongjiu.lu@intel.com>

	PR gas/5034
	* config/tc-i386.c (intel_e04): Return 1 if cur_token.code is
	T_NIL.

gas/testsuite/

2007-09-15  H.J. Lu  <hongjiu.lu@intel.com>

	PR gas/5034
	* gas/i386/x86-64-rip.s: Add Intel mode testcases.
	* gas/i386/x86-64-rip-intel.d: Updated.
	* gas/i386/x86-64-rip.d: Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 232640abbcbca78e988b0ac6ec1b195904128e08..b846caeb0679c503c690230637a3e02d94453867 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR gas/5034
+       * config/tc-i386.c (intel_e04): Return 1 if cur_token.code is
+       T_NIL.
+
 2007-09-14  H.J. Lu  <hongjiu.lu@intel.com>
 
        * config/tc-i386.c (build_modrm_byte): Adjust comment line

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 5453a00b31682f992db1da40c4193c7c0e5576c8..1a6d3452e81b015d1fe81a7b6aa442b895bc90f9 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -7913,6 +7913,9 @@ intel_e04 (void)
       if (!intel_e05())
        return 0;
 
+      if (cur_token.code == T_NIL)
+       return 1;
+
       if (nregs >= 0 && NUM_ADDRESS_REGS > nregs)
        i.base_reg = i386_regtab + REGNAM_AL; /* al is invalid as base */
 

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 540fca1d8f57271beb70e315eb428450d427e4b8..f8ff093f165c161012107071a6b59fc859c3b777 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR gas/5034
+       * gas/i386/x86-64-rip.s: Add Intel mode testcases.
+       * gas/i386/x86-64-rip-intel.d: Updated.
+       * gas/i386/x86-64-rip.d: Likewise.
+
 2007-09-14  Michael Meissner  <michael.meissner@amd.com>
            Dwarakanath Rajagopal  <dwarak.rajagopal@amd.com>
            Tony Linthicum  <tony.linthicum@amd.com>

diff --git a/gas/testsuite/gas/i386/x86-64-rip-intel.d b/gas/testsuite/gas/i386/x86-64-rip-intel.d
index 162f654c556d849b19ece1dedce8b421539c4359..24c9299f78fc6fd359bd4927b8586dd83abceab5 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-rip-intel.d
+++ b/gas/testsuite/gas/i386/x86-64-rip-intel.d
@@ -7,9 +7,13 @@
 
 Disassembly of section .text:
 
-0+000 <.text>:
-[       ]*0:[   ]+8d 05 00 00 00 00[    ]+lea[  ]+eax,\[rip\+0x0\][    ]*(#.*)?
-[       ]*6:[   ]+8d 05 11 11 11 11[    ]+lea[  ]+eax,\[rip\+0x11111111\][     ]*(#.*)?
-[       ]*c:[   ]+8d 05 01 00 00 00[    ]+lea[  ]+eax,\[rip\+0x1\][    ]*(#.*)?
-[       ]*12:[  ]+8d 05 00 00 00 00[    ]+lea[  ]+eax,\[rip\+0x0\][    ]*(#.*)?
+0+ <.text>:
+[      ]*[a-f0-9]+:    8d 05 00 00 00 00       lea    eax,\[rip\+0x0\][        ]*#[    ]*0x[a-f0-9]+[  ]+[a-f0-9]+: R_X86_64_PC32      symbol-0x4
+[      ]*[a-f0-9]+:    8d 05 11 11 11 11       lea    eax,\[rip\+0x11111111\]        # 0x1111111d
+[      ]*[a-f0-9]+:    8d 05 01 00 00 00       lea    eax,\[rip\+0x1\]        # 0x13
+[      ]*[a-f0-9]+:    8d 05 00 00 00 00       lea    eax,\[rip\+0x0\]        # 0x18
+[      ]*[a-f0-9]+:    48 8b 05 00 00 00 00    mov    rax,QWORD PTR \[rip\+0x0\][      ]*#[    ]*0x[a-f0-9]+[  ]+[a-f0-9]+: R_X86_64_PC32      __CTOR_END__-0xc
+[      ]*[a-f0-9]+:    48 8b 05 00 00 00 00    mov    rax,QWORD PTR \[rip\+0x0\][      ]*#[    ]*0x[a-f0-9]+[  ]+[a-f0-9]+: R_X86_64_PC32      __CTOR_END__-0xc
+[      ]*[a-f0-9]+:    48 8b 05 00 00 00 00    mov    rax,QWORD PTR \[rip\+0x0\][      ]*#[    ]*0x[a-f0-9]+[  ]+[a-f0-9]+: R_X86_64_PC32      __CTOR_END__-0xc
+[      ]*[a-f0-9]+:    48 8b 05 00 00 00 00    mov    rax,QWORD PTR \[rip\+0x0\][      ]*#[    ]*0x[a-f0-9]+[  ]+[a-f0-9]+: R_X86_64_PC32      __CTOR_END__-0xc
 #pass

diff --git a/gas/testsuite/gas/i386/x86-64-rip.d b/gas/testsuite/gas/i386/x86-64-rip.d
index 66fe771b9608c2b62388b47befe226c760971176..aea7faa3801405b772601b24690b17dc4167e815 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-rip.d
+++ b/gas/testsuite/gas/i386/x86-64-rip.d
@@ -6,9 +6,13 @@
 
 Disassembly of section .text:
 
-0+000 <.text>:
-[       ]*0:[   ]+8d 05 00 00 00 00[    ]+lea[  ]+0x0\(%rip\),%eax[    ]*(#.*)?
-[       ]*6:[   ]+8d 05 11 11 11 11[    ]+lea[  ]+0x11111111\(%rip\),%eax[     ]*(#.*)?
-[       ]*c:[   ]+8d 05 01 00 00 00[    ]+lea[  ]+0x1\(%rip\),%eax[    ]*(#.*)?
-[       ]*12:[  ]+8d 05 00 00 00 00[    ]+lea[  ]+0x0\(%rip\),%eax[    ]*(#.*)?
+0+ <.text>:
+[      ]*[a-f0-9]+:    8d 05 00 00 00 00       lea    0x0\(%rip\),%eax[        ]*#[    ]*0x[a-f0-9]+[  ]+[a-f0-9]+: R_X86_64_PC32      symbol-0x4
+[      ]*[a-f0-9]+:    8d 05 11 11 11 11       lea    0x11111111\(%rip\),%eax        # 0x1111111d
+[      ]*[a-f0-9]+:    8d 05 01 00 00 00       lea    0x1\(%rip\),%eax        # 0x13
+[      ]*[a-f0-9]+:    8d 05 00 00 00 00       lea    0x0\(%rip\),%eax        # 0x18
+[      ]*[a-f0-9]+:    48 8b 05 00 00 00 00    mov    0x0\(%rip\),%rax[        ]*#[    ]*0x[a-f0-9]+[  ]+[a-f0-9]+: R_X86_64_PC32      __CTOR_END__-0xc
+[      ]*[a-f0-9]+:    48 8b 05 00 00 00 00    mov    0x0\(%rip\),%rax[        ]*#[    ]*0x[a-f0-9]+[  ]+[a-f0-9]+: R_X86_64_PC32      __CTOR_END__-0xc
+[      ]*[a-f0-9]+:    48 8b 05 00 00 00 00    mov    0x0\(%rip\),%rax[        ]*#[    ]*0x[a-f0-9]+[  ]+[a-f0-9]+: R_X86_64_PC32      __CTOR_END__-0xc
+[      ]*[a-f0-9]+:    48 8b 05 00 00 00 00    mov    0x0\(%rip\),%rax[        ]*#[    ]*0x[a-f0-9]+[  ]+[a-f0-9]+: R_X86_64_PC32      __CTOR_END__-0xc
 #pass

diff --git a/gas/testsuite/gas/i386/x86-64-rip.s b/gas/testsuite/gas/i386/x86-64-rip.s
index c6ac1954b219e652b1fe092ab839c1c57f8a8735..8ba88c4d102d950a8662615ab1fa5ee34789b24a 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-rip.s
+++ b/gas/testsuite/gas/i386/x86-64-rip.s
@@ -3,3 +3,8 @@
        leal    0x11111111(%rip), %eax
        leal    1(%rip), %eax
        leal    (%rip), %eax
+.intel_syntax noprefix
+mov     rax, QWORD PTR __CTOR_END__-8[rip]
+mov     rax, QWORD PTR __CTOR_END__+-8[rip]
+mov     rax, QWORD PTR -8+__CTOR_END__[rip]
+mov     rax, QWORD PTR __CTOR_END__[rip-8]