Skip to content

target/riscv: Adjust to upstream coding style #1254

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 1 commit into
base: riscv
Choose a base branch
from
Open

target/riscv: Adjust to upstream coding style #1254

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions src/target/riscv/program.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

#define RISCV013_MAX_PROGBUF_SIZE 16

typedef enum {
enum riscv_progbuf_exec_result {
RISCV_PROGBUF_EXEC_RESULT_NOT_EXECUTED,
RISCV_PROGBUF_EXEC_RESULT_UNKNOWN,
RISCV_PROGBUF_EXEC_RESULT_EXCEPTION,
RISCV_PROGBUF_EXEC_RESULT_UNKNOWN_ERROR,
RISCV_PROGBUF_EXEC_RESULT_SUCCESS
} riscv_progbuf_exec_result_t;
};

/* The various RISC-V debug specifications all revolve around setting up
* program buffers and executing them on the target. This structure contains a
Expand All @@ -28,7 +28,7 @@ struct riscv_program {

/* execution result of the program */
/* TODO: remove this field. We should make it a parameter to riscv_program_exec */
riscv_progbuf_exec_result_t execution_result;
enum riscv_progbuf_exec_result execution_result;
};

/* Initializes a program with the header. */
Expand Down
6 changes: 3 additions & 3 deletions src/target/riscv/riscv-011.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2013,7 +2013,7 @@ static int deassert_reset(struct target *target)
return wait_for_state(target, TARGET_RUNNING);
}

static int read_memory(struct target *target, const riscv_mem_access_args_t args)
static int read_memory(struct target *target, const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_read(args));

Expand Down Expand Up @@ -2190,7 +2190,7 @@ static int setup_write_memory(struct target *target, uint32_t size)
return ERROR_OK;
}

static int write_memory(struct target *target, const riscv_mem_access_args_t args)
static int write_memory(struct target *target, const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_write(args));

Expand Down Expand Up @@ -2339,7 +2339,7 @@ static int write_memory(struct target *target, const riscv_mem_access_args_t arg
return ERROR_FAIL;
}

static int access_memory(struct target *target, const riscv_mem_access_args_t args)
static int access_memory(struct target *target, const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_valid(args));
const bool is_write = riscv_mem_access_is_write(args);
Expand Down
85 changes: 43 additions & 42 deletions src/target/riscv/riscv-013.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,16 @@ static int register_read_direct(struct target *target, riscv_reg_t *value,
enum gdb_regno number);
static int register_write_direct(struct target *target, enum gdb_regno number,
riscv_reg_t value);
static int riscv013_access_memory(struct target *target, const riscv_mem_access_args_t args);
static int riscv013_access_memory(struct target *target, const struct riscv_mem_access_args args);
static bool riscv013_get_impebreak(const struct target *target);
static unsigned int riscv013_get_progbufsize(const struct target *target);

typedef enum {
enum grouptype {
HALT_GROUP,
RESUME_GROUP
} grouptype_t;
};
static int set_group(struct target *target, bool *supported, unsigned int group,
grouptype_t grouptype);
enum grouptype grouptype);

/**
* Since almost everything can be accomplish by scanning the dbus register, all
Expand Down Expand Up @@ -220,7 +220,7 @@ typedef struct {
/* We cache the read-only bits of sbcs here. */
uint32_t sbcs;

yes_no_maybe_t progbuf_writable;
enum yes_no_maybe progbuf_writable;
/* We only need the address so that we know the alignment of the buffer. */
riscv_addr_t progbuf_address;

