From 839189bc932ea02c9647a3ad829dda72f8a9562c Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 30 Sep 2022 10:19:00 +0200 Subject: RISC-V: re-arrange opcode table for consistent alias handling For disassembly to pick up aliases in favor of underlying insns (helping readability in the common case), the aliases need to come ahead of the "base" insns. Slightly more code movement is needed because of insns with the same name needing to stay next to each other. Note that the "rorw" alias entry also has the missing INSN_ALIAS added here. Clone a few testcases to exercise -Mno-aliases some more, better covering the differences between the default and that disassembly mode. --- gas/testsuite/gas/riscv/b-ext-64-na.d | 72 ++++++++++++++++++++++++ gas/testsuite/gas/riscv/b-ext-64.d | 48 ++++++++-------- gas/testsuite/gas/riscv/b-ext-na.d | 51 +++++++++++++++++ gas/testsuite/gas/riscv/b-ext.d | 28 ++++----- gas/testsuite/gas/riscv/c-zero-imm-na.d | 24 ++++++++ gas/testsuite/gas/riscv/c-zero-imm.d | 12 ++-- gas/testsuite/gas/riscv/c-zero-reg.d | 2 +- gas/testsuite/gas/riscv/csr-insns-pseudo-zfinx.d | 6 +- gas/testsuite/gas/riscv/csr-insns-pseudo.d | 6 +- gas/testsuite/gas/riscv/ext-32.d | 48 ++++++++-------- gas/testsuite/gas/riscv/ext-64.d | 64 ++++++++++----------- gas/testsuite/gas/riscv/insn-na.d | 69 +++++++++++++++++++++++ gas/testsuite/gas/riscv/insn.d | 12 ++-- gas/testsuite/gas/riscv/k-ext-64.d | 4 +- gas/testsuite/gas/riscv/k-ext.d | 2 +- gas/testsuite/gas/riscv/li32.d | 8 +-- gas/testsuite/gas/riscv/li64.d | 56 +++++++++--------- gas/testsuite/gas/riscv/lla32.d | 6 +- gas/testsuite/gas/riscv/lla64.d | 10 ++-- gas/testsuite/gas/riscv/zbkb-32.d | 2 +- gas/testsuite/gas/riscv/zbkb-64.d | 4 +- 21 files changed, 375 insertions(+), 159 deletions(-) create mode 100644 gas/testsuite/gas/riscv/b-ext-64-na.d create mode 100644 gas/testsuite/gas/riscv/b-ext-na.d create mode 100644 gas/testsuite/gas/riscv/c-zero-imm-na.d create mode 100644 gas/testsuite/gas/riscv/insn-na.d (limited to 'gas') diff --git a/gas/testsuite/gas/riscv/b-ext-64-na.d b/gas/testsuite/gas/riscv/b-ext-64-na.d new file mode 100644 index 0000000..ec5acd0 --- /dev/null +++ b/gas/testsuite/gas/riscv/b-ext-64-na.d @@ -0,0 +1,72 @@ +#as: -march=rv64i_zba_zbb_zbc_zbs +#source: b-ext-64.s +#objdump: -d -Mno-aliases + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 : +[ ]+[0-9a-f]+:[ ]+60051513[ ]+clz[ ]+a0,a0 +[ ]+[0-9a-f]+:[ ]+60151513[ ]+ctz[ ]+a0,a0 +[ ]+[0-9a-f]+:[ ]+60251513[ ]+cpop[ ]+a0,a0 +[ ]+[0-9a-f]+:[ ]+0ac5c533[ ]+min[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+0ac5d533[ ]+minu[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+0ac5e533[ ]+max[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+0ac5f533[ ]+maxu[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+60451513[ ]+sext\.b[ ]+a0,a0 +[ ]+[0-9a-f]+:[ ]+60551513[ ]+sext\.h[ ]+a0,a0 +[ ]+[0-9a-f]+:[ ]+0805453b[ ]+zext\.h[ ]+a0,a0 +[ ]+[0-9a-f]+:[ ]+40c5f533[ ]+andn[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+40c5e533[ ]+orn[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+40c5c533[ ]+xnor[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+60c59533[ ]+rol[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+60c5d533[ ]+ror[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 +[ ]+[0-9a-f]+:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 +[ ]+[0-9a-f]+:[ ]+6b855513[ ]+rev8[ ]+a0,a0 +[ ]+[0-9a-f]+:[ ]+28755513[ ]+orc\.b[ ]+a0,a0 +[ ]+[0-9a-f]+:[ ]+20c5a533[ ]+sh1add[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+20c5c533[ ]+sh2add[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+20c5e533[ ]+sh3add[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+0ac59533[ ]+clmul[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+0ac5b533[ ]+clmulh[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+0ac5a533[ ]+clmulr[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+6005151b[ ]+clzw[ ]+a0,a0 +[ ]+[0-9a-f]+:[ ]+6015151b[ ]+ctzw[ ]+a0,a0 +[ ]+[0-9a-f]+:[ ]+6025151b[ ]+cpopw[ ]+a0,a0 +[ ]+[0-9a-f]+:[ ]+60c5953b[ ]+rolw[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+60c5d53b[ ]+rorw[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+6025d51b[ ]+roriw[ ]+a0,a1,0x2 +[ ]+[0-9a-f]+:[ ]+6025d51b[ ]+roriw[ ]+a0,a1,0x2 +[ ]+[0-9a-f]+:[ ]+20c5a53b[ ]+sh1add\.uw[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+20c5c53b[ ]+sh2add\.uw[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+20c5e53b[ ]+sh3add\.uw[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+08c5853b[ ]+add\.uw[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+0805853b[ ]+add\.uw[ ]+a0,a1,zero +[ ]+[0-9a-f]+:[ ]+0825951b[ ]+slli\.uw[ ]+a0,a1,0x2 +[ ]+[0-9a-f]+:[ ]+48059513[ ]+bclri[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclri[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+28059513[ ]+bseti[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bseti[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+68059513[ ]+binvi[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binvi[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+4805d513[ ]+bexti[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bexti[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+4bf59513[ ]+bclri[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+2bf59513[ ]+bseti[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+6bf59513[ ]+binvi[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+4bf5d513[ ]+bexti[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+48c59533[ ]+bclr[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+28c59533[ ]+bset[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+68c59533[ ]+binv[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+48c5d533[ ]+bext[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclri[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bseti[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binvi[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bexti[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+4bf59513[ ]+bclri[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+2bf59513[ ]+bseti[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+6bf59513[ ]+binvi[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+4bf5d513[ ]+bexti[ ]+a0,a1,0x3f diff --git a/gas/testsuite/gas/riscv/b-ext-64.d b/gas/testsuite/gas/riscv/b-ext-64.d index 9b6e6b7..f88fef9 100644 --- a/gas/testsuite/gas/riscv/b-ext-64.d +++ b/gas/testsuite/gas/riscv/b-ext-64.d @@ -23,8 +23,8 @@ Disassembly of section .text: [ ]+30:[ ]+40c5c533[ ]+xnor[ ]+a0,a1,a2 [ ]+34:[ ]+60c59533[ ]+rol[ ]+a0,a1,a2 [ ]+38:[ ]+60c5d533[ ]+ror[ ]+a0,a1,a2 -[ ]+3c:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 -[ ]+40:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 +[ ]+3c:[ ]+6025d513[ ]+ror[ ]+a0,a1,0x2 +[ ]+40:[ ]+6025d513[ ]+ror[ ]+a0,a1,0x2 [ ]+44:[ ]+6b855513[ ]+rev8[ ]+a0,a0 [ ]+48:[ ]+28755513[ ]+orc.b[ ]+a0,a0 [ ]+4c:[ ]+20c5a533[ ]+sh1add[ ]+a0,a1,a2 @@ -38,35 +38,35 @@ Disassembly of section .text: [ ]+6c:[ ]+6025151b[ ]+cpopw[ ]+a0,a0 [ ]+70:[ ]+60c5953b[ ]+rolw[ ]+a0,a1,a2 [ ]+74:[ ]+60c5d53b[ ]+rorw[ ]+a0,a1,a2 -[ ]+78:[ ]+6025d51b[ ]+roriw[ ]+a0,a1,0x2 -[ ]+7c:[ ]+6025d51b[ ]+roriw[ ]+a0,a1,0x2 +[ ]+78:[ ]+6025d51b[ ]+rorw[ ]+a0,a1,0x2 +[ ]+7c:[ ]+6025d51b[ ]+rorw[ ]+a0,a1,0x2 [ ]+80:[ ]+20c5a53b[ ]+sh1add.uw[ ]+a0,a1,a2 [ ]+84:[ ]+20c5c53b[ ]+sh2add.uw[ ]+a0,a1,a2 [ ]+88:[ ]+20c5e53b[ ]+sh3add.uw[ ]+a0,a1,a2 [ ]+8c:[ ]+08c5853b[ ]+add.uw[ ]+a0,a1,a2 [ ]+90:[ ]+0805853b[ ]+zext.w[ ]+a0,a1 [ ]+94:[ ]+0825951b[ ]+slli.uw[ ]+a0,a1,0x2 -[ ]+[0-9a-f]+:[ ]+48059513[ ]+bclri[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclri[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+28059513[ ]+bseti[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bseti[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+68059513[ ]+binvi[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binvi[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+4805d513[ ]+bexti[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bexti[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+4bf59513[ ]+bclri[ ]+a0,a1,0x3f -[ ]+[0-9a-f]+:[ ]+2bf59513[ ]+bseti[ ]+a0,a1,0x3f -[ ]+[0-9a-f]+:[ ]+6bf59513[ ]+binvi[ ]+a0,a1,0x3f -[ ]+[0-9a-f]+:[ ]+4bf5d513[ ]+bexti[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+48059513[ ]+bclr[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclr[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+28059513[ ]+bset[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bset[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+68059513[ ]+binv[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binv[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+4805d513[ ]+bext[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bext[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+4bf59513[ ]+bclr[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+2bf59513[ ]+bset[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+6bf59513[ ]+binv[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+4bf5d513[ ]+bext[ ]+a0,a1,0x3f [ ]+[0-9a-f]+:[ ]+48c59533[ ]+bclr[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+28c59533[ ]+bset[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+68c59533[ ]+binv[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+48c5d533[ ]+bext[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclri[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bseti[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binvi[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bexti[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+4bf59513[ ]+bclri[ ]+a0,a1,0x3f -[ ]+[0-9a-f]+:[ ]+2bf59513[ ]+bseti[ ]+a0,a1,0x3f -[ ]+[0-9a-f]+:[ ]+6bf59513[ ]+binvi[ ]+a0,a1,0x3f -[ ]+[0-9a-f]+:[ ]+4bf5d513[ ]+bexti[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclr[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bset[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binv[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bext[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+4bf59513[ ]+bclr[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+2bf59513[ ]+bset[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+6bf59513[ ]+binv[ ]+a0,a1,0x3f +[ ]+[0-9a-f]+:[ ]+4bf5d513[ ]+bext[ ]+a0,a1,0x3f diff --git a/gas/testsuite/gas/riscv/b-ext-na.d b/gas/testsuite/gas/riscv/b-ext-na.d new file mode 100644 index 0000000..0c80a37 --- /dev/null +++ b/gas/testsuite/gas/riscv/b-ext-na.d @@ -0,0 +1,51 @@ +#as: -march=rv32i_zba_zbb_zbc_zbs +#source: b-ext.s +#objdump: -d -Mno-aliases + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 : +[ ]+[0-9a-f]+:[ ]+60051513[ ]+clz[ ]+a0,a0 +[ ]+[0-9a-f]+:[ ]+60151513[ ]+ctz[ ]+a0,a0 +[ ]+[0-9a-f]+:[ ]+60251513[ ]+cpop[ ]+a0,a0 +[ ]+[0-9a-f]+:[ ]+0ac5c533[ ]+min[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+0ac5d533[ ]+minu[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+0ac5e533[ ]+max[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+0ac5f533[ ]+maxu[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+60451513[ ]+sext\.b[ ]+a0,a0 +[ ]+[0-9a-f]+:[ ]+60551513[ ]+sext\.h[ ]+a0,a0 +[ ]+[0-9a-f]+:[ ]+08054533[ ]+zext\.h[ ]+a0,a0 +[ ]+[0-9a-f]+:[ ]+40c5f533[ ]+andn[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+40c5e533[ ]+orn[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+40c5c533[ ]+xnor[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+60c59533[ ]+rol[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+60c5d533[ ]+ror[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 +[ ]+[0-9a-f]+:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 +[ ]+[0-9a-f]+:[ ]+69855513[ ]+rev8[ ]+a0,a0 +[ ]+[0-9a-f]+:[ ]+28755513[ ]+orc\.b[ ]+a0,a0 +[ ]+[0-9a-f]+:[ ]+20c5a533[ ]+sh1add[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+20c5c533[ ]+sh2add[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+20c5e533[ ]+sh3add[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+0ac59533[ ]+clmul[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+0ac5b533[ ]+clmulh[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+0ac5a533[ ]+clmulr[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+48059513[ ]+bclri[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclri[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+28059513[ ]+bseti[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bseti[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+68059513[ ]+binvi[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binvi[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+4805d513[ ]+bexti[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bexti[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+48c59533[ ]+bclr[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+28c59533[ ]+bset[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+68c59533[ ]+binv[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+48c5d533[ ]+bext[ ]+a0,a1,a2 +[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclri[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bseti[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binvi[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bexti[ ]+a0,a1,0x1f diff --git a/gas/testsuite/gas/riscv/b-ext.d b/gas/testsuite/gas/riscv/b-ext.d index c1c5f91..6bbbeb0 100644 --- a/gas/testsuite/gas/riscv/b-ext.d +++ b/gas/testsuite/gas/riscv/b-ext.d @@ -23,8 +23,8 @@ Disassembly of section .text: [ ]+30:[ ]+40c5c533[ ]+xnor[ ]+a0,a1,a2 [ ]+34:[ ]+60c59533[ ]+rol[ ]+a0,a1,a2 [ ]+38:[ ]+60c5d533[ ]+ror[ ]+a0,a1,a2 -[ ]+3c:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 -[ ]+40:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 +[ ]+3c:[ ]+6025d513[ ]+ror[ ]+a0,a1,0x2 +[ ]+40:[ ]+6025d513[ ]+ror[ ]+a0,a1,0x2 [ ]+44:[ ]+69855513[ ]+rev8[ ]+a0,a0 [ ]+48:[ ]+28755513[ ]+orc.b[ ]+a0,a0 [ ]+4c:[ ]+20c5a533[ ]+sh1add[ ]+a0,a1,a2 @@ -33,19 +33,19 @@ Disassembly of section .text: [ ]+58:[ ]+0ac59533[ ]+clmul[ ]+a0,a1,a2 [ ]+5c:[ ]+0ac5b533[ ]+clmulh[ ]+a0,a1,a2 [ ]+60:[ ]+0ac5a533[ ]+clmulr[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+48059513[ ]+bclri[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclri[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+28059513[ ]+bseti[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bseti[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+68059513[ ]+binvi[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binvi[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+4805d513[ ]+bexti[ ]+a0,a1,0x0 -[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bexti[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+48059513[ ]+bclr[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclr[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+28059513[ ]+bset[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bset[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+68059513[ ]+binv[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binv[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+4805d513[ ]+bext[ ]+a0,a1,0x0 +[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bext[ ]+a0,a1,0x1f [ ]+[0-9a-f]+:[ ]+48c59533[ ]+bclr[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+28c59533[ ]+bset[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+68c59533[ ]+binv[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+48c5d533[ ]+bext[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclri[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bseti[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binvi[ ]+a0,a1,0x1f -[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bexti[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+49f59513[ ]+bclr[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+29f59513[ ]+bset[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+69f59513[ ]+binv[ ]+a0,a1,0x1f +[ ]+[0-9a-f]+:[ ]+49f5d513[ ]+bext[ ]+a0,a1,0x1f diff --git a/gas/testsuite/gas/riscv/c-zero-imm-na.d b/gas/testsuite/gas/riscv/c-zero-imm-na.d new file mode 100644 index 0000000..d33e0d7 --- /dev/null +++ b/gas/testsuite/gas/riscv/c-zero-imm-na.d @@ -0,0 +1,24 @@ +#as: +#source: c-zero-imm.s +#objdump: -dr -Mno-aliases + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <.text>: +[ ]+[0-9a-f]+:[ ]+4501[ ]+c\.li[ ]+a0,0 +[ ]+[0-9a-f]+:[ ]+4581[ ]+c\.li[ ]+a1,0 +[ ]+[0-9a-f]+:[ ]+8a01[ ]+c\.andi[ ]+a2,0 +[ ]+[0-9a-f]+:[ ]+8a81[ ]+c\.andi[ ]+a3,0 +[ ]+[0-9a-f]+:[ ]+0001[ ]+c\.addi[ ]+zero,0 +[ ]+[0-9a-f]+:[ ]+873a[ ]+c\.mv[ ]+a4,a4 +[ ]+[0-9a-f]+:[ ]+0781[ ]+c\.addi[ ]+a5,0 +[ ]+[0-9a-f]+:[ ]+00051513[ ]+slli[ ]+a0,a0,0x0 +[ ]+[0-9a-f]+:[ ]+0005d593[ ]+srli[ ]+a1,a1,0x0 +[ ]+[0-9a-f]+:[ ]+40065613[ ]+srai[ ]+a2,a2,0x0 +[ ]+[0-9a-f]+:[ ]+0682[ ]+c\.slli64[ ]+a3 +[ ]+[0-9a-f]+:[ ]+8301[ ]+c\.srli64[ ]+a4 +[ ]+[0-9a-f]+:[ ]+8781[ ]+c\.srai64[ ]+a5 +#... diff --git a/gas/testsuite/gas/riscv/c-zero-imm.d b/gas/testsuite/gas/riscv/c-zero-imm.d index 1f3e485..d4eebbd 100644 --- a/gas/testsuite/gas/riscv/c-zero-imm.d +++ b/gas/testsuite/gas/riscv/c-zero-imm.d @@ -9,14 +9,14 @@ Disassembly of section .text: 0+000 <.text>: [ ]+0:[ ]+4501[ ]+li[ ]+a0,0 [ ]+2:[ ]+4581[ ]+li[ ]+a1,0 -[ ]+4:[ ]+8a01[ ]+andi[ ]+a2,a2,0 -[ ]+6:[ ]+8a81[ ]+andi[ ]+a3,a3,0 +[ ]+4:[ ]+8a01[ ]+and[ ]+a2,a2,0 +[ ]+6:[ ]+8a81[ ]+and[ ]+a3,a3,0 [ ]+8:[ ]+0001[ ]+nop [ ]+a:[ ]+873a[ ]+mv[ ]+a4,a4 -[ ]+c:[ ]+0781[ ]+addi[ ]+a5,a5,0 -[ ]+e:[ ]+00051513[ ]+slli[ ]+a0,a0,0x0 -[ ]+12:[ ]+0005d593[ ]+srli[ ]+a1,a1,0x0 -[ ]+16:[ ]+40065613[ ]+srai[ ]+a2,a2,0x0 +[ ]+c:[ ]+0781[ ]+add[ ]+a5,a5,0 +[ ]+e:[ ]+00051513[ ]+sll[ ]+a0,a0,0x0 +[ ]+12:[ ]+0005d593[ ]+srl[ ]+a1,a1,0x0 +[ ]+16:[ ]+40065613[ ]+sra[ ]+a2,a2,0x0 [ ]+1a:[ ]+0682[ ]+c.slli64[ ]+a3 [ ]+1c:[ ]+8301[ ]+c.srli64[ ]+a4 [ ]+1e:[ ]+8781[ ]+c.srai64[ ]+a5 diff --git a/gas/testsuite/gas/riscv/c-zero-reg.d b/gas/testsuite/gas/riscv/c-zero-reg.d index 02d5978..1982980 100644 --- a/gas/testsuite/gas/riscv/c-zero-reg.d +++ b/gas/testsuite/gas/riscv/c-zero-reg.d @@ -14,7 +14,7 @@ Disassembly of section .text: [ ]+8:[ ]+9006[ ]+c.add[ ]+zero,ra [ ]+a:[ ]+00500013[ ]+li[ ]+zero,5 [ ]+e:[ ]+00006037[ ]+lui[ ]+zero,0x6 -[ ]+12:[ ]+00701013[ ]+slli[ ]+zero,zero,0x7 +[ ]+12:[ ]+00701013[ ]+sll[ ]+zero,zero,0x7 [ ]+16:[ ]+00008013[ ]+mv[ ]+zero,ra [ ]+1a:[ ]+00100033[ ]+add[ ]+zero,zero,ra #... diff --git a/gas/testsuite/gas/riscv/csr-insns-pseudo-zfinx.d b/gas/testsuite/gas/riscv/csr-insns-pseudo-zfinx.d index 6e86398..9cdf410 100644 --- a/gas/testsuite/gas/riscv/csr-insns-pseudo-zfinx.d +++ b/gas/testsuite/gas/riscv/csr-insns-pseudo-zfinx.d @@ -12,9 +12,9 @@ Disassembly of section .text: [ ]+[0-9a-f]+:[ ]+00029073[ ]+csrw[ ]+ustatus,t0 [ ]+[0-9a-f]+:[ ]+0002a073[ ]+csrs[ ]+ustatus,t0 [ ]+[0-9a-f]+:[ ]+0002b073[ ]+csrc[ ]+ustatus,t0 -[ ]+[0-9a-f]+:[ ]+000fd073[ ]+csrwi[ ]+ustatus,31 -[ ]+[0-9a-f]+:[ ]+000fe073[ ]+csrsi[ ]+ustatus,31 -[ ]+[0-9a-f]+:[ ]+000ff073[ ]+csrci[ ]+ustatus,31 +[ ]+[0-9a-f]+:[ ]+000fd073[ ]+csrw[ ]+ustatus,31 +[ ]+[0-9a-f]+:[ ]+000fe073[ ]+csrs[ ]+ustatus,31 +[ ]+[0-9a-f]+:[ ]+000ff073[ ]+csrc[ ]+ustatus,31 [ ]+[0-9a-f]+:[ ]+c00022f3[ ]+rdcycle[ ]+t0 [ ]+[0-9a-f]+:[ ]+c01022f3[ ]+rdtime[ ]+t0 [ ]+[0-9a-f]+:[ ]+c02022f3[ ]+rdinstret[ ]+t0 diff --git a/gas/testsuite/gas/riscv/csr-insns-pseudo.d b/gas/testsuite/gas/riscv/csr-insns-pseudo.d index 3df7b4b..f44f0cb 100644 --- a/gas/testsuite/gas/riscv/csr-insns-pseudo.d +++ b/gas/testsuite/gas/riscv/csr-insns-pseudo.d @@ -12,9 +12,9 @@ Disassembly of section .text: [ ]+[0-9a-f]+:[ ]+00029073[ ]+csrw[ ]+ustatus,t0 [ ]+[0-9a-f]+:[ ]+0002a073[ ]+csrs[ ]+ustatus,t0 [ ]+[0-9a-f]+:[ ]+0002b073[ ]+csrc[ ]+ustatus,t0 -[ ]+[0-9a-f]+:[ ]+000fd073[ ]+csrwi[ ]+ustatus,31 -[ ]+[0-9a-f]+:[ ]+000fe073[ ]+csrsi[ ]+ustatus,31 -[ ]+[0-9a-f]+:[ ]+000ff073[ ]+csrci[ ]+ustatus,31 +[ ]+[0-9a-f]+:[ ]+000fd073[ ]+csrw[ ]+ustatus,31 +[ ]+[0-9a-f]+:[ ]+000fe073[ ]+csrs[ ]+ustatus,31 +[ ]+[0-9a-f]+:[ ]+000ff073[ ]+csrc[ ]+ustatus,31 [ ]+[0-9a-f]+:[ ]+c00022f3[ ]+rdcycle[ ]+t0 [ ]+[0-9a-f]+:[ ]+c01022f3[ ]+rdtime[ ]+t0 [ ]+[0-9a-f]+:[ ]+c02022f3[ ]+rdinstret[ ]+t0 diff --git a/gas/testsuite/gas/riscv/ext-32.d b/gas/testsuite/gas/riscv/ext-32.d index 918c9c8..97daa31 100644 --- a/gas/testsuite/gas/riscv/ext-32.d +++ b/gas/testsuite/gas/riscv/ext-32.d @@ -9,31 +9,31 @@ Disassembly of section .text: 0+000 : [ ]+0:[ ]+0ff57513[ ]+zext.b[ ]+a0,a0 -[ ]+4:[ ]+01051513[ ]+slli[ ]+a0,a0,0x10 -[ ]+8:[ ]+01055513[ ]+srli[ ]+a0,a0,0x10 -[ ]+c:[ ]+01851513[ ]+slli[ ]+a0,a0,0x18 -[ ]+10:[ ]+41855513[ ]+srai[ ]+a0,a0,0x18 -[ ]+14:[ ]+01051513[ ]+slli[ ]+a0,a0,0x10 -[ ]+18:[ ]+41055513[ ]+srai[ ]+a0,a0,0x10 +[ ]+4:[ ]+01051513[ ]+sll[ ]+a0,a0,0x10 +[ ]+8:[ ]+01055513[ ]+srl[ ]+a0,a0,0x10 +[ ]+c:[ ]+01851513[ ]+sll[ ]+a0,a0,0x18 +[ ]+10:[ ]+41855513[ ]+sra[ ]+a0,a0,0x18 +[ ]+14:[ ]+01051513[ ]+sll[ ]+a0,a0,0x10 +[ ]+18:[ ]+41055513[ ]+sra[ ]+a0,a0,0x10 [ ]+1c:[ ]+0ff67593[ ]+zext.b[ ]+a1,a2 -[ ]+20:[ ]+01061593[ ]+slli[ ]+a1,a2,0x10 -[ ]+24:[ ]+0105d593[ ]+srli[ ]+a1,a1,0x10 -[ ]+28:[ ]+01861593[ ]+slli[ ]+a1,a2,0x18 -[ ]+2c:[ ]+4185d593[ ]+srai[ ]+a1,a1,0x18 -[ ]+30:[ ]+01061593[ ]+slli[ ]+a1,a2,0x10 -[ ]+34:[ ]+4105d593[ ]+srai[ ]+a1,a1,0x10 +[ ]+20:[ ]+01061593[ ]+sll[ ]+a1,a2,0x10 +[ ]+24:[ ]+0105d593[ ]+srl[ ]+a1,a1,0x10 +[ ]+28:[ ]+01861593[ ]+sll[ ]+a1,a2,0x18 +[ ]+2c:[ ]+4185d593[ ]+sra[ ]+a1,a1,0x18 +[ ]+30:[ ]+01061593[ ]+sll[ ]+a1,a2,0x10 +[ ]+34:[ ]+4105d593[ ]+sra[ ]+a1,a1,0x10 [ ]+38:[ ]+0ff57513[ ]+zext.b[ ]+a0,a0 -[ ]+3c:[ ]+0542[ ]+slli[ ]+a0,a0,0x10 -[ ]+3e:[ ]+8141[ ]+srli[ ]+a0,a0,0x10 -[ ]+40:[ ]+0562[ ]+slli[ ]+a0,a0,0x18 -[ ]+42:[ ]+8561[ ]+srai[ ]+a0,a0,0x18 -[ ]+44:[ ]+0542[ ]+slli[ ]+a0,a0,0x10 -[ ]+46:[ ]+8541[ ]+srai[ ]+a0,a0,0x10 +[ ]+3c:[ ]+0542[ ]+sll[ ]+a0,a0,0x10 +[ ]+3e:[ ]+8141[ ]+srl[ ]+a0,a0,0x10 +[ ]+40:[ ]+0562[ ]+sll[ ]+a0,a0,0x18 +[ ]+42:[ ]+8561[ ]+sra[ ]+a0,a0,0x18 +[ ]+44:[ ]+0542[ ]+sll[ ]+a0,a0,0x10 +[ ]+46:[ ]+8541[ ]+sra[ ]+a0,a0,0x10 [ ]+48:[ ]+0ff67593[ ]+zext.b[ ]+a1,a2 -[ ]+4c:[ ]+01061593[ ]+slli[ ]+a1,a2,0x10 -[ ]+50:[ ]+81c1[ ]+srli[ ]+a1,a1,0x10 -[ ]+52:[ ]+01861593[ ]+slli[ ]+a1,a2,0x18 -[ ]+56:[ ]+85e1[ ]+srai[ ]+a1,a1,0x18 -[ ]+58:[ ]+01061593[ ]+slli[ ]+a1,a2,0x10 -[ ]+5c:[ ]+85c1[ ]+srai[ ]+a1,a1,0x10 +[ ]+4c:[ ]+01061593[ ]+sll[ ]+a1,a2,0x10 +[ ]+50:[ ]+81c1[ ]+srl[ ]+a1,a1,0x10 +[ ]+52:[ ]+01861593[ ]+sll[ ]+a1,a2,0x18 +[ ]+56:[ ]+85e1[ ]+sra[ ]+a1,a1,0x18 +[ ]+58:[ ]+01061593[ ]+sll[ ]+a1,a2,0x10 +[ ]+5c:[ ]+85c1[ ]+sra[ ]+a1,a1,0x10 #... diff --git a/gas/testsuite/gas/riscv/ext-64.d b/gas/testsuite/gas/riscv/ext-64.d index 49d109b..1fe339c 100644 --- a/gas/testsuite/gas/riscv/ext-64.d +++ b/gas/testsuite/gas/riscv/ext-64.d @@ -9,43 +9,43 @@ Disassembly of section .text: 0+000 : [ ]+0:[ ]+0ff57513[ ]+zext.b[ ]+a0,a0 -[ ]+4:[ ]+03051513[ ]+slli[ ]+a0,a0,0x30 -[ ]+8:[ ]+03055513[ ]+srli[ ]+a0,a0,0x30 -[ ]+c:[ ]+03851513[ ]+slli[ ]+a0,a0,0x38 -[ ]+10:[ ]+43855513[ ]+srai[ ]+a0,a0,0x38 -[ ]+14:[ ]+03051513[ ]+slli[ ]+a0,a0,0x30 -[ ]+18:[ ]+43055513[ ]+srai[ ]+a0,a0,0x30 +[ ]+4:[ ]+03051513[ ]+sll[ ]+a0,a0,0x30 +[ ]+8:[ ]+03055513[ ]+srl[ ]+a0,a0,0x30 +[ ]+c:[ ]+03851513[ ]+sll[ ]+a0,a0,0x38 +[ ]+10:[ ]+43855513[ ]+sra[ ]+a0,a0,0x38 +[ ]+14:[ ]+03051513[ ]+sll[ ]+a0,a0,0x30 +[ ]+18:[ ]+43055513[ ]+sra[ ]+a0,a0,0x30 [ ]+1c:[ ]+0ff67593[ ]+zext.b[ ]+a1,a2 -[ ]+20:[ ]+03061593[ ]+slli[ ]+a1,a2,0x30 -[ ]+24:[ ]+0305d593[ ]+srli[ ]+a1,a1,0x30 -[ ]+28:[ ]+03861593[ ]+slli[ ]+a1,a2,0x38 -[ ]+2c:[ ]+4385d593[ ]+srai[ ]+a1,a1,0x38 -[ ]+30:[ ]+03061593[ ]+slli[ ]+a1,a2,0x30 -[ ]+34:[ ]+4305d593[ ]+srai[ ]+a1,a1,0x30 -[ ]+38:[ ]+02051513[ ]+slli[ ]+a0,a0,0x20 -[ ]+3c:[ ]+02055513[ ]+srli[ ]+a0,a0,0x20 +[ ]+20:[ ]+03061593[ ]+sll[ ]+a1,a2,0x30 +[ ]+24:[ ]+0305d593[ ]+srl[ ]+a1,a1,0x30 +[ ]+28:[ ]+03861593[ ]+sll[ ]+a1,a2,0x38 +[ ]+2c:[ ]+4385d593[ ]+sra[ ]+a1,a1,0x38 +[ ]+30:[ ]+03061593[ ]+sll[ ]+a1,a2,0x30 +[ ]+34:[ ]+4305d593[ ]+sra[ ]+a1,a1,0x30 +[ ]+38:[ ]+02051513[ ]+sll[ ]+a0,a0,0x20 +[ ]+3c:[ ]+02055513[ ]+srl[ ]+a0,a0,0x20 [ ]+40:[ ]+0005051b[ ]+sext.w[ ]+a0,a0 -[ ]+44:[ ]+02061593[ ]+slli[ ]+a1,a2,0x20 -[ ]+48:[ ]+0205d593[ ]+srli[ ]+a1,a1,0x20 +[ ]+44:[ ]+02061593[ ]+sll[ ]+a1,a2,0x20 +[ ]+48:[ ]+0205d593[ ]+srl[ ]+a1,a1,0x20 [ ]+4c:[ ]+0006059b[ ]+sext.w[ ]+a1,a2 [ ]+50:[ ]+0ff57513[ ]+zext.b[ ]+a0,a0 -[ ]+54:[ ]+1542[ ]+slli[ ]+a0,a0,0x30 -[ ]+56:[ ]+9141[ ]+srli[ ]+a0,a0,0x30 -[ ]+58:[ ]+1562[ ]+slli[ ]+a0,a0,0x38 -[ ]+5a:[ ]+9561[ ]+srai[ ]+a0,a0,0x38 -[ ]+5c:[ ]+1542[ ]+slli[ ]+a0,a0,0x30 -[ ]+5e:[ ]+9541[ ]+srai[ ]+a0,a0,0x30 +[ ]+54:[ ]+1542[ ]+sll[ ]+a0,a0,0x30 +[ ]+56:[ ]+9141[ ]+srl[ ]+a0,a0,0x30 +[ ]+58:[ ]+1562[ ]+sll[ ]+a0,a0,0x38 +[ ]+5a:[ ]+9561[ ]+sra[ ]+a0,a0,0x38 +[ ]+5c:[ ]+1542[ ]+sll[ ]+a0,a0,0x30 +[ ]+5e:[ ]+9541[ ]+sra[ ]+a0,a0,0x30 [ ]+60:[ ]+0ff67593[ ]+zext.b[ ]+a1,a2 -[ ]+64:[ ]+03061593[ ]+slli[ ]+a1,a2,0x30 -[ ]+68:[ ]+91c1[ ]+srli[ ]+a1,a1,0x30 -[ ]+6a:[ ]+03861593[ ]+slli[ ]+a1,a2,0x38 -[ ]+6e:[ ]+95e1[ ]+srai[ ]+a1,a1,0x38 -[ ]+70:[ ]+03061593[ ]+slli[ ]+a1,a2,0x30 -[ ]+74:[ ]+95c1[ ]+srai[ ]+a1,a1,0x30 -[ ]+76:[ ]+1502[ ]+slli[ ]+a0,a0,0x20 -[ ]+78:[ ]+9101[ ]+srli[ ]+a0,a0,0x20 +[ ]+64:[ ]+03061593[ ]+sll[ ]+a1,a2,0x30 +[ ]+68:[ ]+91c1[ ]+srl[ ]+a1,a1,0x30 +[ ]+6a:[ ]+03861593[ ]+sll[ ]+a1,a2,0x38 +[ ]+6e:[ ]+95e1[ ]+sra[ ]+a1,a1,0x38 +[ ]+70:[ ]+03061593[ ]+sll[ ]+a1,a2,0x30 +[ ]+74:[ ]+95c1[ ]+sra[ ]+a1,a1,0x30 +[ ]+76:[ ]+1502[ ]+sll[ ]+a0,a0,0x20 +[ ]+78:[ ]+9101[ ]+srl[ ]+a0,a0,0x20 [ ]+7a:[ ]+2501[ ]+sext.w[ ]+a0,a0 -[ ]+7c:[ ]+02061593[ ]+slli[ ]+a1,a2,0x20 -[ ]+80:[ ]+9181[ ]+srli[ ]+a1,a1,0x20 +[ ]+7c:[ ]+02061593[ ]+sll[ ]+a1,a2,0x20 +[ ]+80:[ ]+9181[ ]+srl[ ]+a1,a1,0x20 [ ]+82:[ ]+0006059b[ ]+sext.w[ ]+a1,a2 #... diff --git a/gas/testsuite/gas/riscv/insn-na.d b/gas/testsuite/gas/riscv/insn-na.d new file mode 100644 index 0000000..b4a664b --- /dev/null +++ b/gas/testsuite/gas/riscv/insn-na.d @@ -0,0 +1,69 @@ +#as: -march=rv32ifcv +#source: insn.s +#objdump: -dw -Mno-aliases + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 : +[^:]+:[ ]+00c58533[ ]+add[ ]+a0,a1,a2 +[^:]+:[ ]+00d58513[ ]+addi[ ]+a0,a1,13 +[^:]+:[ ]+00a58567[ ]+jalr[ ]+a0,10\(a1\) +[^:]+:[ ]+00458503[ ]+lb[ ]+a0,4\(a1\) +[^:]+:[ ]+feb508e3[ ]+beq[ ]+a0,a1,0 \ +[^:]+:[ ]+feb506e3[ ]+beq[ ]+a0,a1,0 \ +[^:]+:[ ]+00a58223[ ]+sb[ ]+a0,4\(a1\) +[^:]+:[ ]+00fff537[ ]+lui[ ]+a0,0xfff +[^:]+:[ ]+fe1ff56f[ ]+jal[ ]+a0,0 \ +[^:]+:[ ]+fddff56f[ ]+jal[ ]+a0,0 \ +[^:]+:[ ]+852e[ ]+c\.mv[ ]+a0,a1 +[^:]+:[ ]+0511[ ]+c\.addi[ ]+a0,4 # .* +[^:]+:[ ]+002c[ ]+c\.addi4spn[ ]+a1,sp,8 +[^:]+:[ ]+c0aa[ ]+c\.swsp[ ]+a0,64\(sp\) +[^:]+:[ ]+41a8[ ]+c\.lw[ ]+a0,64\(a1\) +[^:]+:[ ]+c1a8[ ]+c\.sw[ ]+a0,64\(a1\) +[^:]+:[ ]+d5f1[ ]+c\.beqz[ ]+a1,0 \ +[^:]+:[ ]+b7e9[ ]+c\.j[ ]+0 \ +[^:]+:[ ]+00c58533[ ]+add[ ]+a0,a1,a2 +[^:]+:[ ]+00d58513[ ]+addi[ ]+a0,a1,13 +[^:]+:[ ]+00a58567[ ]+jalr[ ]+a0,10\(a1\) +[^:]+:[ ]+00458503[ ]+lb[ ]+a0,4\(a1\) +[^:]+:[ ]+fab50ce3[ ]+beq[ ]+a0,a1,0 \ +[^:]+:[ ]+fab50ae3[ ]+beq[ ]+a0,a1,0 \ +[^:]+:[ ]+00a58223[ ]+sb[ ]+a0,4\(a1\) +[^:]+:[ ]+00fff537[ ]+lui[ ]+a0,0xfff +[^:]+:[ ]+fa9ff56f[ ]+jal[ ]+a0,0 \ +[^:]+:[ ]+fa5ff56f[ ]+jal[ ]+a0,0 \ +[^:]+:[ ]+852e[ ]+c\.mv[ ]+a0,a1 +[^:]+:[ ]+0511[ ]+c\.addi[ ]+a0,4 # .* +[^:]+:[ ]+002c[ ]+c\.addi4spn[ ]+a1,sp,8 +[^:]+:[ ]+c0aa[ ]+c\.swsp[ ]+a0,64\(sp\) +[^:]+:[ ]+41a8[ ]+c\.lw[ ]+a0,64\(a1\) +[^:]+:[ ]+c1a8[ ]+c\.sw[ ]+a0,64\(a1\) +[^:]+:[ ]+8d6d[ ]+c\.and[ ]+a0,a1 +[^:]+:[ ]+d9c9[ ]+c\.beqz[ ]+a1,0 \ +[^:]+:[ ]+bf41[ ]+c\.j[ ]+0 \ +[^:]+:[ ]+68c58543[ ]+fmadd\.s[ ]+fa0,fa1,fa2,fa3,rne +[^:]+:[ ]+68c58543[ ]+fmadd\.s[ ]+fa0,fa1,fa2,fa3,rne +[^:]+:[ ]+68c58543[ ]+fmadd\.s[ ]+fa0,fa1,fa2,fa3,rne +[^:]+:[ ]+68c58543[ ]+fmadd\.s[ ]+fa0,fa1,fa2,fa3,rne +[^:]+:[ ]+68c58543[ ]+fmadd\.s[ ]+fa0,fa1,fa2,fa3,rne +[^:]+:[ ]+68c58543[ ]+fmadd\.s[ ]+fa0,fa1,fa2,fa3,rne +[^:]+:[ ]+00c58533[ ]+add[ ]+a0,a1,a2 +[^:]+:[ ]+00c58533[ ]+add[ ]+a0,a1,a2 +[^:]+:[ ]+00c58533[ ]+add[ ]+a0,a1,a2 +[^:]+:[ ]+00c58533[ ]+add[ ]+a0,a1,a2 +[^:]+:[ ]+00c58533[ ]+add[ ]+a0,a1,a2 +[^:]+:[ ]+00c58533[ ]+add[ ]+a0,a1,a2 +[^:]+:[ ]+00c58533[ ]+add[ ]+a0,a1,a2 +[^:]+:[ ]+022180d7[ ]+vadd\.vv[ ]+v1,v2,v3 +[^:]+:[ ]+0001[ ]+c\.addi[ ]+zero,0 +[^:]+:[ ]+00000013[ ]+addi[ ]+zero,zero,0 +[^:]+:[ ]+001f 0000 0000[ ].* +[^:]+:[ ]+0000003f 00000000[ ].* +[^:]+:[ ]+0001[ ]+c\.addi[ ]+zero,0 +[^:]+:[ ]+00000013[ ]+addi[ ]+zero,zero,0 +[^:]+:[ ]+001f 0000 0000[ ].* +[^:]+:[ ]+0000003f 00000000[ ].* diff --git a/gas/testsuite/gas/riscv/insn.d b/gas/testsuite/gas/riscv/insn.d index 9a946dd..14b15d8 100644 --- a/gas/testsuite/gas/riscv/insn.d +++ b/gas/testsuite/gas/riscv/insn.d @@ -8,7 +8,7 @@ Disassembly of section .text: 0+000 : [^:]+:[ ]+00c58533[ ]+add[ ]+a0,a1,a2 -[^:]+:[ ]+00d58513[ ]+addi[ ]+a0,a1,13 +[^:]+:[ ]+00d58513[ ]+add[ ]+a0,a1,13 [^:]+:[ ]+00a58567[ ]+jalr[ ]+a0,10\(a1\) [^:]+:[ ]+00458503[ ]+lb[ ]+a0,4\(a1\) [^:]+:[ ]+feb508e3[ ]+beq[ ]+a0,a1,0 \ @@ -22,8 +22,8 @@ Disassembly of section .text: [^:]+:[ ]+fddff56f[ ]+jal[ ]+a0,0 \ [^:]+: R_RISCV_JAL[ ]+target [^:]+:[ ]+852e[ ]+mv[ ]+a0,a1 -[^:]+:[ ]+0511[ ]+addi[ ]+a0,a0,4 # .* -[^:]+:[ ]+002c[ ]+addi[ ]+a1,sp,8 +[^:]+:[ ]+0511[ ]+add[ ]+a0,a0,4 # .* +[^:]+:[ ]+002c[ ]+add[ ]+a1,sp,8 [^:]+:[ ]+c0aa[ ]+sw[ ]+a0,64\(sp\) [^:]+:[ ]+41a8[ ]+lw[ ]+a0,64\(a1\) [^:]+:[ ]+c1a8[ ]+sw[ ]+a0,64\(a1\) @@ -32,7 +32,7 @@ Disassembly of section .text: [^:]+:[ ]+b7e9[ ]+j[ ]+0 \ [^:]+: R_RISCV_RVC_JUMP[ ]+target [^:]+:[ ]+00c58533[ ]+add[ ]+a0,a1,a2 -[^:]+:[ ]+00d58513[ ]+addi[ ]+a0,a1,13 +[^:]+:[ ]+00d58513[ ]+add[ ]+a0,a1,13 [^:]+:[ ]+00a58567[ ]+jalr[ ]+a0,10\(a1\) [^:]+:[ ]+00458503[ ]+lb[ ]+a0,4\(a1\) [^:]+:[ ]+fab50ce3[ ]+beq[ ]+a0,a1,0 \ @@ -46,8 +46,8 @@ Disassembly of section .text: [^:]+:[ ]+fa5ff56f[ ]+jal[ ]+a0,0 \ [^:]+: R_RISCV_JAL[ ]+target [^:]+:[ ]+852e[ ]+mv[ ]+a0,a1 -[^:]+:[ ]+0511[ ]+addi[ ]+a0,a0,4 # .* -[^:]+:[ ]+002c[ ]+addi[ ]+a1,sp,8 +[^:]+:[ ]+0511[ ]+add[ ]+a0,a0,4 # .* +[^:]+:[ ]+002c[ ]+add[ ]+a1,sp,8 [^:]+:[ ]+c0aa[ ]+sw[ ]+a0,64\(sp\) [^:]+:[ ]+41a8[ ]+lw[ ]+a0,64\(a1\) [^:]+:[ ]+c1a8[ ]+sw[ ]+a0,64\(a1\) diff --git a/gas/testsuite/gas/riscv/k-ext-64.d b/gas/testsuite/gas/riscv/k-ext-64.d index 3237c95..d56e035 100644 --- a/gas/testsuite/gas/riscv/k-ext-64.d +++ b/gas/testsuite/gas/riscv/k-ext-64.d @@ -10,10 +10,10 @@ Disassembly of section .text: 0+000 : [ ]+[0-9a-f]+:[ ]+60c5d533[ ]+ror[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+60c59533[ ]+rol[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 +[ ]+[0-9a-f]+:[ ]+6025d513[ ]+ror[ ]+a0,a1,0x2 [ ]+[0-9a-f]+:[ ]+60c5d53b[ ]+rorw[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+60c5953b[ ]+rolw[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+6025d51b[ ]+roriw[ ]+a0,a1,0x2 +[ ]+[0-9a-f]+:[ ]+6025d51b[ ]+rorw[ ]+a0,a1,0x2 [ ]+[0-9a-f]+:[ ]+40c5f533[ ]+andn[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+40c5e533[ ]+orn[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+40c5c533[ ]+xnor[ ]+a0,a1,a2 diff --git a/gas/testsuite/gas/riscv/k-ext.d b/gas/testsuite/gas/riscv/k-ext.d index 57a720b..b00a1c9 100644 --- a/gas/testsuite/gas/riscv/k-ext.d +++ b/gas/testsuite/gas/riscv/k-ext.d @@ -10,7 +10,7 @@ Disassembly of section .text: 0+000 : [ ]+[0-9a-f]+:[ ]+60c5d533[ ]+ror[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+60c59533[ ]+rol[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 +[ ]+[0-9a-f]+:[ ]+6025d513[ ]+ror[ ]+a0,a1,0x2 [ ]+[0-9a-f]+:[ ]+40c5f533[ ]+andn[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+40c5e533[ ]+orn[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+40c5c533[ ]+xnor[ ]+a0,a1,a2 diff --git a/gas/testsuite/gas/riscv/li32.d b/gas/testsuite/gas/riscv/li32.d index 3496384..ec33bf5 100644 --- a/gas/testsuite/gas/riscv/li32.d +++ b/gas/testsuite/gas/riscv/li32.d @@ -8,10 +8,10 @@ Disassembly of section .text: 0+000 : [^:]+:[ ]+6521[ ]+lui[ ]+a0,0x8 -[^:]+:[ ]+0505[ ]+addi[ ]+a0,a0,1 # .* +[^:]+:[ ]+0505[ ]+add[ ]+a0,a0,1 # .* [^:]+:[ ]+6509[ ]+lui[ ]+a0,0x2 -[^:]+:[ ]+f0150513[ ]+addi[ ]+a0,a0,-255 # .* +[^:]+:[ ]+f0150513[ ]+add[ ]+a0,a0,-255 # .* [^:]+:[ ]+12345537[ ]+lui[ ]+a0,0x12345 -[^:]+:[ ]+0505[ ]+addi[ ]+a0,a0,1 # .* +[^:]+:[ ]+0505[ ]+add[ ]+a0,a0,1 # .* [^:]+:[ ]+f2345537[ ]+lui[ ]+a0,0xf2345 -[^:]+:[ ]+0505[ ]+addi[ ]+a0,a0,1 # .* +[^:]+:[ ]+0505[ ]+add[ ]+a0,a0,1 # .* diff --git a/gas/testsuite/gas/riscv/li64.d b/gas/testsuite/gas/riscv/li64.d index 0479857..28fa914 100644 --- a/gas/testsuite/gas/riscv/li64.d +++ b/gas/testsuite/gas/riscv/li64.d @@ -8,37 +8,37 @@ Disassembly of section .text: 0000000000000000 : [^:]+:[ ]+6521[ ]+lui[ ]+a0,0x8 -[^:]+:[ ]+2505[ ]+addiw[ ]+a0,a0,1 # .* +[^:]+:[ ]+2505[ ]+addw[ ]+a0,a0,1 # .* [^:]+:[ ]+6509[ ]+lui[ ]+a0,0x2 -[^:]+:[ ]+f015051b[ ]+addiw[ ]+a0,a0,-255 # .* +[^:]+:[ ]+f015051b[ ]+addw[ ]+a0,a0,-255 # .* [^:]+:[ ]+12345537[ ]+lui[ ]+a0,0x12345 -[^:]+:[ ]+2505[ ]+addiw[ ]+a0,a0,1 # .* +[^:]+:[ ]+2505[ ]+addw[ ]+a0,a0,1 # .* [^:]+:[ ]+000f2537[ ]+lui[ ]+a0,0xf2 -[^:]+:[ ]+3455051b[ ]+addiw[ ]+a0,a0,837 # .* -[^:]+:[ ]+0532[ ]+slli[ ]+a0,a0,0xc -[^:]+:[ ]+0505[ ]+addi[ ]+a0,a0,1 +[^:]+:[ ]+3455051b[ ]+addw[ ]+a0,a0,837 # .* +[^:]+:[ ]+0532[ ]+sll[ ]+a0,a0,0xc +[^:]+:[ ]+0505[ ]+add[ ]+a0,a0,1 [^:]+:[ ]+00f12537[ ]+lui[ ]+a0,0xf12 -[^:]+:[ ]+3455051b[ ]+addiw[ ]+a0,a0,837 # .* -[^:]+:[ ]+0532[ ]+slli[ ]+a0,a0,0xc -[^:]+:[ ]+0505[ ]+addi[ ]+a0,a0,1 +[^:]+:[ ]+3455051b[ ]+addw[ ]+a0,a0,837 # .* +[^:]+:[ ]+0532[ ]+sll[ ]+a0,a0,0xc +[^:]+:[ ]+0505[ ]+add[ ]+a0,a0,1 [^:]+:[ ]+ff010537[ ]+lui[ ]+a0,0xff010 -[^:]+:[ ]+f015051b[ ]+addiw[ ]+a0,a0,-255 # .* -[^:]+:[ ]+054e[ ]+slli[ ]+a0,a0,0x13 -[^:]+:[ ]+80150513[ ]+addi[ ]+a0,a0,-2047 -[^:]+:[ ]+0536[ ]+slli[ ]+a0,a0,0xd -[^:]+:[ ]+f0150513[ ]+addi[ ]+a0,a0,-255 -[^:]+:[ ]+0010051b[ ]+addiw[ ]+a0,zero,1 -[^:]+:[ ]+151a[ ]+slli[ ]+a0,a0,0x26 -[^:]+:[ ]+1565[ ]+addi[ ]+a0,a0,-7 -[^:]+:[ ]+0536[ ]+slli[ ]+a0,a0,0xd -[^:]+:[ ]+34550513[ ]+addi[ ]+a0,a0,837 -[^:]+:[ ]+0532[ ]+slli[ ]+a0,a0,0xc -[^:]+:[ ]+0505[ ]+addi[ ]+a0,a0,1 +[^:]+:[ ]+f015051b[ ]+addw[ ]+a0,a0,-255 # .* +[^:]+:[ ]+054e[ ]+sll[ ]+a0,a0,0x13 +[^:]+:[ ]+80150513[ ]+add[ ]+a0,a0,-2047 +[^:]+:[ ]+0536[ ]+sll[ ]+a0,a0,0xd +[^:]+:[ ]+f0150513[ ]+add[ ]+a0,a0,-255 +[^:]+:[ ]+0010051b[ ]+addw[ ]+a0,zero,1 +[^:]+:[ ]+151a[ ]+sll[ ]+a0,a0,0x26 +[^:]+:[ ]+1565[ ]+add[ ]+a0,a0,-7 +[^:]+:[ ]+0536[ ]+sll[ ]+a0,a0,0xd +[^:]+:[ ]+34550513[ ]+add[ ]+a0,a0,837 +[^:]+:[ ]+0532[ ]+sll[ ]+a0,a0,0xc +[^:]+:[ ]+0505[ ]+add[ ]+a0,a0,1 [^:]+:[ ]+01fc4537[ ]+lui[ ]+a0,0x1fc4 -[^:]+:[ ]+c915051b[ ]+addiw[ ]+a0,a0,-879 # .* -[^:]+:[ ]+0536[ ]+slli[ ]+a0,a0,0xd -[^:]+:[ ]+1565[ ]+addi[ ]+a0,a0,-7 -[^:]+:[ ]+0536[ ]+slli[ ]+a0,a0,0xd -[^:]+:[ ]+34550513[ ]+addi[ ]+a0,a0,837 -[^:]+:[ ]+0532[ ]+slli[ ]+a0,a0,0xc -[^:]+:[ ]+0505[ ]+addi[ ]+a0,a0,1 +[^:]+:[ ]+c915051b[ ]+addw[ ]+a0,a0,-879 # .* +[^:]+:[ ]+0536[ ]+sll[ ]+a0,a0,0xd +[^:]+:[ ]+1565[ ]+add[ ]+a0,a0,-7 +[^:]+:[ ]+0536[ ]+sll[ ]+a0,a0,0xd +[^:]+:[ ]+34550513[ ]+add[ ]+a0,a0,837 +[^:]+:[ ]+0532[ ]+sll[ ]+a0,a0,0xc +[^:]+:[ ]+0505[ ]+add[ ]+a0,a0,1 diff --git a/gas/testsuite/gas/riscv/lla32.d b/gas/testsuite/gas/riscv/lla32.d index 8e9324c..7e5add1 100644 --- a/gas/testsuite/gas/riscv/lla32.d +++ b/gas/testsuite/gas/riscv/lla32.d @@ -10,10 +10,10 @@ Disassembly of section .text: 0: 00100513 li a0,1 4: 00001537 lui a0,0x1 8: 00001537 lui a0,0x1 - c: 00150513 addi a0,a0,1 # 1001 + c: 00150513 add a0,a0,1 # 1001 10: 00001537 lui a0,0x1 - 14: fff50513 addi a0,a0,-1 # fff + 14: fff50513 add a0,a0,-1 # fff 18: 80000537 lui a0,0x80000 - 1c: fff50513 addi a0,a0,-1 # 7fffffff + 1c: fff50513 add a0,a0,-1 # 7fffffff 20: 00000513 li a0,0 24: fff00513 li a0,-1 diff --git a/gas/testsuite/gas/riscv/lla64.d b/gas/testsuite/gas/riscv/lla64.d index b25ef67..3dac244 100644 --- a/gas/testsuite/gas/riscv/lla64.d +++ b/gas/testsuite/gas/riscv/lla64.d @@ -7,14 +7,14 @@ Disassembly of section .text: 0+000 <.text>: - 0: 0010051b addiw a0,zero,1 + 0: 0010051b addw a0,zero,1 4: 00001537 lui a0,0x1 8: 00001537 lui a0,0x1 - c: 0015051b addiw a0,a0,1 # .* + c: 0015051b addw a0,a0,1 # .* 10: 00001537 lui a0,0x1 - 14: fff5051b addiw a0,a0,-1 # .* + 14: fff5051b addw a0,a0,-1 # .* 18: 80000537 lui a0,0x80000 - 1c: fff5051b addiw a0,a0,-1 # .* + 1c: fff5051b addw a0,a0,-1 # .* 20: 0000051b sext.w a0,zero - 24: fff0051b addiw a0,zero,-1 + 24: fff0051b addw a0,zero,-1 28: 80000537 lui a0,0x80000 diff --git a/gas/testsuite/gas/riscv/zbkb-32.d b/gas/testsuite/gas/riscv/zbkb-32.d index c2718a0..1ab233c 100644 --- a/gas/testsuite/gas/riscv/zbkb-32.d +++ b/gas/testsuite/gas/riscv/zbkb-32.d @@ -10,7 +10,7 @@ Disassembly of section .text: 0+000 : [ ]+[0-9a-f]+:[ ]+60c5d533[ ]+ror[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+60c59533[ ]+rol[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 +[ ]+[0-9a-f]+:[ ]+6025d513[ ]+ror[ ]+a0,a1,0x2 [ ]+[0-9a-f]+:[ ]+40c5f533[ ]+andn[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+40c5e533[ ]+orn[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+40c5c533[ ]+xnor[ ]+a0,a1,a2 diff --git a/gas/testsuite/gas/riscv/zbkb-64.d b/gas/testsuite/gas/riscv/zbkb-64.d index 9e9c706..e942bc6 100644 --- a/gas/testsuite/gas/riscv/zbkb-64.d +++ b/gas/testsuite/gas/riscv/zbkb-64.d @@ -10,10 +10,10 @@ Disassembly of section .text: 0+000 : [ ]+[0-9a-f]+:[ ]+60c5d533[ ]+ror[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+60c59533[ ]+rol[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+6025d513[ ]+rori[ ]+a0,a1,0x2 +[ ]+[0-9a-f]+:[ ]+6025d513[ ]+ror[ ]+a0,a1,0x2 [ ]+[0-9a-f]+:[ ]+60c5d53b[ ]+rorw[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+60c5953b[ ]+rolw[ ]+a0,a1,a2 -[ ]+[0-9a-f]+:[ ]+6025d51b[ ]+roriw[ ]+a0,a1,0x2 +[ ]+[0-9a-f]+:[ ]+6025d51b[ ]+rorw[ ]+a0,a1,0x2 [ ]+[0-9a-f]+:[ ]+40c5f533[ ]+andn[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+40c5e533[ ]+orn[ ]+a0,a1,a2 [ ]+[0-9a-f]+:[ ]+40c5c533[ ]+xnor[ ]+a0,a1,a2 -- cgit v1.1