Skip to content

necessary tests for progbufsize | Skip CSR read if insufficient progbuf in RISC-V targets #1300

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

Open
wants to merge 2 commits into
base: riscv
Choose a base branch
from
Open

necessary tests for progbufsize | Skip CSR read if insufficient progbuf in RISC-V targets #1300

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51db0ca
added the necessary tests for progbufsize
Oct 26, 2025
38450ad
riscv: Add have_progbuf_size check in vtype,vl writes and crs,fpr rea…
Oct 27, 2025
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
27 changes: 27 additions & 0 deletions src/target/riscv/riscv-013.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1385,6 +1385,10 @@ static int fpr_read_progbuf(struct target *target, uint64_t *value,
{
assert(target->state == TARGET_HALTED);
assert(number >= GDB_REGNO_FPR0 && number <= GDB_REGNO_FPR31);
if (!has_sufficient_progbuf(target, 2)) {
LOG_TARGET_DEBUG("Skipping FPR read: insufficient progbuf (size=%u)", get_info(target)->progbufsize);
return ERROR_FAIL;
}

const unsigned int freg = number - GDB_REGNO_FPR0;

Expand Down Expand Up @@ -1417,6 +1421,10 @@ static int csr_read_progbuf(struct target *target, uint64_t *value,
{
assert(target->state == TARGET_HALTED);
assert(number >= GDB_REGNO_CSR0 && number <= GDB_REGNO_CSR4095);
if (!has_sufficient_progbuf(target, 2)) {
LOG_TARGET_DEBUG("Skipping CSR read: insufficient progbuf (size=%u)", get_info(target)->progbufsize);
return ERROR_FAIL;
}

if (riscv013_reg_save(target, GDB_REGNO_S0) != ERROR_OK)
return ERROR_FAIL;
Expand All @@ -1431,6 +1439,7 @@ static int csr_read_progbuf(struct target *target, uint64_t *value,
return register_read_abstract(target, value, GDB_REGNO_S0) != ERROR_OK;
}


/**
* This function reads a register by writing a program to program buffer and
* executing it.
Expand Down Expand Up @@ -1484,6 +1493,10 @@ static int fpr_write_progbuf(struct target *target, enum gdb_regno number,
{
assert(target->state == TARGET_HALTED);
assert(number >= GDB_REGNO_FPR0 && number <= GDB_REGNO_FPR31);
if (!has_sufficient_progbuf(target, 2)) {
LOG_TARGET_DEBUG("Skipping FPR Write: insufficient progbuf (size=%u)",get_info(target)->progbufsize);
return ERROR_FAIL;
}
const unsigned int freg = number - GDB_REGNO_FPR0;

if (riscv013_reg_save(target, GDB_REGNO_S0) != ERROR_OK)
Expand Down Expand Up @@ -1515,6 +1528,11 @@ static int fpr_write_progbuf(struct target *target, enum gdb_regno number,
static int vtype_write_progbuf(struct target *target, riscv_reg_t value)
{
assert(target->state == TARGET_HALTED);
/* Ensure program buffer is large enough for 2 instructions */
if (!has_sufficient_progbuf(target, 2)) {
Copy link
Collaborator

@en-sc en-sc Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (!has_sufficient_progbuf(target, 2)) {
if (!has_sufficient_progbuf(target, 3)) {

(Same as for vl.)

Copy link
Author

@Biancaa-R Biancaa-R Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh as For vector register (v1) or vector type (vtype) operations we need to see 3 instructions ,right !
Ill fix it .Thanks @en-sc

LOG_TARGET_DEBUG("Skipping vtype write: insufficient progbuf (size=%u)", get_info(target)->progbufsize);
return ERROR_FAIL;
}

if (riscv013_reg_save(target, GDB_REGNO_S0) != ERROR_OK)
return ERROR_FAIL;
Expand All @@ -1536,6 +1554,11 @@ static int vtype_write_progbuf(struct target *target, riscv_reg_t value)
static int vl_write_progbuf(struct target *target, riscv_reg_t value)
{
assert(target->state == TARGET_HALTED);
/* Ensure program buffer is large enough for 2 instructions */
if (!has_sufficient_progbuf(target, 2)) {
Copy link
Collaborator

@en-sc en-sc Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (!has_sufficient_progbuf(target, 2)) {
if (!has_sufficient_progbuf(target, 3)) {

The sequence is:

csrr ...
vsetvl ...
ebreak

LOG_TARGET_DEBUG("Skipping vl write: insufficient progbuf (size=%u)", get_info(target)->progbufsize);
return ERROR_FAIL;
}

if (riscv013_reg_save(target, GDB_REGNO_S0) != ERROR_OK)
return ERROR_FAIL;
Expand All @@ -1559,6 +1582,10 @@ static int csr_write_progbuf(struct target *target, enum gdb_regno number,
{
assert(target->state == TARGET_HALTED);
assert(number >= GDB_REGNO_CSR0 && number <= GDB_REGNO_CSR4095);
if (!has_sufficient_progbuf(target, 2)) {
LOG_TARGET_DEBUG("Skipping CSR write: insufficient progbuf (size=%u)", get_info(target)->progbufsize);
return ERROR_FAIL;
}

if (riscv013_reg_save(target, GDB_REGNO_S0) != ERROR_OK)
return ERROR_FAIL;
Expand Down
Loading