Expand Down Expand Up @@ -1270,7 +1270,7 @@ static int scratch_read64(struct target *target, scratch_mem_t *scratch,
case SPACE_DMI_RAM:
{
uint8_t buffer[8] = {0};
const riscv_mem_access_args_t args = {
const struct riscv_mem_access_args args = {
.address = scratch->debug_address,
.read_buffer = buffer,
.size = 4,
Expand Down Expand Up @@ -1312,7 +1312,7 @@ static int scratch_write64(struct target *target, scratch_mem_t *scratch,
value >> 48,
value >> 56
};
const riscv_mem_access_args_t args = {
const struct riscv_mem_access_args args = {
.address = scratch->debug_address,
.write_buffer = buffer,
.size = 4,
Expand Down Expand Up @@ -1785,7 +1785,7 @@ static void deinit_target(struct target *target)
}

static int set_group(struct target *target, bool *supported, unsigned int group,
grouptype_t grouptype)
enum grouptype grouptype)
{
uint32_t write_val = DM_DMCS2_HGWRITE;
assert(group <= 31);
Expand Down Expand Up @@ -2217,7 +2217,7 @@ static unsigned int riscv013_data_bits(struct target *target)
RISCV_INFO(r);

for (unsigned int i = 0; i < r->num_enabled_mem_access_methods; i++) {
riscv_mem_access_method_t method = r->mem_access_methods[i];
enum riscv_mem_access_method method = r->mem_access_methods[i];

if (method == RISCV_MEM_ACCESS_PROGBUF) {
if (has_sufficient_progbuf(target, 3))
Expand Down Expand Up @@ -3260,7 +3260,7 @@ static int restore_privilege_from_virt2phys_mode(struct target *target, riscv_re
return ERROR_OK;
}

static int read_memory_bus_v0(struct target *target, const riscv_mem_access_args_t args)
static int read_memory_bus_v0(struct target *target, const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_read(args));

Expand Down Expand Up @@ -3350,7 +3350,7 @@ static int read_memory_bus_v0(struct target *target, const riscv_mem_access_args
/**
* Read the requested memory using the system bus interface.
*/
static int read_memory_bus_v1(struct target *target, const riscv_mem_access_args_t args)
static int read_memory_bus_v1(struct target *target, const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_read(args));

Expand Down Expand Up @@ -3496,7 +3496,8 @@ static int read_memory_bus_v1(struct target *target, const riscv_mem_access_args
return ERROR_OK;
}

static void log_mem_access_result(struct target *target, bool success, riscv_mem_access_method_t method, bool is_read)
static void log_mem_access_result(struct target *target, bool success,
enum riscv_mem_access_method method, bool is_read)
{
RISCV_INFO(r);
bool warn = false;
Expand Down Expand Up @@ -3667,7 +3668,7 @@ static struct mem_access_result mem_access_result(enum mem_access_result_enum va
}

static struct mem_access_result mem_should_skip_progbuf(struct target *target,
const riscv_mem_access_args_t args)
const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_valid(args));
const char *const access_type =
Expand Down Expand Up @@ -3710,7 +3711,7 @@ static struct mem_access_result mem_should_skip_progbuf(struct target *target,
}

static struct mem_access_result
mem_should_skip_sysbus(struct target *target, const riscv_mem_access_args_t args)
mem_should_skip_sysbus(struct target *target, const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_valid(args));

Expand Down Expand Up @@ -3743,7 +3744,7 @@ mem_should_skip_sysbus(struct target *target, const riscv_mem_access_args_t args
}

static struct mem_access_result
mem_should_skip_abstract(struct target *target, const riscv_mem_access_args_t args)
mem_should_skip_abstract(struct target *target, const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_valid(args));

Expand Down Expand Up @@ -3778,7 +3779,7 @@ mem_should_skip_abstract(struct target *target, const riscv_mem_access_args_t ar
* aamsize fields in the memory access abstract command.
*/
static struct mem_access_result
read_memory_abstract(struct target *target, const riscv_mem_access_args_t args)
read_memory_abstract(struct target *target, const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_read(args));

Expand Down Expand Up @@ -3855,7 +3856,7 @@ read_memory_abstract(struct target *target, const riscv_mem_access_args_t args)
* byte aamsize fields in the memory access abstract command.
*/
static struct mem_access_result
write_memory_abstract(struct target *target, const riscv_mem_access_args_t args)
write_memory_abstract(struct target *target, const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_write(args));

Expand Down Expand Up @@ -4006,7 +4007,7 @@ static int read_memory_progbuf_inner_startup(struct target *target,
*/
static int read_memory_progbuf_inner_on_ac_busy(struct target *target,
uint32_t start_index, uint32_t *elements_read,
const riscv_mem_access_args_t args)
const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_read(args));

Expand Down Expand Up @@ -4065,7 +4066,7 @@ static int read_memory_progbuf_inner_on_ac_busy(struct target *target,
*/
static int read_memory_progbuf_inner_on_dmi_busy(struct target *target,
uint32_t start_index, uint32_t next_start_index,
const riscv_mem_access_args_t args)
const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_read(args));

Expand All @@ -4086,7 +4087,7 @@ static int read_memory_progbuf_inner_on_dmi_busy(struct target *target,
static int read_memory_progbuf_inner_extract_batch_data(struct target *target,
const struct riscv_batch *batch,
uint32_t start_index, uint32_t elements_to_read, uint32_t *elements_read,
const riscv_mem_access_args_t args)
const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_read(args));

Expand Down Expand Up @@ -4143,7 +4144,7 @@ static int read_memory_progbuf_inner_extract_batch_data(struct target *target,
* - DM_ABSTRACTAUTO_AUTOEXECDATA is set.
*/
static int read_memory_progbuf_inner_run_and_process_batch(struct target *target,
struct riscv_batch *batch, const riscv_mem_access_args_t args,
struct riscv_batch *batch, const struct riscv_mem_access_args args,
uint32_t start_index, uint32_t elements_to_read, uint32_t *elements_read)
{
assert(riscv_mem_access_is_read(args));
Expand Down Expand Up @@ -4214,7 +4215,7 @@ static uint32_t read_memory_progbuf_inner_fill_batch(struct riscv_batch *batch,
}

static int read_memory_progbuf_inner_try_to_read(struct target *target,
const riscv_mem_access_args_t args, uint32_t *elements_read,
const struct riscv_mem_access_args args, uint32_t *elements_read,
uint32_t index, uint32_t loop_count)
{
assert(riscv_mem_access_is_read(args));
Expand All @@ -4237,7 +4238,7 @@ static int read_memory_progbuf_inner_try_to_read(struct target *target,
* with the address argument equal to curr_target_address.
*/
static int read_memory_progbuf_inner_ensure_forward_progress(struct target *target,
const riscv_mem_access_args_t args, uint32_t start_index)
const struct riscv_mem_access_args args, uint32_t start_index)
{
assert(riscv_mem_access_is_read(args));

Expand All @@ -4248,7 +4249,7 @@ static int read_memory_progbuf_inner_ensure_forward_progress(struct target *targ
start_index * args.increment;
uint8_t * const curr_buffer_address = args.read_buffer +
start_index * args.size;
const riscv_mem_access_args_t curr_access = {
const struct riscv_mem_access_args curr_access = {
.read_buffer = curr_buffer_address,
.address = curr_target_address,
.size = args.size,
Expand All @@ -4270,7 +4271,7 @@ static int read_memory_progbuf_inner_ensure_forward_progress(struct target *targ
return ERROR_OK;
}

static void set_buffer_and_log_read(const riscv_mem_access_args_t args,
static void set_buffer_and_log_read(const struct riscv_mem_access_args args,
uint32_t index, uint64_t value)
{
assert(riscv_mem_access_is_read(args));
Expand All @@ -4287,7 +4288,7 @@ static void set_buffer_and_log_read(const riscv_mem_access_args_t args,
}

static int read_word_from_dm_data_regs(struct target *target,
const riscv_mem_access_args_t args, uint32_t index)
const struct riscv_mem_access_args args, uint32_t index)
{
assert(args.size <= 8);
uint64_t value;
Expand All @@ -4299,7 +4300,7 @@ static int read_word_from_dm_data_regs(struct target *target,
}

static struct mem_access_result read_word_from_s1(struct target *target,
const riscv_mem_access_args_t args, uint32_t index)
const struct riscv_mem_access_args args, uint32_t index)
{
assert(riscv_mem_access_is_read(args));

Expand Down Expand Up @@ -4352,7 +4353,7 @@ static int read_memory_progbuf_inner_fill_progbuf(struct target *target,
* is encountered in the process.
*/
static struct mem_access_result
read_memory_progbuf_inner(struct target *target, const riscv_mem_access_args_t args)
read_memory_progbuf_inner(struct target *target, const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_read(args));
assert(args.count > 1 && "If count == 1, read_memory_progbuf_inner_one must be called");
Expand Down Expand Up @@ -4410,7 +4411,7 @@ read_memory_progbuf_inner(struct target *target, const riscv_mem_access_args_t a
* program doesn't need to increment.
*/
static struct mem_access_result
read_memory_progbuf_inner_one(struct target *target, const riscv_mem_access_args_t args)
read_memory_progbuf_inner_one(struct target *target, const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_read(args));

Expand Down Expand Up @@ -4446,7 +4447,7 @@ read_memory_progbuf_inner_one(struct target *target, const riscv_mem_access_args
* Read the requested memory, silently handling memory access errors.
*/
static struct mem_access_result
read_memory_progbuf(struct target *target, const riscv_mem_access_args_t args)
read_memory_progbuf(struct target *target, const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_read(args));

Expand All @@ -4462,10 +4463,10 @@ read_memory_progbuf(struct target *target, const riscv_mem_access_args_t args)
}

static struct mem_access_result
write_memory_progbuf(struct target *target, const riscv_mem_access_args_t args);
write_memory_progbuf(struct target *target, const struct riscv_mem_access_args args);

static struct mem_access_result
access_memory_progbuf(struct target *target, const riscv_mem_access_args_t args)
access_memory_progbuf(struct target *target, const struct riscv_mem_access_args args)
{
struct mem_access_result skip_reason = mem_should_skip_progbuf(target, args);
if (!is_mem_access_ok(skip_reason))
Expand Down Expand Up @@ -4500,12 +4501,12 @@ access_memory_progbuf(struct target *target, const riscv_mem_access_args_t args)
}

static int
write_memory_bus_v0(struct target *target, const riscv_mem_access_args_t args);
write_memory_bus_v0(struct target *target, const struct riscv_mem_access_args args);
static int
write_memory_bus_v1(struct target *target, const riscv_mem_access_args_t args);
write_memory_bus_v1(struct target *target, const struct riscv_mem_access_args args);

static struct mem_access_result
access_memory_sysbus(struct target *target, const riscv_mem_access_args_t args)
access_memory_sysbus(struct target *target, const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_valid(args));

Expand Down Expand Up @@ -4533,7 +4534,7 @@ access_memory_sysbus(struct target *target, const riscv_mem_access_args_t args)
}

static struct mem_access_result
access_memory_abstract(struct target *target, const riscv_mem_access_args_t args)
access_memory_abstract(struct target *target, const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_valid(args));

Expand All @@ -4552,7 +4553,7 @@ access_memory_abstract(struct target *target, const riscv_mem_access_args_t args
}

static int
riscv013_access_memory(struct target *target, const riscv_mem_access_args_t args)
riscv013_access_memory(struct target *target, const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_valid(args));

Expand All @@ -4577,7 +4578,7 @@ riscv013_access_memory(struct target *target, const riscv_mem_access_args_t args

RISCV_INFO(r);
for (unsigned int i = 0; i < r->num_enabled_mem_access_methods; ++i) {
riscv_mem_access_method_t method = r->mem_access_methods[i];
enum riscv_mem_access_method method = r->mem_access_methods[i];
switch (method) {
case RISCV_MEM_ACCESS_PROGBUF:
skip_reason[method] = access_memory_progbuf(target, args);
Expand Down Expand Up @@ -4612,7 +4613,7 @@ riscv013_access_memory(struct target *target, const riscv_mem_access_args_t args
return ERROR_FAIL;
}

static int write_memory_bus_v0(struct target *target, const riscv_mem_access_args_t args)
static int write_memory_bus_v0(struct target *target, const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_write(args));

Expand Down Expand Up @@ -4666,7 +4667,7 @@ static int write_memory_bus_v0(struct target *target, const riscv_mem_access_arg
return ERROR_OK;
}

static int write_memory_bus_v1(struct target *target, const riscv_mem_access_args_t args)
static int write_memory_bus_v1(struct target *target, const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_write(args));

Expand Down Expand Up @@ -5011,7 +5012,7 @@ static int write_memory_progbuf_fill_progbuf(struct target *target, uint32_t siz

static struct mem_access_result
write_memory_progbuf_inner(struct target *target,
const riscv_mem_access_args_t args)
const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_write(args));

Expand Down Expand Up @@ -5046,7 +5047,7 @@ write_memory_progbuf_inner(struct target *target,
}

static struct mem_access_result
write_memory_progbuf(struct target *target, const riscv_mem_access_args_t args)
write_memory_progbuf(struct target *target, const struct riscv_mem_access_args args)
{
assert(riscv_mem_access_is_write(args));

Expand Down
Loading
Loading