Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use separators, not spaces, between operands #332

Merged
merged 1 commit into from
Nov 10, 2023
Merged

Use separators, not spaces, between operands #332

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 40 additions & 40 deletions model/riscv_insts_zfa.sail
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,8 @@ mapping clause encdec = RISCV_FMINM_H(rs2, rs1, rd) if haveZfh() & haveZfa()

mapping clause assembly = RISCV_FMINM_H(rs2, rs1, rd)
<-> "fminm.h" ^ spc() ^ freg_name(rd)
^ spc() ^ freg_name(rs1)
^ spc() ^ freg_name(rs2)
^ sep() ^ freg_name(rs1)
^ sep() ^ freg_name(rs2)

function clause execute (RISCV_FMINM_H(rs2, rs1, rd)) = {
let rs1_val_H = F_H(rs1);
Expand Down Expand Up @@ -254,8 +254,8 @@ mapping clause encdec = RISCV_FMAXM_H(rs2, rs1, rd) if haveZfh() & haveZfa()

mapping clause assembly = RISCV_FMAXM_H(rs2, rs1, rd)
<-> "fmaxm.h" ^ spc() ^ freg_name(rd)
^ spc() ^ freg_name(rs1)
^ spc() ^ freg_name(rs2)
^ sep() ^ freg_name(rs1)
^ sep() ^ freg_name(rs2)

function clause execute (RISCV_FMAXM_H(rs2, rs1, rd)) = {
let rs1_val_H = F_H(rs1);
Expand Down Expand Up @@ -284,8 +284,8 @@ mapping clause encdec = RISCV_FMINM_S(rs2, rs1, rd) if haveZfa()

mapping clause assembly = RISCV_FMINM_S(rs2, rs1, rd)
<-> "fminm.s" ^ spc() ^ freg_name(rd)
^ spc() ^ freg_name(rs1)
^ spc() ^ freg_name(rs2)
^ sep() ^ freg_name(rs1)
^ sep() ^ freg_name(rs2)

function clause execute (RISCV_FMINM_S(rs2, rs1, rd)) = {
let rs1_val_S = F_S(rs1);
Expand Down Expand Up @@ -314,8 +314,8 @@ mapping clause encdec = RISCV_FMAXM_S(rs2, rs1, rd) if haveZfa()

mapping clause assembly = RISCV_FMAXM_S(rs2, rs1, rd)
<-> "fmaxm.s" ^ spc() ^ freg_name(rd)
^ spc() ^ freg_name(rs1)
^ spc() ^ freg_name(rs2)
^ sep() ^ freg_name(rs1)
^ sep() ^ freg_name(rs2)

function clause execute (RISCV_FMAXM_S(rs2, rs1, rd)) = {
let rs1_val_S = F_S(rs1);
Expand Down Expand Up @@ -344,8 +344,8 @@ mapping clause encdec = RISCV_FMINM_D(rs2, rs1, rd) if haveDExt() & haveZfa(

mapping clause assembly = RISCV_FMINM_D(rs2, rs1, rd)
<-> "fminm.d" ^ spc() ^ freg_name(rd)
^ spc() ^ freg_name(rs1)
^ spc() ^ freg_name(rs2)
^ sep() ^ freg_name(rs1)
^ sep() ^ freg_name(rs2)

function clause execute (RISCV_FMINM_D(rs2, rs1, rd)) = {
let rs1_val_D = F(rs1);
Expand Down Expand Up @@ -374,8 +374,8 @@ mapping clause encdec = RISCV_FMAXM_D(rs2, rs1, rd) if haveDExt() & haveZfa(

mapping clause assembly = RISCV_FMAXM_D(rs2, rs1, rd)
<-> "fmaxm.d" ^ spc() ^ freg_name(rd)
^ spc() ^ freg_name(rs1)
^ spc() ^ freg_name(rs2)
^ sep() ^ freg_name(rs1)
^ sep() ^ freg_name(rs2)

function clause execute (RISCV_FMAXM_D(rs2, rs1, rd)) = {
let rs1_val_D = F(rs1);
Expand Down Expand Up @@ -404,8 +404,8 @@ mapping clause encdec = RISCV_FROUND_H(rs1, rm, rd) if

mapping clause assembly = RISCV_FROUND_H(rs1, rm, rd)
<-> "fround.h" ^ spc() ^ freg_name(rd)
^ spc() ^ freg_name(rs1)
^ spc() ^ frm_mnemonic(rm)
^ sep() ^ freg_name(rs1)
^ sep() ^ frm_mnemonic(rm)

function clause execute (RISCV_FROUND_H(rs1, rm, rd)) = {
let rs1_val_H = F_H(rs1);
Expand All @@ -432,8 +432,8 @@ mapping clause encdec = RISCV_FROUNDNX_H(rs1, rm, rd) if

mapping clause assembly = RISCV_FROUNDNX_H(rs1, rm, rd)
<-> "froundnx.h" ^ spc() ^ freg_name(rd)
^ spc() ^ freg_name(rs1)
^ spc() ^ frm_mnemonic(rm)
^ sep() ^ freg_name(rs1)
^ sep() ^ frm_mnemonic(rm)

function clause execute (RISCV_FROUNDNX_H(rs1, rm, rd)) = {
let rs1_val_H = F_H(rs1);
Expand All @@ -460,8 +460,8 @@ mapping clause encdec = RISCV_FROUND_S(rs1, rm, rd) i

mapping clause assembly = RISCV_FROUND_S(rs1, rm, rd)
<-> "fround.s" ^ spc() ^ freg_name(rd)
^ spc() ^ freg_name(rs1)
^ spc() ^ frm_mnemonic(rm)
^ sep() ^ freg_name(rs1)
^ sep() ^ frm_mnemonic(rm)

function clause execute (RISCV_FROUND_S(rs1, rm, rd)) = {
let rs1_val_S = F_S(rs1);
Expand All @@ -488,8 +488,8 @@ mapping clause encdec = RISCV_FROUNDNX_S(rs1, rm, rd) if

mapping clause assembly = RISCV_FROUNDNX_S(rs1, rm, rd)
<-> "froundnx.s" ^ spc() ^ freg_name(rd)
^ spc() ^ freg_name(rs1)
^ spc() ^ frm_mnemonic(rm)
^ sep() ^ freg_name(rs1)
^ sep() ^ frm_mnemonic(rm)

function clause execute (RISCV_FROUNDNX_S(rs1, rm, rd)) = {
let rs1_val_S = F_S(rs1);
Expand All @@ -516,8 +516,8 @@ mapping clause encdec = RISCV_FROUND_D(rs1, rm, rd) i

mapping clause assembly = RISCV_FROUND_D(rs1, rm, rd)
<-> "fround.d" ^ spc() ^ freg_name(rd)
^ spc() ^ freg_name(rs1)
^ spc() ^ frm_mnemonic(rm)
^ sep() ^ freg_name(rs1)
^ sep() ^ frm_mnemonic(rm)

function clause execute (RISCV_FROUND_D(rs1, rm, rd)) = {
let rs1_val_D = F(rs1);
Expand All @@ -544,8 +544,8 @@ mapping clause encdec = RISCV_FROUNDNX_D(rs1, rm, rd) if

mapping clause assembly = RISCV_FROUNDNX_D(rs1, rm, rd)
<-> "froundnx.d" ^ spc() ^ freg_name(rd)
^ spc() ^ freg_name(rs1)
^ spc() ^ frm_mnemonic(rm)
^ sep() ^ freg_name(rs1)
^ sep() ^ frm_mnemonic(rm)

function clause execute (RISCV_FROUNDNX_D(rs1, rm, rd)) = {
let rs1_val_D = F_D(rs1);
Expand All @@ -572,7 +572,7 @@ mapping clause encdec = RISCV_FMVH_X_D(rs1, rd) if haveDExt() & have

mapping clause assembly = RISCV_FMVH_X_D(rs1, rd)
<-> "fmvh.x.d" ^ spc() ^ reg_name(rd)
^ spc() ^ freg_name(rs1)
^ sep() ^ freg_name(rs1)

function clause execute (RISCV_FMVH_X_D(rs1, rd)) = {
let rs1_val_D = F_D(rs1)[63..32];
Expand All @@ -590,8 +590,8 @@ mapping clause encdec = RISCV_FMVP_D_X(rs2, rs1, rd) if haveDExt() & have

mapping clause assembly = RISCV_FMVP_D_X(rs2, rs1, rd)
<-> "fmvp.d.x" ^ spc() ^ freg_name(rd)
^ spc() ^ reg_name(rs1)
^ spc() ^ reg_name(rs2)
^ sep() ^ reg_name(rs1)
^ sep() ^ reg_name(rs2)

function clause execute (RISCV_FMVP_D_X(rs2, rs1, rd)) = {
let rs1_val_X = X(rs1)[31..0];
Expand All @@ -617,8 +617,8 @@ mapping clause encdec = RISCV_FLEQ_H(rs2, rs1, rd) if haveZfh() &

mapping clause assembly = RISCV_FLEQ_H(rs2, rs1, rd)
<-> "fleq.h" ^ spc() ^ freg_name(rd)
^ spc() ^ freg_name(rs1)
^ spc() ^ freg_name(rs2)
^ sep() ^ freg_name(rs1)
^ sep() ^ freg_name(rs2)

function clause execute(RISCV_FLEQ_H(rs2, rs1, rd)) = {
let rs1_val_H = F_H(rs1);
Expand All @@ -641,8 +641,8 @@ mapping clause encdec = RISCV_FLTQ_H(rs2, rs1, rd) if haveZfh() &

mapping clause assembly = RISCV_FLTQ_H(rs2, rs1, rd)
<-> "fltq.h" ^ spc() ^ freg_name(rd)
^ spc() ^ freg_name(rs1)
^ spc() ^ freg_name(rs2)
^ sep() ^ freg_name(rs1)
^ sep() ^ freg_name(rs2)

function clause execute(RISCV_FLTQ_H(rs2, rs1, rd)) = {
let rs1_val_H = F_H(rs1);
Expand All @@ -665,8 +665,8 @@ mapping clause encdec = RISCV_FLEQ_S(rs2, rs1, rd) if haveZfa()

mapping clause assembly = RISCV_FLEQ_S(rs2, rs1, rd)
<-> "fleq.s" ^ spc() ^ freg_name(rd)
^ spc() ^ freg_name(rs1)
^ spc() ^ freg_name(rs2)
^ sep() ^ freg_name(rs1)
^ sep() ^ freg_name(rs2)

function clause execute(RISCV_FLEQ_S(rs2, rs1, rd)) = {
let rs1_val_S = F_S(rs1);
Expand All @@ -689,8 +689,8 @@ mapping clause encdec = RISCV_FLTQ_S(rs2, rs1, rd) if haveZfa()

mapping clause assembly = RISCV_FLTQ_S(rs2, rs1, rd)
<-> "fltq.s" ^ spc() ^ freg_name(rd)
^ spc() ^ freg_name(rs1)
^ spc() ^ freg_name(rs2)
^ sep() ^ freg_name(rs1)
^ sep() ^ freg_name(rs2)

function clause execute(RISCV_FLTQ_S(rs2, rs1, rd)) = {
let rs1_val_S = F_S(rs1);
Expand All @@ -714,8 +714,8 @@ mapping clause encdec = RISCV_FLEQ_D(rs2, rs1, rd) if haveDExt() &

mapping clause assembly = RISCV_FLEQ_D(rs2, rs1, rd)
<-> "fleq.d" ^ spc() ^ freg_name(rd)
^ spc() ^ freg_name(rs1)
^ spc() ^ freg_name(rs2)
^ sep() ^ freg_name(rs1)
^ sep() ^ freg_name(rs2)

function clause execute(RISCV_FLEQ_D(rs2, rs1, rd)) = {
let rs1_val_D = F_D(rs1);
Expand All @@ -738,8 +738,8 @@ mapping clause encdec = RISCV_FLTQ_D(rs2, rs1, rd) if haveDExt() &

mapping clause assembly = RISCV_FLTQ_D(rs2, rs1, rd)
<-> "fltq.d" ^ spc() ^ freg_name(rd)
^ spc() ^ freg_name(rs1)
^ spc() ^ freg_name(rs2)
^ sep() ^ freg_name(rs1)
^ sep() ^ freg_name(rs2)

function clause execute(RISCV_FLTQ_D(rs2, rs1, rd)) = {
let rs1_val_D = F_D(rs1);
Expand Down Expand Up @@ -823,7 +823,7 @@ mapping clause encdec = RISCV_FCVTMOD_W_D(rs1, rd) if haveDExt() & have

mapping clause assembly = RISCV_FCVTMOD_W_D(rs1, rd)
<-> "fcvtmod.w.d" ^ spc() ^ reg_name(rd)
^ spc() ^ freg_name(rs1)
^ sep() ^ freg_name(rs1)

function clause execute(RISCV_FCVTMOD_W_D(rs1, rd)) = {
let rs1_val_D = F_D(rs1);
Expand Down
Loading