From 716c08de28589a5560b3337f1b935ed84a49b5e5 Mon Sep 17 00:00:00 2001 From: Chenghua Xu Date: Wed, 29 Aug 2018 17:39:33 +0800 Subject: [MIPS/GAS] Split Loongson CAM Instructions from loongson3a bfd/ * elfxx-mips.c (print_mips_ases): Add CAM extension. binutils/ * readelf.c (print_mips_ases): Add CAM extension. gas/ * NEWS: Mention Loongson Content Address Memory (CAM) support. * config/tc-mips.c (options): Add OPTION_LOONGSON_CAM and OPTION_NO_LOONGSON_CAM. (md_longopts): Likewise. (mips_ases): Define availability for CAM. (mips_convert_ase_flags): Map ASE_LOONGSON_CAM to AFL_ASE_LOONGSON_CAM. (mips_cpu_info_table): Add ASE_LOONGSON_CAM for loongson3a. (md_show_usage): Add help for -mloongson-cam and -mno-loongson-cam. * doc/as.texi: Document -mloongson-cam, -mno-loongson-cam. * doc/c-mips.texi: Document -mloongson-cam, -mno-loongson-cam, .set loongson-cam and .set noloongson-cam. * testsuite/gas/mips/loongson-3a-2.d: Move cam test to ... * testsuite/gas/mips/loongson-cam.d: Here. Add ISA/ASE flag verification. * testsuite/gas/mips/loongson-3a-2.s: Move cam test to ... * testsuite/gas/mips/loongson-cam.s: Here. * testsuite/gas/mips/loongson-3a-mmi.d: Add ASE flag. * testsuite/gas/mips/mips.exp: Run loongson-cam test. include/ * elf/mips.h (AFL_ASE_LOONGSON_CAM): New macro. (AFL_ASE_MASK): Update to include AFL_ASE_LOONGSON_CAM. * opcode/mips.h (ASE_LOONGSON_CAM): New macro. opcodes/ * mips-dis.c (mips_arch_choices): Add CAM to loongson3a descriptors. (parse_mips_ase_option): Handle -M loongson-cam option. (print_mips_disassembler_options): Document -M loongson-cam. * mips-opc.c (LCAM): New macro. (mips_opcodes): Replace IL2F|IL3A marking with LCAM for CAM instructions. --- gas/ChangeLog | 24 ++++++++++++++++++++++++ gas/NEWS | 2 ++ gas/config/tc-mips.c | 19 +++++++++++++++++-- gas/doc/as.texi | 7 +++++++ gas/doc/c-mips.texi | 15 +++++++++++++++ gas/testsuite/gas/mips/loongson-3a-2.d | 4 ---- gas/testsuite/gas/mips/loongson-3a-2.s | 5 ----- gas/testsuite/gas/mips/loongson-3a-mmi.d | 1 + gas/testsuite/gas/mips/loongson-cam.d | 27 +++++++++++++++++++++++++++ gas/testsuite/gas/mips/loongson-cam.s | 7 +++++++ gas/testsuite/gas/mips/mips.exp | 2 ++ 11 files changed, 102 insertions(+), 11 deletions(-) create mode 100644 gas/testsuite/gas/mips/loongson-cam.d create mode 100644 gas/testsuite/gas/mips/loongson-cam.s (limited to 'gas') diff --git a/gas/ChangeLog b/gas/ChangeLog index ef02ae4..30b82ae 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,27 @@ +2018-08-29 Chenghua Xu + + * NEWS: Mention Loongson Content Address Memory (CAM) + support. + * config/tc-mips.c (options): Add OPTION_LOONGSON_CAM and + OPTION_NO_LOONGSON_CAM. + (md_longopts): Likewise. + (mips_ases): Define availability for CAM. + (mips_convert_ase_flags): Map ASE_LOONGSON_CAM to + AFL_ASE_LOONGSON_CAM. + (mips_cpu_info_table): Add ASE_LOONGSON_CAM for loongson3a. + (md_show_usage): Add help for -mloongson-cam and + -mno-loongson-cam. + * doc/as.texi: Document -mloongson-cam, -mno-loongson-cam. + * doc/c-mips.texi: Document -mloongson-cam, -mno-loongson-cam, + .set loongson-cam and .set noloongson-cam. + * testsuite/gas/mips/loongson-3a-2.d: Move cam test to ... + * testsuite/gas/mips/loongson-cam.d: Here. Add ISA/ASE + flag verification. + * testsuite/gas/mips/loongson-3a-2.s: Move cam test to ... + * testsuite/gas/mips/loongson-cam.s: Here. + * testsuite/gas/mips/loongson-3a-mmi.d: Add ASE flag. + * testsuite/gas/mips/mips.exp: Run loongson-cam test. + 2018-08-27 H.J. Lu * testsuite/gas/i386/i386.exp: Run property-1 and diff --git a/gas/NEWS b/gas/NEWS index 1f441eb..b710c7a 100644 --- a/gas/NEWS +++ b/gas/NEWS @@ -1,5 +1,7 @@ -*- text -*- +* Add support for the MIPS Loongson Content Address Memory (CAM) ASE. + * Add support for the C-SKY processor series. * Add support for the MIPS Loongson MultiMedia extensions Instructions (MMI) diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index 9bbf59c..1f58a6d 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -1531,6 +1531,8 @@ enum options OPTION_NO_GINV, OPTION_LOONGSON_MMI, OPTION_NO_LOONGSON_MMI, + OPTION_LOONGSON_CAM, + OPTION_NO_LOONGSON_CAM, OPTION_END_OF_ENUM }; @@ -1593,6 +1595,8 @@ struct option md_longopts[] = {"mno-ginv", no_argument, NULL, OPTION_NO_GINV}, {"mloongson-mmi", no_argument, NULL, OPTION_LOONGSON_MMI}, {"mno-loongson-mmi", no_argument, NULL, OPTION_NO_LOONGSON_MMI}, + {"mloongson-cam", no_argument, NULL, OPTION_LOONGSON_CAM}, + {"mno-loongson-cam", no_argument, NULL, OPTION_NO_LOONGSON_CAM}, /* Old-style architecture options. Don't add more of these. */ {"m4650", no_argument, NULL, OPTION_M4650}, @@ -1795,6 +1799,11 @@ static const struct mips_ase mips_ases[] = { OPTION_LOONGSON_MMI, OPTION_NO_LOONGSON_MMI, 0, 0, -1, -1, -1 }, + + { "loongson-cam", ASE_LOONGSON_CAM, 0, + OPTION_LOONGSON_CAM, OPTION_NO_LOONGSON_CAM, + 0, 0, -1, -1, + -1 }, }; /* The set of ASEs that require -mfp64. */ @@ -19028,6 +19037,8 @@ mips_convert_ase_flags (int ase) ext_ases |= AFL_ASE_GINV; if (ase & ASE_LOONGSON_MMI) ext_ases |= AFL_ASE_LOONGSON_MMI; + if (ase & ASE_LOONGSON_CAM) + ext_ases |= AFL_ASE_LOONGSON_CAM; return ext_ases; } @@ -19773,9 +19784,10 @@ static const struct mips_cpu_info mips_cpu_info_table[] = /* Broadcom SB-1A CPU core */ { "sb1a", 0, ASE_MIPS3D | ASE_MDMX, ISA_MIPS64, CPU_SB1 }, - { "loongson3a", 0, ASE_LOONGSON_MMI, ISA_MIPS64R2, CPU_LOONGSON_3A }, - /* MIPS 64 Release 2 */ + /* Loongson CPU core */ + { "loongson3a", 0, ASE_LOONGSON_MMI | ASE_LOONGSON_CAM, ISA_MIPS64R2, + CPU_LOONGSON_3A }, /* Cavium Networks Octeon CPU core */ { "octeon", 0, 0, ISA_MIPS64R2, CPU_OCTEON }, @@ -20051,6 +20063,9 @@ MIPS options:\n\ -mloongson-mmi generate Loongson MultiMedia extensions Instructions (MMI) instructions\n\ -mno-loongson-mmi do not generate Loongson MultiMedia extensions Instructions\n")); fprintf (stream, _("\ +-mloongson-cam generate Loongson Content Address Memory (CAM) instructions\n\ +-mno-loongson-cam do not generate Loongson Content Address Memory Instructions\n")); + fprintf (stream, _("\ -minsn32 only generate 32-bit microMIPS instructions\n\ -mno-insn32 generate all microMIPS instructions\n")); fprintf (stream, _("\ diff --git a/gas/doc/as.texi b/gas/doc/as.texi index be84bf2..5d10e07 100644 --- a/gas/doc/as.texi +++ b/gas/doc/as.texi @@ -445,6 +445,7 @@ gcc(1), ld(1), and the Info entries for @file{binutils} and @file{ld}. [@b{-mcrc}] [@b{-mno-crc}] [@b{-mginv}] [@b{-mno-ginv}] [@b{-mloongson-mmi}] [@b{-mno-loongson-mmi}] + [@b{-mloongson-cam}] [@b{-mno-loongson-cam}] [@b{-minsn32}] [@b{-mno-insn32}] [@b{-mfix7000}] [@b{-mno-fix7000}] [@b{-mfix-rm7000}] [@b{-mno-fix-rm7000}] @@ -1573,6 +1574,12 @@ Application Specific Extension. This tells the assembler to accept MMI instructions. @samp{-mno-loongson-mmi} turns off this option. +@item -mloongson-cam +@itemx -mno-loongson-cam +Generate code for the Loongson Content Address Memory (CAM) instructions. +This tells the assembler to accept Loongson CAM instructions. +@samp{-mno-loongson-cam} turns off this option. + @item -minsn32 @itemx -mno-insn32 Only use 32-bit instruction encodings when generating code for the diff --git a/gas/doc/c-mips.texi b/gas/doc/c-mips.texi index d10f2d6..7d5d869 100644 --- a/gas/doc/c-mips.texi +++ b/gas/doc/c-mips.texi @@ -253,6 +253,13 @@ Application Specific Extension. This tells the assembler to accept MMI instructions. @samp{-mno-loongson-mmi} turns off this option. +@item -mloongson-cam +@itemx -mno-loongson-cam +Generate code for the Loongson Content Address Memory (CAM) +Application Specific Extension. This tells the assembler to accept CAM +instructions. +@samp{-mno-loongson-cam} turns off this option. + @item -minsn32 @itemx -mno-insn32 Only use 32-bit instruction encodings when generating code for the @@ -1152,6 +1159,14 @@ instructions from the MMI Extension from that point on in the assembly. The @code{.set noloongson-mmi} directive prevents MMI instructions from being accepted. +@cindex Loongson Content Address Memory (CAM) generation override +@kindex @code{.set loongson-cam} +@kindex @code{.set noloongson-cam} +The directive @code{.set loongson-cam} makes the assembler accept +instructions from the Loongson CAM from that point on in the assembly. +The @code{.set noloongson-cam} directive prevents Loongson CAM instructions +from being accepted. + Traditional MIPS assemblers do not support these directives. @node MIPS Floating-Point diff --git a/gas/testsuite/gas/mips/loongson-3a-2.d b/gas/testsuite/gas/mips/loongson-3a-2.d index 8ef4c8e..ff2f553 100644 --- a/gas/testsuite/gas/mips/loongson-3a-2.d +++ b/gas/testsuite/gas/mips/loongson-3a-2.d @@ -7,10 +7,6 @@ Disassembly of section .text: [0-9a-f]+ <.text>: -.*: 70601075 campi \$2,\$3 -.*: 70a02035 campv \$4,\$5 -.*: 70e830b5 camwi \$6,\$7,\$8 -.*: 714048f5 ramri \$9,\$10 .*: 716c0026 gsle \$11,\$12 .*: 71ae0027 gsgt \$13,\$14 .*: c8622010 gslble \$2,\$3,\$4 diff --git a/gas/testsuite/gas/mips/loongson-3a-2.s b/gas/testsuite/gas/mips/loongson-3a-2.s index 7e35dd3..551ce64 100644 --- a/gas/testsuite/gas/mips/loongson-3a-2.s +++ b/gas/testsuite/gas/mips/loongson-3a-2.s @@ -1,11 +1,6 @@ .text .set noreorder - campi $2,$3 - campv $4,$5 - camwi $6,$7,$8 - ramri $9,$10 - gsle $11,$12 gsgt $13,$14 diff --git a/gas/testsuite/gas/mips/loongson-3a-mmi.d b/gas/testsuite/gas/mips/loongson-3a-mmi.d index de69d3e..81503cb 100644 --- a/gas/testsuite/gas/mips/loongson-3a-mmi.d +++ b/gas/testsuite/gas/mips/loongson-3a-mmi.d @@ -15,6 +15,7 @@ FP ABI: .* ISA Extension: Loongson 3A ASEs: Loongson MMI ASE + Loongson CAM ASE FLAGS 1: .* FLAGS 2: .* diff --git a/gas/testsuite/gas/mips/loongson-cam.d b/gas/testsuite/gas/mips/loongson-cam.d new file mode 100644 index 0000000..ae973ea --- /dev/null +++ b/gas/testsuite/gas/mips/loongson-cam.d @@ -0,0 +1,27 @@ +#as: -mloongson-cam -mabi=64 +#objdump: -M reg-names=numeric -M loongson-cam -dp +#name: Loongson CAM tests + +.*: file format .* + +private flags = .* + +MIPS ABI Flags Version: 0 +ISA: .* +GPR size: .* +CPR1 size: .* +CPR2 size: .* +FP ABI: .* +ISA Extension: None +ASEs: + Loongson CAM ASE +FLAGS 1: .* +FLAGS 2: .* + +Disassembly of section .text: + +[0-9a-f]+ <.text>: +.*: 70601075 campi \$2,\$3 +.*: 70a02035 campv \$4,\$5 +.*: 70e830b5 camwi \$6,\$7,\$8 +.*: 714048f5 ramri \$9,\$10 diff --git a/gas/testsuite/gas/mips/loongson-cam.s b/gas/testsuite/gas/mips/loongson-cam.s new file mode 100644 index 0000000..688e9d4 --- /dev/null +++ b/gas/testsuite/gas/mips/loongson-cam.s @@ -0,0 +1,7 @@ + .text + .set noreorder + + campi $2,$3 + campv $4,$5 + camwi $6,$7,$8 + ramri $9,$10 diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp index ad371e1..2f6ddc9 100644 --- a/gas/testsuite/gas/mips/mips.exp +++ b/gas/testsuite/gas/mips/mips.exp @@ -1394,6 +1394,8 @@ if { [istarget mips*-*-vxworks*] } { run_dump_test "loongson-2f-mmi" run_dump_test "loongson-3a-mmi" + run_dump_test "loongson-cam" + if { $has_newabi } { run_dump_test_arches "octeon" [mips_arch_list_matching octeon] } -- cgit v1.1