This is an automated email from Gerrit. "Evgeniy Naydanov <[email protected]>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9320
-- gerrit commit 08a5ec22e40252c91c9cfa96335d76b55eccc4ae Author: Evgeniy Naydanov <[email protected]> Date: Thu Dec 18 13:37:12 2025 +0300 target/riscv: drop the usage of `__attribute__((unused))` This is more in line with the styleguide (see `doc/manual/style.txt`). Change-Id: Ica13fc897d27290cad5ad120dcf9ec33a8f621b3 Signed-off-by: Evgeniy Naydanov <[email protected]> diff --git a/src/target/riscv/opcodes.h b/src/target/riscv/opcodes.h index e4efc5b05f..7565bf4888 100644 --- a/src/target/riscv/opcodes.h +++ b/src/target/riscv/opcodes.h @@ -41,56 +41,47 @@ static uint32_t bit(uint32_t value, unsigned int b) return (value >> b) & 1; } -static uint32_t inst_rd(uint32_t r) __attribute__ ((unused)); static uint32_t inst_rd(uint32_t r) { return bits(r, 4, 0) << 7; } -static uint32_t inst_rs1(uint32_t r) __attribute__ ((unused)); static uint32_t inst_rs1(uint32_t r) { return bits(r, 4, 0) << 15; } -static uint32_t inst_rs2(uint32_t r) __attribute__ ((unused)); static uint32_t inst_rs2(uint32_t r) { return bits(r, 4, 0) << 20; } -static uint32_t imm_i(uint32_t imm) __attribute__ ((unused)); static uint32_t imm_i(uint32_t imm) { return bits(imm, 11, 0) << 20; } -static uint32_t imm_s(uint32_t imm) __attribute__ ((unused)); static uint32_t imm_s(uint32_t imm) { return (bits(imm, 4, 0) << 7) | (bits(imm, 11, 5) << 25); } -static uint32_t imm_b(uint32_t imm) __attribute__ ((unused)); static uint32_t imm_b(uint32_t imm) { return (bit(imm, 11) << 7) | (bits(imm, 4, 1) << 8) | (bits(imm, 10, 5) << 25) | (bit(imm, 12) << 31); } -static uint32_t imm_u(uint32_t imm) __attribute__ ((unused)); static uint32_t imm_u(uint32_t imm) { return bits(imm, 31, 12) << 12; } -static uint32_t imm_j(uint32_t imm) __attribute__ ((unused)); static uint32_t imm_j(uint32_t imm) { return (bits(imm, 19, 12) << 12) | (bit(imm, 11) << 20) | (bits(imm, 10, 1) << 21) | (bit(imm, 20) << 31); } -static uint32_t jal(unsigned int rd, int32_t imm) __attribute__ ((unused)); -static uint32_t jal(unsigned int rd, int32_t imm) +static inline uint32_t jal(unsigned int rd, int32_t imm) { assert(rd <= MAX_GPR_NUM); assert((imm >= MIN_INT21) && (imm <= MAX_INT21)); @@ -99,8 +90,7 @@ static uint32_t jal(unsigned int rd, int32_t imm) return imm_j((uint32_t)imm) | inst_rd(rd) | MATCH_JAL; } -static uint32_t csrsi(unsigned int csr, uint8_t imm) __attribute__ ((unused)); -static uint32_t csrsi(unsigned int csr, uint8_t imm) +static inline uint32_t csrsi(unsigned int csr, uint8_t imm) { assert(csr <= MAX_CSR_NUM); assert(imm <= MAX_UINT5); @@ -108,8 +98,7 @@ static uint32_t csrsi(unsigned int csr, uint8_t imm) return imm_i(csr) | inst_rs1(imm) | MATCH_CSRRSI; } -static uint32_t sw(unsigned int src, unsigned int base, int16_t offset) __attribute__ ((unused)); -static uint32_t sw(unsigned int src, unsigned int base, int16_t offset) +static inline uint32_t sw(unsigned int src, unsigned int base, int16_t offset) { assert(src <= MAX_GPR_NUM); assert(base <= MAX_GPR_NUM); @@ -118,8 +107,7 @@ static uint32_t sw(unsigned int src, unsigned int base, int16_t offset) return imm_s((uint16_t)offset) | inst_rs2(src) | inst_rs1(base) | MATCH_SW; } -static uint32_t sd(unsigned int src, unsigned int base, int16_t offset) __attribute__ ((unused)); -static uint32_t sd(unsigned int src, unsigned int base, int16_t offset) +static inline uint32_t sd(unsigned int src, unsigned int base, int16_t offset) { assert(src <= MAX_GPR_NUM); assert(base <= MAX_GPR_NUM); @@ -128,8 +116,7 @@ static uint32_t sd(unsigned int src, unsigned int base, int16_t offset) return imm_s((uint16_t)offset) | inst_rs2(src) | inst_rs1(base) | MATCH_SD; } -static uint32_t sh(unsigned int src, unsigned int base, int16_t offset) __attribute__ ((unused)); -static uint32_t sh(unsigned int src, unsigned int base, int16_t offset) +static inline uint32_t sh(unsigned int src, unsigned int base, int16_t offset) { assert(src <= MAX_GPR_NUM); assert(base <= MAX_GPR_NUM); @@ -138,8 +125,7 @@ static uint32_t sh(unsigned int src, unsigned int base, int16_t offset) return imm_s((uint16_t)offset) | inst_rs2(src) | inst_rs1(base) | MATCH_SH; } -static uint32_t sb(unsigned int src, unsigned int base, int16_t offset) __attribute__ ((unused)); -static uint32_t sb(unsigned int src, unsigned int base, int16_t offset) +static inline uint32_t sb(unsigned int src, unsigned int base, int16_t offset) { assert(src <= MAX_GPR_NUM); assert(base <= MAX_GPR_NUM); @@ -148,8 +134,7 @@ static uint32_t sb(unsigned int src, unsigned int base, int16_t offset) return imm_s((uint16_t)offset) | inst_rs2(src) | inst_rs1(base) | MATCH_SB; } -static uint32_t ld(unsigned int rd, unsigned int base, int16_t offset) __attribute__ ((unused)); -static uint32_t ld(unsigned int rd, unsigned int base, int16_t offset) +static inline uint32_t ld(unsigned int rd, unsigned int base, int16_t offset) { assert(rd <= MAX_GPR_NUM); assert(base <= MAX_GPR_NUM); @@ -158,8 +143,7 @@ static uint32_t ld(unsigned int rd, unsigned int base, int16_t offset) return imm_i((uint16_t)offset) | inst_rs1(base) | inst_rd(rd) | MATCH_LD; } -static uint32_t lw(unsigned int rd, unsigned int base, int16_t offset) __attribute__ ((unused)); -static uint32_t lw(unsigned int rd, unsigned int base, int16_t offset) +static inline uint32_t lw(unsigned int rd, unsigned int base, int16_t offset) { assert(rd <= MAX_GPR_NUM); assert(base <= MAX_GPR_NUM); @@ -168,8 +152,7 @@ static uint32_t lw(unsigned int rd, unsigned int base, int16_t offset) return imm_i((uint16_t)offset) | inst_rs1(base) | inst_rd(rd) | MATCH_LW; } -static uint32_t lh(unsigned int rd, unsigned int base, int16_t offset) __attribute__ ((unused)); -static uint32_t lh(unsigned int rd, unsigned int base, int16_t offset) +static inline uint32_t lh(unsigned int rd, unsigned int base, int16_t offset) { assert(rd <= MAX_GPR_NUM); assert(base <= MAX_GPR_NUM); @@ -178,8 +161,7 @@ static uint32_t lh(unsigned int rd, unsigned int base, int16_t offset) return imm_i((uint16_t)offset) | inst_rs1(base) | inst_rd(rd) | MATCH_LH; } -static uint32_t lb(unsigned int rd, unsigned int base, int16_t offset) __attribute__ ((unused)); -static uint32_t lb(unsigned int rd, unsigned int base, int16_t offset) +static inline uint32_t lb(unsigned int rd, unsigned int base, int16_t offset) { assert(rd <= MAX_GPR_NUM); assert(base <= MAX_GPR_NUM); @@ -188,8 +170,7 @@ static uint32_t lb(unsigned int rd, unsigned int base, int16_t offset) return imm_i((uint16_t)offset) | inst_rs1(base) | inst_rd(rd) | MATCH_LB; } -static uint32_t csrw(unsigned int source, unsigned int csr) __attribute__ ((unused)); -static uint32_t csrw(unsigned int source, unsigned int csr) +static inline uint32_t csrw(unsigned int source, unsigned int csr) { assert(source <= MAX_GPR_NUM); assert(csr <= MAX_CSR_NUM); @@ -197,8 +178,7 @@ static uint32_t csrw(unsigned int source, unsigned int csr) return imm_i(csr) | inst_rs1(source) | MATCH_CSRRW; } -static uint32_t addi(unsigned int dest, unsigned int src, int16_t imm) __attribute__ ((unused)); -static uint32_t addi(unsigned int dest, unsigned int src, int16_t imm) +static inline uint32_t addi(unsigned int dest, unsigned int src, int16_t imm) { assert(dest <= MAX_GPR_NUM); assert(src <= MAX_GPR_NUM); @@ -207,8 +187,7 @@ static uint32_t addi(unsigned int dest, unsigned int src, int16_t imm) return imm_i((uint16_t)imm) | inst_rs1(src) | inst_rd(dest) | MATCH_ADDI; } -static uint32_t csrr(unsigned int rd, unsigned int csr) __attribute__ ((unused)); -static uint32_t csrr(unsigned int rd, unsigned int csr) +static inline uint32_t csrr(unsigned int rd, unsigned int csr) { assert(rd <= MAX_GPR_NUM); assert(csr <= MAX_CSR_NUM); @@ -216,8 +195,7 @@ static uint32_t csrr(unsigned int rd, unsigned int csr) return imm_i(csr) | inst_rd(rd) | MATCH_CSRRS; } -static uint32_t csrrs(unsigned int rd, unsigned int rs, unsigned int csr) __attribute__ ((unused)); -static uint32_t csrrs(unsigned int rd, unsigned int rs, unsigned int csr) +static inline uint32_t csrrs(unsigned int rd, unsigned int rs, unsigned int csr) { assert(rd <= MAX_GPR_NUM); assert(rs <= MAX_GPR_NUM); @@ -226,8 +204,7 @@ static uint32_t csrrs(unsigned int rd, unsigned int rs, unsigned int csr) return imm_i(csr) | inst_rs1(rs) | inst_rd(rd) | MATCH_CSRRS; } -static uint32_t csrrw(unsigned int rd, unsigned int rs, unsigned int csr) __attribute__ ((unused)); -static uint32_t csrrw(unsigned int rd, unsigned int rs, unsigned int csr) +static inline uint32_t csrrw(unsigned int rd, unsigned int rs, unsigned int csr) { assert(rd <= MAX_GPR_NUM); assert(rs <= MAX_GPR_NUM); @@ -236,8 +213,7 @@ static uint32_t csrrw(unsigned int rd, unsigned int rs, unsigned int csr) return imm_i(csr) | inst_rs1(rs) | inst_rd(rd) | MATCH_CSRRW; } -static uint32_t csrrci(unsigned int rd, uint8_t zimm, unsigned int csr) __attribute__ ((unused)); -static uint32_t csrrci(unsigned int rd, uint8_t zimm, unsigned int csr) +static inline uint32_t csrrci(unsigned int rd, uint8_t zimm, unsigned int csr) { assert(rd <= MAX_GPR_NUM); assert(zimm <= MAX_UINT5); @@ -246,8 +222,7 @@ static uint32_t csrrci(unsigned int rd, uint8_t zimm, unsigned int csr) return imm_i(csr) | inst_rs1(zimm) | inst_rd(rd) | MATCH_CSRRCI; } -static uint32_t csrrsi(unsigned int rd, uint8_t zimm, unsigned int csr) __attribute__ ((unused)); -static uint32_t csrrsi(unsigned int rd, uint8_t zimm, unsigned int csr) +static inline uint32_t csrrsi(unsigned int rd, uint8_t zimm, unsigned int csr) { assert(rd <= MAX_GPR_NUM); assert(zimm <= MAX_UINT5); @@ -256,8 +231,7 @@ static uint32_t csrrsi(unsigned int rd, uint8_t zimm, unsigned int csr) return imm_i(csr) | inst_rs1(zimm) | inst_rd(rd) | MATCH_CSRRSI; } -static uint32_t fsw(unsigned int src, unsigned int base, int16_t offset) __attribute__ ((unused)); -static uint32_t fsw(unsigned int src, unsigned int base, int16_t offset) +static inline uint32_t fsw(unsigned int src, unsigned int base, int16_t offset) { assert(src <= MAX_FPR_NUM); assert(base <= MAX_GPR_NUM); @@ -266,8 +240,7 @@ static uint32_t fsw(unsigned int src, unsigned int base, int16_t offset) return imm_s((uint16_t)offset) | inst_rs2(src) | inst_rs1(base) | MATCH_FSW; } -static uint32_t fsd(unsigned int src, unsigned int base, int16_t offset) __attribute__ ((unused)); -static uint32_t fsd(unsigned int src, unsigned int base, int16_t offset) +static inline uint32_t fsd(unsigned int src, unsigned int base, int16_t offset) { assert(src <= MAX_FPR_NUM); assert(base <= MAX_GPR_NUM); @@ -276,8 +249,7 @@ static uint32_t fsd(unsigned int src, unsigned int base, int16_t offset) return imm_s((uint16_t)offset) | inst_rs2(src) | inst_rs1(base) | MATCH_FSD; } -static uint32_t flw(unsigned int dest, unsigned int base, int16_t offset) __attribute__ ((unused)); -static uint32_t flw(unsigned int dest, unsigned int base, int16_t offset) +static inline uint32_t flw(unsigned int dest, unsigned int base, int16_t offset) { assert(dest <= MAX_FPR_NUM); assert(base <= MAX_GPR_NUM); @@ -286,8 +258,7 @@ static uint32_t flw(unsigned int dest, unsigned int base, int16_t offset) return imm_i((uint16_t)offset) | inst_rs1(base) | inst_rd(dest) | MATCH_FLW; } -static uint32_t fld(unsigned int dest, unsigned int base, int16_t offset) __attribute__ ((unused)); -static uint32_t fld(unsigned int dest, unsigned int base, int16_t offset) +static inline uint32_t fld(unsigned int dest, unsigned int base, int16_t offset) { assert(dest <= MAX_FPR_NUM); assert(base <= MAX_GPR_NUM); @@ -296,8 +267,7 @@ static uint32_t fld(unsigned int dest, unsigned int base, int16_t offset) return imm_i((uint16_t)offset) | inst_rs1(base) | inst_rd(dest) | MATCH_FLD; } -static uint32_t fmv_x_w(unsigned int dest, unsigned int src) __attribute__ ((unused)); -static uint32_t fmv_x_w(unsigned int dest, unsigned int src) +static inline uint32_t fmv_x_w(unsigned int dest, unsigned int src) { assert(dest <= MAX_GPR_NUM); assert(src <= MAX_FPR_NUM); @@ -305,8 +275,7 @@ static uint32_t fmv_x_w(unsigned int dest, unsigned int src) return inst_rs1(src) | inst_rd(dest) | MATCH_FMV_X_W; } -static uint32_t fmv_x_d(unsigned int dest, unsigned int src) __attribute__ ((unused)); -static uint32_t fmv_x_d(unsigned int dest, unsigned int src) +static inline uint32_t fmv_x_d(unsigned int dest, unsigned int src) { assert(dest <= MAX_GPR_NUM); assert(src <= MAX_FPR_NUM); @@ -314,8 +283,7 @@ static uint32_t fmv_x_d(unsigned int dest, unsigned int src) return inst_rs1(src) | inst_rd(dest) | MATCH_FMV_X_D; } -static uint32_t fmv_w_x(unsigned int dest, unsigned int src) __attribute__ ((unused)); -static uint32_t fmv_w_x(unsigned int dest, unsigned int src) +static inline uint32_t fmv_w_x(unsigned int dest, unsigned int src) { assert(dest <= MAX_FPR_NUM); assert(src <= MAX_GPR_NUM); @@ -323,8 +291,7 @@ static uint32_t fmv_w_x(unsigned int dest, unsigned int src) return inst_rs1(src) | inst_rd(dest) | MATCH_FMV_W_X; } -static uint32_t fmv_d_x(unsigned int dest, unsigned int src) __attribute__ ((unused)); -static uint32_t fmv_d_x(unsigned int dest, unsigned int src) +static inline uint32_t fmv_d_x(unsigned int dest, unsigned int src) { assert(dest <= MAX_FPR_NUM); assert(src <= MAX_GPR_NUM); @@ -332,28 +299,23 @@ static uint32_t fmv_d_x(unsigned int dest, unsigned int src) return inst_rs1(src) | inst_rd(dest) | MATCH_FMV_D_X; } -static uint32_t ebreak(void) __attribute__ ((unused)); -static uint32_t ebreak(void) +static inline uint32_t ebreak(void) { return MATCH_EBREAK; } -static uint32_t ebreak_c(void) __attribute__ ((unused)); -static uint32_t ebreak_c(void) +static inline uint32_t ebreak_c(void) { return MATCH_C_EBREAK; } -static uint32_t wfi(void) __attribute__ ((unused)); -static uint32_t wfi(void) { return MATCH_WFI; } +static inline uint32_t wfi(void) { return MATCH_WFI; } -static uint32_t fence_i(void) __attribute__ ((unused)); -static uint32_t fence_i(void) +static inline uint32_t fence_i(void) { return MATCH_FENCE_I; } -static uint32_t lui(unsigned int dest, uint32_t imm) __attribute__ ((unused)); -static uint32_t lui(unsigned int dest, uint32_t imm) +static inline uint32_t lui(unsigned int dest, uint32_t imm) { assert(dest <= MAX_GPR_NUM); assert(bits(imm, 11, 0) == 0); @@ -361,8 +323,7 @@ static uint32_t lui(unsigned int dest, uint32_t imm) return imm_u(imm) | inst_rd(dest) | MATCH_LUI; } -static uint32_t xori(unsigned int dest, unsigned int src, int16_t imm) __attribute__ ((unused)); -static uint32_t xori(unsigned int dest, unsigned int src, int16_t imm) +static inline uint32_t xori(unsigned int dest, unsigned int src, int16_t imm) { assert(dest <= MAX_GPR_NUM); assert(src <= MAX_GPR_NUM); @@ -371,8 +332,7 @@ static uint32_t xori(unsigned int dest, unsigned int src, int16_t imm) return imm_i((uint16_t)imm) | inst_rs1(src) | inst_rd(dest) | MATCH_XORI; } -static uint32_t srli(unsigned int dest, unsigned int src, uint8_t shamt) __attribute__ ((unused)); -static uint32_t srli(unsigned int dest, unsigned int src, uint8_t shamt) +static inline uint32_t srli(unsigned int dest, unsigned int src, uint8_t shamt) { assert(dest <= MAX_GPR_NUM); assert(src <= MAX_GPR_NUM); @@ -381,23 +341,20 @@ static uint32_t srli(unsigned int dest, unsigned int src, uint8_t shamt) return inst_rs2(shamt) | inst_rs1(src) | inst_rd(dest) | MATCH_SRLI; } -static uint32_t fence_rw_rw(void) __attribute__((unused)); -static uint32_t fence_rw_rw(void) +static inline uint32_t fence_rw_rw(void) { /* fence rw,rw */ return MATCH_FENCE | 0x3300000; } -static uint32_t auipc(unsigned int dest) __attribute__((unused)); -static uint32_t auipc(unsigned int dest) +static inline uint32_t auipc(unsigned int dest) { assert(dest <= MAX_GPR_NUM); return MATCH_AUIPC | inst_rd(dest); } -static uint32_t vsetvli(unsigned int dest, unsigned int src, uint16_t vtypei) __attribute__((unused)); -static uint32_t vsetvli(unsigned int dest, unsigned int src, uint16_t vtypei) +static inline uint32_t vsetvli(unsigned int dest, unsigned int src, uint16_t vtypei) { assert(dest <= MAX_GPR_NUM); assert(src <= MAX_GPR_NUM); @@ -406,8 +363,7 @@ static uint32_t vsetvli(unsigned int dest, unsigned int src, uint16_t vtypei) return (bits(vtypei, 10, 0) << 20) | inst_rs1(src) | inst_rd(dest) | MATCH_VSETVLI; } -static uint32_t vsetvl(unsigned int rd, unsigned int rs1, unsigned int rs2) __attribute__((unused)); -static uint32_t vsetvl(unsigned int rd, unsigned int rs1, unsigned int rs2) +static inline uint32_t vsetvl(unsigned int rd, unsigned int rs1, unsigned int rs2) { assert(rd <= MAX_GPR_NUM); assert(rs1 <= MAX_GPR_NUM); @@ -416,8 +372,7 @@ static uint32_t vsetvl(unsigned int rd, unsigned int rs1, unsigned int rs2) return inst_rd(rd) | inst_rs1(rs1) | inst_rs2(rs2) | MATCH_VSETVL; } -static uint32_t vmv_x_s(unsigned int rd, unsigned int vs2) __attribute__((unused)); -static uint32_t vmv_x_s(unsigned int rd, unsigned int vs2) +static inline uint32_t vmv_x_s(unsigned int rd, unsigned int vs2) { assert(rd <= MAX_GPR_NUM); assert(vs2 <= MAX_VREG_NUM); @@ -425,8 +380,7 @@ static uint32_t vmv_x_s(unsigned int rd, unsigned int vs2) return inst_rs2(vs2) | inst_rd(rd) | MATCH_VMV_X_S; } -static uint32_t vmv_s_x(unsigned int vd, unsigned int rs2) __attribute__((unused)); -static uint32_t vmv_s_x(unsigned int vd, unsigned int rs2) +static inline uint32_t vmv_s_x(unsigned int vd, unsigned int rs2) { assert(vd <= MAX_VREG_NUM); assert(rs2 <= MAX_GPR_NUM); @@ -434,9 +388,7 @@ static uint32_t vmv_s_x(unsigned int vd, unsigned int rs2) return inst_rs1(rs2) | inst_rd(vd) | MATCH_VMV_S_X; } -static uint32_t vslide1down_vx(unsigned int vd, unsigned int vs2, - unsigned int rs1, bool vm) __attribute__((unused)); -static uint32_t vslide1down_vx(unsigned int vd, unsigned int vs2, +static inline uint32_t vslide1down_vx(unsigned int vd, unsigned int vs2, unsigned int rs1, bool vm) { assert(vd <= MAX_VREG_NUM); --
