projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 66eb668)
2006-03-16 Paul Brook <paul@codesourcery.com>
authorPaul Brook <paul@codesourcery.com>
Thu, 16 Mar 2006 15:08:48 +0000 (15:08 +0000)
committerPaul Brook <paul@codesourcery.com>
Thu, 16 Mar 2006 15:08:48 +0000 (15:08 +0000)
gas/
* config/tc-arm.c (insns): Add "svc".
gas/testsuite/
* gas/arm/svc.d: New test.
* gas/arm/svc.s: New test.
* gas/arm/inst.d: Accept svc mnemonic.
* gas/arm/thumb.d: Ditto.
* gas/arm/wince_inst.d: Ditto.
opcodes/
* arm-dis.c (arm_opcodes): Rename swi to svc.
(thumb_opcodes): Ditto.

gas/ChangeLog patch | blob | history
gas/config/tc-arm.c patch | blob | history
gas/testsuite/ChangeLog patch | blob | history
gas/testsuite/gas/arm/armv1.d patch | blob | history
gas/testsuite/gas/arm/inst.d patch | blob | history
gas/testsuite/gas/arm/svc.d [new file with mode: 0644] patch | blob
gas/testsuite/gas/arm/svc.s [new file with mode: 0644] patch | blob
gas/testsuite/gas/arm/thumb.d patch | blob | history
gas/testsuite/gas/arm/wince_inst.d patch | blob | history
opcodes/ChangeLog patch | blob | history
opcodes/arm-dis.c patch | blob | history

diff --git a/gas/ChangeLog b/gas/ChangeLog
index c3a83c332421d2688cbaa0f50b3ae14f87c782a3..6bda17a2774acd8f85bc1685d20280ffcfa082b1 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-16  Paul Brook  <paul@codesourcery.com>
+
+       * config/tc-arm.c (insns): Add "svc".
+
 2006-03-13  Bob Wilson  <bob.wilson@acm.org>
 
        * config/tc-xtensa.c (xg_translate_sysreg_op): Remove has_underbar
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index cab398f486e87671be3b5fcf5721746b48d2d839..3ca5bd423001fd9a6cd0b493b0bb67d919a25658 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -8950,6 +8950,7 @@ static const struct asm_opcode insns[] =
  tC3(ldmfd,    8900000, ldmia,    2, (RRw, REGLST), ldmstm, t_ldmstm),
 
  TCE(swi,      f000000, df00,     1, (EXPi),        swi, t_swi),
+ TCE(svc,      f000000, df00,     1, (EXPi),        swi, t_swi),
  tCE(b,                a000000, b,        1, (EXPr),        branch, t_branch),
  TCE(bl,       b000000, f000f800, 1, (EXPr),        bl, t_branch23),
 
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index bd72b8466f5b8517feb6c016c33b7f6f9278e977..ff3d25eaee3930fff4d4cca5584363d6722faa69 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-16  Paul Brook  <paul@codesourcery.com>
+
+       * gas/arm/svc.d: New test.
+       * gas/arm/svc.s: New test.
+       * gas/arm/inst.d: Accept svc mnemonic.
+       * gas/arm/thumb.d: Ditto.
+       * gas/arm/wince_inst.d: Ditto.
+
 2006-03-09  Paul Brook  <paul@codesourcery.com>
 
        * gas/arm/nomapping.d: New test.
diff --git a/gas/testsuite/gas/arm/armv1.d b/gas/testsuite/gas/arm/armv1.d
index f3b2c6b6c93efb4d8630f6bed57723307aa7a589..4e4c91376179cb6ced4996812422831ed7163c13 100644 (file)
--- a/gas/testsuite/gas/arm/armv1.d
+++ b/gas/testsuite/gas/arm/armv1.d
@@ -43,7 +43,7 @@ Disassembly of section .text:
 0+84 <[^>]*> e1b00000 ?        movs    r0, r0
 0+88 <[^>]*> e1e00000 ?        mvn     r0, r0
 0+8c <[^>]*> e1f00000 ?        mvns    r0, r0
