diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 10 | ||||
| -rw-r--r-- | gas/config/tc-arm.c | 89 | ||||
| -rw-r--r-- | gas/doc/c-arm.texi | 9 | ||||
| -rw-r--r-- | gas/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/arch6zk.d | 28 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/arch6zk.s | 27 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/arm.exp | 1 |
7 files changed, 167 insertions, 3 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 5ee17b6..66b267a 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,13 @@ +2004-09-30 Paul Brook <paul@codesourcery.com> + + * config/tc-arm.c (do_smi, do_nop): New functions. + (insns): Add ARMv6ZK instructions. + (md_apply_fix3): Handle BFD_RELOC_ARM_SMI. + (tc_gen_reloc): Ditto. + (arm_cpus): Add mpcore and arm1176. + (arm_archs): Add armv6{k,z,zk}. + * doc/c-arm.texi: Document new cores and architectures. + 2004-09-30 Nick Clifton <nickc@redhat.com> * config/tc-arm.c: Use ISO C90 formatting. diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index d9c873a..752cd3c 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -2500,6 +2500,41 @@ cp_byte_address_required_here (char ** str) } static void +do_nop (char * str) +{ + skip_whitespace (str); + if (*str == '{') + { + str++; + + if (my_get_expression (&inst.reloc.exp, &str)) + inst.reloc.exp.X_op = O_illegal; + else + { + skip_whitespace (str); + if (*str == '}') + str++; + else + inst.reloc.exp.X_op = O_illegal; + } + + if (inst.reloc.exp.X_op != O_constant + || inst.reloc.exp.X_add_number > 255 + || inst.reloc.exp.X_add_number < 0) + { + inst.error = _("Invalid NOP hint"); + return; + } + + /* Arcitectural NOP hints are CPSR sets with no bits selected. */ + inst.instruction &= 0xf0000000; + inst.instruction |= 0x0320f000 + inst.reloc.exp.X_add_number; + } + + end_of_line (str); +} + +static void do_empty (char * str) { /* Do nothing really. */ @@ -4316,7 +4351,7 @@ do_pkhtb (char * str) } /* ARM V6 Load Register Exclusive instruction (argument parse). - LDREX{<cond>} <Rd, [<Rn>] + LDREX{,B,D,H}{<cond>} <Rd, [<Rn>] Condition defaults to COND_ALWAYS. Error if Rd or Rn are R15. See ARMARMv6 A4.1.27: LDREX. */ @@ -6635,6 +6670,23 @@ do_ldmstm (char * str) } static void +do_smi (char * str) +{ + skip_whitespace (str); + + /* Allow optional leading '#'. */ + if (is_immediate_prefix (*str)) + str++; + + if (my_get_expression (& inst.reloc.exp, & str)) + return; + + inst.reloc.type = BFD_RELOC_ARM_SMI; + inst.reloc.pc_rel = 0; + end_of_line (str); +} + +static void do_swi (char * str) { skip_whitespace (str); @@ -9791,7 +9843,7 @@ static const struct asm_opcode insns[] = /* Pseudo ops. */ {"adr", 0xe28f0000, 3, ARM_EXT_V1, do_adr}, {"adrl", 0xe28f0000, 3, ARM_EXT_V1, do_adrl}, - {"nop", 0xe1a00000, 3, ARM_EXT_V1, do_empty}, + {"nop", 0xe1a00000, 3, ARM_EXT_V1, do_nop}, /* ARM 2 multiplies. */ {"mul", 0xe0000090, 3, ARM_EXT_V2, do_mul}, @@ -9993,6 +10045,22 @@ static const struct asm_opcode insns[] = { "usat", 0xe6e00010, 4, ARM_EXT_V6, do_usat}, { "usat16", 0xe6e00f30, 6, ARM_EXT_V6, do_usat16}, + /* ARM V6K. */ + { "clrex", 0xf57ff01f, 0, ARM_EXT_V6K, do_empty}, + { "ldrexb", 0xe1d00f9f, 6, ARM_EXT_V6K, do_ldrex}, + { "ldrexd", 0xe1b00f9f, 6, ARM_EXT_V6K, do_ldrex}, + { "ldrexh", 0xe1f00f9f, 6, ARM_EXT_V6K, do_ldrex}, + { "sev", 0xe320f004, 3, ARM_EXT_V6K, do_empty}, + { "strexb", 0xe1c00f90, 6, ARM_EXT_V6K, do_strex}, + { "strexd", 0xe1a00f90, 6, ARM_EXT_V6K, do_strex}, + { "strexh", 0xe1e00f90, 6, ARM_EXT_V6K, do_strex}, + { "wfe", 0xe320f002, 3, ARM_EXT_V6K, do_empty}, + { "wfi", 0xe320f003, 3, ARM_EXT_V6K, do_empty}, + { "yield", 0xe320f001, 5, ARM_EXT_V6K, do_empty}, + + /* ARM V6Z. */ + { "smi", 0xe1600070, 3, ARM_EXT_V6Z, do_smi}, + /* Core FPA instruction set (V1). */ {"wfs", 0xee200110, 3, FPU_FPA_EXT_V1, do_fpa_ctrl}, {"rfs", 0xee300110, 3, FPU_FPA_EXT_V1, do_fpa_ctrl}, @@ -11650,6 +11718,15 @@ md_apply_fix3 (fixS * fixP, md_number_to_chars (buf, newval, INSN_SIZE); break; + case BFD_RELOC_ARM_SMI: + if (((unsigned long) value) > 0xffff) + as_bad_where (fixP->fx_file, fixP->fx_line, + _("invalid smi expression")); + newval = md_chars_to_number (buf, INSN_SIZE) & 0xfff000f0; + newval |= (value & 0xf) | ((value & 0xfff0) << 4); + md_number_to_chars (buf, newval, INSN_SIZE); + break; + case BFD_RELOC_ARM_SWI: if (arm_data->thumb_mode) { @@ -12204,6 +12281,7 @@ tc_gen_reloc (asection * section ATTRIBUTE_UNUSED, { case BFD_RELOC_ARM_OFFSET_IMM8: type = "OFFSET_IMM8"; break; case BFD_RELOC_ARM_SHIFT_IMM: type = "SHIFT_IMM"; break; + case BFD_RELOC_ARM_SMI: type = "SMI"; break; case BFD_RELOC_ARM_SWI: type = "SWI"; break; case BFD_RELOC_ARM_MULTI: type = "MULTI"; break; case BFD_RELOC_ARM_CP_OFF_IMM: type = "CP_OFF_IMM"; break; @@ -12740,6 +12818,10 @@ static struct arm_cpu_option_table arm_cpus[] = {"arm1136j-s", ARM_ARCH_V6, FPU_NONE}, {"arm1136jfs", ARM_ARCH_V6, FPU_ARCH_VFP_V2}, {"arm1136jf-s", ARM_ARCH_V6, FPU_ARCH_VFP_V2}, + {"mpcore", ARM_ARCH_V6K, FPU_ARCH_VFP_V2}, + {"mpcorenovfp", ARM_ARCH_V6K, FPU_NONE}, + {"arm1176jz-s", ARM_ARCH_V6ZK, FPU_NONE}, + {"arm1176jzf-s", ARM_ARCH_V6ZK, FPU_ARCH_VFP_V2}, /* ??? XSCALE is really an architecture. */ {"xscale", ARM_ARCH_XSCALE, FPU_ARCH_VFP_V2}, /* ??? iwmmxt is not a processor. */ @@ -12780,6 +12862,9 @@ static struct arm_arch_option_table arm_archs[] = {"armv5tej", ARM_ARCH_V5TEJ, FPU_ARCH_VFP}, {"armv6", ARM_ARCH_V6, FPU_ARCH_VFP}, {"armv6j", ARM_ARCH_V6, FPU_ARCH_VFP}, + {"armv6k", ARM_ARCH_V6K, FPU_ARCH_VFP}, + {"armv6z", ARM_ARCH_V6Z, FPU_ARCH_VFP}, + {"armv6zk", ARM_ARCH_V6ZK, FPU_ARCH_VFP}, {"xscale", ARM_ARCH_XSCALE, FPU_ARCH_VFP}, {"iwmmxt", ARM_ARCH_IWMMXT, FPU_ARCH_VFP}, {NULL, 0, 0} diff --git a/gas/doc/c-arm.texi b/gas/doc/c-arm.texi index d8027d2..cb4569b 100644 --- a/gas/doc/c-arm.texi +++ b/gas/doc/c-arm.texi @@ -1,4 +1,4 @@ -@c Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003 +@c Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 @c Free Software Foundation, Inc. @c This is part of the GAS manual. @c For copying conditions, see the file as.texinfo. @@ -96,6 +96,10 @@ recognized: @code{arm1026ej-s}, @code{arm1136j-s}, @code{arm1136jf-s}, +@code{arm1176jz-s}, +@code{arm1176jzf-s}, +@code{mpcore}, +@code{mpcorenovfp}, @code{ep9312} (ARM920 with Cirrus Maverick coprocessor), @code{i80200} (Intel XScale processor) @code{iwmmxt} (Intel(r) XScale processor with Wireless MMX(tm) technology coprocessor) @@ -137,6 +141,9 @@ names are recognized: @code{armv5texp}, @code{armv6}, @code{armv6j}, +@code{armv6k}, +@code{armv6z}, +@code{armv6zk}, @code{iwmmxt} and @code{xscale}. diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index a99939c..e7cd66c 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2004-09-30 Paul Brook <paul@codesourcery.com> + + * gas/arm/arch6zk.d: New file. + * gas/arm/arch6zk.s: New file. + * gas/arm/arm.exp: Add them. + 2004-09-29 Alan Modra <amodra@bigpond.net.au> * gas/i386/secrel.s: Pad .rdata out to 16 byte boundary. diff --git a/gas/testsuite/gas/arm/arch6zk.d b/gas/testsuite/gas/arm/arch6zk.d new file mode 100644 index 0000000..318e312 --- /dev/null +++ b/gas/testsuite/gas/arm/arch6zk.d @@ -0,0 +1,28 @@ +#name: ARM V6 instructions +#as: -march=armv6zk +#objdump: -dr --prefix-addresses --show-raw-insn + +.*: +file format .*arm.* + +Disassembly of section .text: +0+000 <[^>]*> f57ff01f ? clrex +0+004 <[^>]*> e1dc3f9f ? ldrexb r3, \[ip\] +0+008 <[^>]*> 11d3cf9f ? ldrexbne ip, \[r3\] +0+00c <[^>]*> e1bc3f9f ? ldrexd r3, \[ip\] +0+010 <[^>]*> 11b3cf9f ? ldrexdne ip, \[r3\] +0+014 <[^>]*> e1fc3f9f ? ldrexh r3, \[ip\] +0+018 <[^>]*> 11f3cf9f ? ldrexhne ip, \[r3\] +0+01c <[^>]*> e320f080 ? nop \{128\} +0+020 <[^>]*> 1320f07f ? nopne \{127\} +0+024 <[^>]*> e320f004 ? sev +0+028 <[^>]*> e1c73f9c ? strexb r3, ip, \[r7\] +0+02c <[^>]*> 11c8cf93 ? strexbne ip, r3, \[r8\] +0+030 <[^>]*> e1a73f9c ? strexd r3, ip, \[r7\] +0+034 <[^>]*> 11a8cf93 ? strexdne ip, r3, \[r8\] +0+038 <[^>]*> e1e73f9c ? strexh r3, ip, \[r7\] +0+03c <[^>]*> 11e8cf93 ? strexhne ip, r3, \[r8\] +0+040 <[^>]*> e320f002 ? wfe +0+044 <[^>]*> e320f003 ? wfi +0+048 <[^>]*> e320f001 ? yield +0+04c <[^>]*> e16ec371 ? smi 60465 +0+050 <[^>]*> 11613c7e ? smine 5070 diff --git a/gas/testsuite/gas/arm/arch6zk.s b/gas/testsuite/gas/arm/arch6zk.s new file mode 100644 index 0000000..cf769be --- /dev/null +++ b/gas/testsuite/gas/arm/arch6zk.s @@ -0,0 +1,27 @@ +.text +.align 0 + +label: + # ARMV6K instructions + clrex + ldrexb r3, [r12] + ldrexbne r12, [r3] + ldrexd r3, [r12] + ldrexdne r12, [r3] + ldrexh r3, [r12] + ldrexhne r12, [r3] + nop {128} + nopne {127} + sev + strexb r3, r12, [r7] + strexbne r12, r3, [r8] + strexd r3, r12, [r7] + strexdne r12, r3, [r8] + strexh r3, r12, [r7] + strexhne r12, r3, [r8] + wfe + wfi + yield + # ARMV6Z instructions + smi 0xec31 + smine 0x13ce diff --git a/gas/testsuite/gas/arm/arm.exp b/gas/testsuite/gas/arm/arm.exp index 16361d9..732468a 100644 --- a/gas/testsuite/gas/arm/arm.exp +++ b/gas/testsuite/gas/arm/arm.exp @@ -50,6 +50,7 @@ if {[istarget *arm*-*-*] || [istarget "xscale-*-*"]} then { run_dump_test "maverick" run_dump_test "archv6" run_dump_test "thumbv6" + run_dump_test "arch6zk" run_errors_test "vfp-bad" "-mfpu=vfp" "VFP errors" run_errors_test "req" "-mcpu=arm7m" ".req errors" |