diff options
| author | Roland McGrath <roland@gnu.org> | 2012-05-29 16:32:11 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2012-05-29 16:32:11 +0000 |
| commit | d416e51da0f5e79c66f1d609068e83fff4add35a (patch) | |
| tree | 99554506bbc79f81aa1a8eeed32237f98579886e /gas/testsuite | |
| parent | acf89cab13c1826d83dce1c7ae8ea805bc034bda (diff) | |
| download | gdb-d416e51da0f5e79c66f1d609068e83fff4add35a.zip gdb-d416e51da0f5e79c66f1d609068e83fff4add35a.tar.gz gdb-d416e51da0f5e79c66f1d609068e83fff4add35a.tar.bz2 | |
gas/
* read.c [HANDLE_BUNDLE] (bundle_lock_depth): New variable.
(read_a_source_file) [HANDLE_BUNDLE]: Reset it.
[HANDLE_BUNDLE] (s_bundle_lock, s_bundle_unlock): Allow nested
pairs.
gas/testsuite/
* gas/i386/bundle-bad.s: Remove nested .bundle_lock case.
* gas/i386/bundle-bad.l: Remove expected error line.
* gas/i386/bundle-lock.s: Add nested .bundle_lock case.
* gas/i386/bundle-lock.d: Update expectations.
Diffstat (limited to 'gas/testsuite')
| -rw-r--r-- | gas/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gas/testsuite/gas/i386/bundle-bad.l | 3 | ||||
| -rw-r--r-- | gas/testsuite/gas/i386/bundle-bad.s | 7 | ||||
| -rw-r--r-- | gas/testsuite/gas/i386/bundle-lock.d | 6 | ||||
| -rw-r--r-- | gas/testsuite/gas/i386/bundle-lock.s | 10 |
5 files changed, 23 insertions, 10 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index e19086a..78bec37 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2012-05-29 Roland McGrath <mcgrathr@google.com> + + * gas/i386/bundle-bad.s: Remove nested .bundle_lock case. + * gas/i386/bundle-bad.l: Remove expected error line. + * gas/i386/bundle-lock.s: Add nested .bundle_lock case. + * gas/i386/bundle-lock.d: Update expectations. + 2012-05-28 Nick Clifton <nickc@redhat.com> * gas/elf/syms.s: New test - checks the generation of multibyte diff --git a/gas/testsuite/gas/i386/bundle-bad.l b/gas/testsuite/gas/i386/bundle-bad.l index ece5d7e..dd6a793 100644 --- a/gas/testsuite/gas/i386/bundle-bad.l +++ b/gas/testsuite/gas/i386/bundle-bad.l @@ -7,5 +7,4 @@ [^:]*:26:.*cannot change section or subsection inside \.bundle_lock [^:]*:31:.*cannot change \.bundle_align_mode inside \.bundle_lock [^:]*:36:.*\.bundle_unlock without preceding \.bundle_lock -[^:]*:41:.*second \.bundle_lock without \.bundle_unlock -[^:]*:46:.*\.bundle_lock with no matching \.bundle_unlock +[^:]*:39:.*\.bundle_lock with no matching \.bundle_unlock diff --git a/gas/testsuite/gas/i386/bundle-bad.s b/gas/testsuite/gas/i386/bundle-bad.s index 0974d30..0234ae5 100644 --- a/gas/testsuite/gas/i386/bundle-bad.s +++ b/gas/testsuite/gas/i386/bundle-bad.s @@ -35,13 +35,6 @@ hlt .bundle_unlock - # Nested .bundle_lock. - .bundle_lock - clc - .bundle_lock - cld - .bundle_unlock - # End of input with dangling .bundle_lock. .bundle_lock hlt diff --git a/gas/testsuite/gas/i386/bundle-lock.d b/gas/testsuite/gas/i386/bundle-lock.d index afca500..86547e0 100644 --- a/gas/testsuite/gas/i386/bundle-lock.d +++ b/gas/testsuite/gas/i386/bundle-lock.d @@ -3052,5 +3052,9 @@ Disassembly of section \.text: #... *bde0:\s+(f4\s+hlt|f8\s+clc)\s* #... - *be00:\s+f4\s+hlt\s* + *be00:\s+f8\s+clc\s* + *be01:\s+fc\s+cld\s* + *be02:\s+f8\s+clc\s* +#... + *be20:\s+f4\s+hlt\s* #pass diff --git a/gas/testsuite/gas/i386/bundle-lock.s b/gas/testsuite/gas/i386/bundle-lock.s index 6fca9c8..af52e99 100644 --- a/gas/testsuite/gas/i386/bundle-lock.s +++ b/gas/testsuite/gas/i386/bundle-lock.s @@ -90,4 +90,14 @@ sequence_\size\()_offset_\offset\(): test_offsets 32 .p2align 5 + # Nested .bundle_lock. + .bundle_lock + clc + .bundle_lock + cld + .bundle_unlock + clc + .bundle_unlock + +.p2align 5 hlt |