-0+90 <[^>]*> ef000000 ?        swi     0x00000000
+0+90 <[^>]*> ef000000 ?        (swi|svc)       0x00000000
 0+94 <[^>]*> e5900000 ?        ldr     r0, \[r0\]
 0+98 <[^>]*> e5d00000 ?        ldrb    r0, \[r0\]
 0+9c <[^>]*> e4b10000 ?        ldrt    r0, \[r1\]
diff --git a/gas/testsuite/gas/arm/inst.d b/gas/testsuite/gas/arm/inst.d
index 53b6cc132dae7da96b9b202ea55b330dcc2de4e6..fbf27b4ab8db5a069f25da072be377a1eb72ea4a 100644 (file)
--- a/gas/testsuite/gas/arm/inst.d
+++ b/gas/testsuite/gas/arm/inst.d
@@ -159,8 +159,8 @@ Disassembly of section .text:
 0+24c <[^>]*> e9020018 ?       stmdb   r2, {r3, r4}
 0+250 <[^>]*> e8830003 ?       stmia   r3, {r0, r1}
 0+254 <[^>]*> e9c40300 ?       stmib   r4, {r8, r9}\^
-0+258 <[^>]*> ef123456 ?       swi     0x00123456
-0+25c <[^>]*> 2f000033 ?       swics   0x00000033
+0+258 <[^>]*> ef123456 ?       (swi|svc)       0x00123456
+0+25c <[^>]*> 2f000033 ?       (swi|svc)cs     0x00000033
 0+260 <[^>]*> eb...... ?       bl      0[0123456789abcdef]+ <[^>]*>
 [              ]*260:.*_wombat.*
 0+264 <[^>]*> 5b...... ?       blpl    0[0123456789abcdef]+ <[^>]*>
diff --git a/gas/testsuite/gas/arm/svc.d b/gas/testsuite/gas/arm/svc.d
new file mode 100644 (file)
index 0000000..697756c
--- /dev/null
+++ b/gas/testsuite/gas/arm/svc.d
@@ -0,0 +1,14 @@
+# name: SWI/SVC instructions
+# objdump: -dr --prefix-addresses --show-raw-insn
+
+.*: +file format .*arm.*
+
+Disassembly of section \.text:
+0+000 <[^>]+> ef123456         (swi|svc)       0x00123456
+0+004 <[^>]+> ef876543         (swi|svc)       0x00876543
+0+008 <[^>]+> ef123456         (swi|svc)       0x00123456
+0+00c <[^>]+> ef876543         (swi|svc)       0x00876543
+0+010 <[^>]+> df5a             (swi|svc)       90
+0+012 <[^>]+> dfa5             (swi|svc)       165
+0+014 <[^>]+> df5a             (swi|svc)       90
+0+016 <[^>]+> dfa5             (swi|svc)       165
diff --git a/gas/testsuite/gas/arm/svc.s b/gas/testsuite/gas/arm/svc.s
new file mode 100644 (file)
index 0000000..734bd75
--- /dev/null
+++ b/gas/testsuite/gas/arm/svc.s
@@ -0,0 +1,15 @@
+       .text
+       .arch armv4t
+       .syntax unified
+foo:
+       swi 0x123456
+       swi 0x876543
+       svc 0x123456
+       svc 0x876543
+
+       .thumb
+bar:
+       swi 0x5a
+       swi 0xa5
+       svc 0x5a
+       svc 0xa5
diff --git a/gas/testsuite/gas/arm/thumb.d b/gas/testsuite/gas/arm/thumb.d
index 53ea6cc11f5a106b0115736bbf00b73a6bd67610..d3f815a2986aaee3ebc8f827d72d324fb9b7b40f 100644 (file)
--- a/gas/testsuite/gas/arm/thumb.d
+++ b/gas/testsuite/gas/arm/thumb.d
@@ -126,14 +126,14 @@ Disassembly of section \.text:
 0+0ec <[^>]+> ebfffffc         bl      0+0e4 <[^>]+>
 0+0f0 <[^>]+> eb00000f         bl      0+134 <[^>]+>
 0+0f4 <[^>]+> e12fff10         bx      r0
-0+0f8 <[^>]+> ef123456         swi     0x00123456
+0+0f8 <[^>]+> ef123456         (swi|svc)       0x00123456
 0+0fc <[^>]+> a004             add     r0, pc, #16     \(adr r0,0+110 <[^>]+>\)
 0+0fe <[^>]+> e77f             b.n     0+000 <[^>]+>
 0+100 <[^>]+> e018             b.n     0+134 <[^>]+>
 0+102 <[^>]+> f7ff ff7d        bl      0+000 <[^>]+>
 0+106 <[^>]+> f000 f815        bl      0+134 <[^>]+>
 0+10a <[^>]+> 4700             bx      r0
-0+10c <[^>]+> dfff             swi     255
+0+10c <[^>]+> dfff             (swi|svc)       255
        \.\.\.
 0+110 <[^>]+> d010             beq.n   0+134 <[^>]+>
 0+112 <[^>]+> d10f             bne.n   0+134 <[^>]+>
diff --git a/gas/testsuite/gas/arm/wince_inst.d b/gas/testsuite/gas/arm/wince_inst.d
index 651464dd289b6e3aef89296dbb474273c84b6dc2..a9852e0394b8ced301789240365d2ace169d4630 100644 (file)
--- a/gas/testsuite/gas/arm/wince_inst.d
+++ b/gas/testsuite/gas/arm/wince_inst.d
@@ -161,8 +161,8 @@ Disassembly of section .text:
 0+24c <[^>]*> e9020018 ?       stmdb   r2, {r3, r4}
 0+250 <[^>]*> e8830003 ?       stmia   r3, {r0, r1}
 0+254 <[^>]*> e9c40300 ?       stmib   r4, {r8, r9}\^
-0+258 <[^>]*> ef123456 ?       swi     0x00123456
-0+25c <[^>]*> 2f000033 ?       swics   0x00000033
+0+258 <[^>]*> ef123456 ?       (swi|svc)       0x00123456
+0+25c <[^>]*> 2f000033 ?       (swi|svc)cs     0x00000033
 0+260 <[^>]*> eb000000 ?       bl      0+268 <[^>]*>
 [              ]*260:.*_wombat.*
 0+264 <[^>]*> 5b000000 ?       blpl    0+26c <[^>]*>
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 863d128c5b5eab366b479ba88665f851b912e67b..135cf20294264798d1fd69d6cc9934381d1ea0e9 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-16  Paul Brook  <paul@codesourcery.com>
+
+       * arm-dis.c (arm_opcodes): Rename swi to svc.
+       (thumb_opcodes): Ditto.
+
 2006-03-13  DJ Delorie  <dj@redhat.com>
 
        * m32c-asm.c: Regenerate.
diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c
index b5167e9b6f2a191a38fa7bd0d8f11349c96ec729..bc5b52cf9c08086011bf1d8deac694cfc7b05dc3 100644 (file)
--- a/opcodes/arm-dis.c
+++ b/opcodes/arm-dis.c
@@ -659,7 +659,7 @@ static const struct opcode32 arm_opcodes[] =
   {ARM_EXT_V1, 0x08000000, 0x0e100000, "stm%c%23?id%24?ba\t%16-19r%21'!, %m%22'^"},
   {ARM_EXT_V1, 0x08100000, 0x0e100000, "ldm%c%23?id%24?ba\t%16-19r%21'!, %m%22'^"},
   {ARM_EXT_V1, 0x0a000000, 0x0e000000, "b%24'l%c\t%b"},
-  {ARM_EXT_V1, 0x0f000000, 0x0f000000, "swi%c\t%0-23x"},
+  {ARM_EXT_V1, 0x0f000000, 0x0f000000, "svc%c\t%0-23x"},
 
   /* The rest.  */
   {ARM_EXT_V1, 0x00000000, 0x00000000, "undefined instruction %0-31x"},
@@ -798,7 +798,7 @@ static const struct opcode16 thumb_opcodes[] =
   {ARM_EXT_V4T, 0xC000, 0xF800, "stmia\t%8-10r!, %M"},
   {ARM_EXT_V4T, 0xC800, 0xF800, "ldmia\t%8-10r!, %M"},
   /* format 17 */
-  {ARM_EXT_V4T, 0xDF00, 0xFF00, "swi\t%0-7d"},
+  {ARM_EXT_V4T, 0xDF00, 0xFF00, "svc\t%0-7d"},
   /* format 16 */
   {ARM_EXT_V4T, 0xD000, 0xF000, "b%8-11c.n\t%0-7B"},
   /* format 18 */