target/riscv: refactored memory access result codes
Slightly refactored memory access result codes: * Changed enum formatting * Changed status handlers to decrease boilerplate Checkpatch-ignore: MACRO_ARG_PRECEDENCE, MULTISTATEMENT_MACRO_USE_DO_WHILE Checkpatch-ignore: TRAILING_SEMICOLON Signed-off-by: Farid Khaydari <f.khaydari@syntacore.com>
This commit is contained in:
Farid Khaydari
parent
f82c5a7c04
commit
827d2af88a
|
|
@ -3417,41 +3417,59 @@ typedef enum {
|
|||
MEM_ACCESS_RESULT_TYPE_OK,
|
||||
MEM_ACCESS_RESULT_TYPE_DISABLED,
|
||||
MEM_ACCESS_RESULT_TYPE_SKIPPED,
|
||||
MEM_ACCESS_RESULT_TYPE_FAILED
|
||||
MEM_ACCESS_RESULT_TYPE_FAILED,
|
||||
MEM_ACCESS_RESULT_TYPE_ENUM_SIZE,
|
||||
} mem_access_result_type_t;
|
||||
|
||||
#define LIST_OF_MEM_ACCESS_RESULTS \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_OK, \
|
||||
MEM_ACCESS_RESULT_TYPE_OK, "ok") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_DISABLED, \
|
||||
MEM_ACCESS_RESULT_TYPE_DISABLED, "disabled") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_ABSTRACT_ACCESS_CMDERR, \
|
||||
MEM_ACCESS_RESULT_TYPE_SKIPPED, "skipped (abstract access cmderr)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_PROGBUF_NOT_PRESENT, \
|
||||
MEM_ACCESS_RESULT_TYPE_SKIPPED, "skipped (progbuf not present)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_PROGBUF_INSUFFICIENT, \
|
||||
MEM_ACCESS_RESULT_TYPE_SKIPPED, "skipped (insufficient progbuf)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_UNSUPPORTED_ACCESS_SIZE, \
|
||||
MEM_ACCESS_RESULT_TYPE_SKIPPED, "skipped (unsupported access size)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_XLEN_TOO_SHORT, \
|
||||
MEM_ACCESS_RESULT_TYPE_SKIPPED, "skipped (xlen too short)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_TARGET_NOT_HALTED, \
|
||||
MEM_ACCESS_RESULT_TYPE_SKIPPED, "skipped (target not halted)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_TOO_LARGE_ADDRESS, \
|
||||
MEM_ACCESS_RESULT_TYPE_SKIPPED, "skipped (address too large)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_UNSUPPORTED_INCREMENT_SIZE, \
|
||||
MEM_ACCESS_RESULT_TYPE_SKIPPED, "skipped (increment size not supported)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_TARGET_SELECT_FAILED, \
|
||||
MEM_ACCESS_RESULT_TYPE_SKIPPED, "skipped (dm target select failed)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_FENCE_EXEC_FAILED, \
|
||||
MEM_ACCESS_RESULT_TYPE_SKIPPED, "skipped (fence execution failed)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_FAILED, \
|
||||
MEM_ACCESS_RESULT_TYPE_FAILED, "failed") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_FAILED_DM_ACCESS_FAILED, \
|
||||
MEM_ACCESS_RESULT_TYPE_FAILED, "failed (DM register access failed)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_FAILED_PRIV_MOD_FAILED, \
|
||||
MEM_ACCESS_RESULT_TYPE_FAILED, "failed (privilege modification failed)") \
|
||||
|
||||
#define LIST_OF_MEM_ACCESS_RESULTS \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_OK, OK, "ok") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_DISABLED, DISABLED, "disabled") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED, SKIPPED, "skipped") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_ABSTRACT_ACCESS_CMDERR, \
|
||||
SKIPPED, "skipped (abstract access cmderr)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_PROGBUF_NOT_PRESENT, \
|
||||
SKIPPED, "skipped (progbuf not present)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_PROGBUF_INSUFFICIENT, \
|
||||
SKIPPED, "skipped (insufficient progbuf)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_PROGBUF_FILL_FAILED, \
|
||||
SKIPPED, "skipped (progbuf fill failed)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_WRITE_ABSTRACT_ARG_FAILED, \
|
||||
SKIPPED, "skipped (write abstract failed)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_UNSUPPORTED_ACCESS_SIZE, \
|
||||
SKIPPED, "skipped (unsupported access size)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_XLEN_TOO_SHORT, \
|
||||
SKIPPED, "skipped (xlen too short)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_TARGET_NOT_HALTED, \
|
||||
SKIPPED, "skipped (target not halted)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_TOO_LARGE_ADDRESS, \
|
||||
SKIPPED, "skipped (address too large)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_UNSUPPORTED_INCREMENT_SIZE, \
|
||||
SKIPPED, "skipped (increment size not supported)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_TARGET_SELECT_FAILED, \
|
||||
SKIPPED, "skipped (dm target select failed)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_FENCE_EXEC_FAILED, \
|
||||
SKIPPED, "skipped (fence execution failed)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_SYSBUS_ACCESS_FAILED, \
|
||||
SKIPPED, "skipped (sysbus access failed)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_SKIPPED_REG_SAVE_FAILED, \
|
||||
SKIPPED, "skipped (register save failed)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_FAILED, FAILED, "failed") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_FAILED_DM_ACCESS_FAILED, \
|
||||
FAILED, "failed (DM register access failed)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_FAILED_PRIV_MOD_FAILED, \
|
||||
FAILED, "failed (privilege modification failed)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_FAILED_REG_WRITE_FAILED, \
|
||||
FAILED, "failed (register write failed)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_FAILED_REG_READ_FAILED, \
|
||||
FAILED, "failed (register read failed)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_FAILED_PROGBUF_STARTUP_FAILED, \
|
||||
FAILED, "failed (progbuf startup failed)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_FAILED_EXECUTE_ABSTRACT_FAILED, \
|
||||
FAILED, "failed (execute abstract failed)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_FAILED_NO_FORWARD_PROGRESS, \
|
||||
FAILED, "failed (no forward progress)") \
|
||||
MEM_ACCESS_RESULT_HANDLER(MEM_ACCESS_RESULT_ENUM_SIZE, \
|
||||
ENUM_SIZE, "enum size value") \
|
||||
|
||||
#define MEM_ACCESS_RESULT_HANDLER(name, kind, msg) name,
|
||||
typedef enum {
|
||||
|
|
@ -3462,14 +3480,13 @@ typedef enum {
|
|||
bool is_mem_access_failed(mem_access_result_t status)
|
||||
{
|
||||
#define MEM_ACCESS_RESULT_HANDLER(name, kind, msg) \
|
||||
case name: return kind == MEM_ACCESS_RESULT_TYPE_FAILED;
|
||||
case name: return MEM_ACCESS_RESULT_TYPE_##kind \
|
||||
== MEM_ACCESS_RESULT_TYPE_FAILED;
|
||||
|
||||
switch (status) {
|
||||
LIST_OF_MEM_ACCESS_RESULTS
|
||||
}
|
||||
|
||||
#undef MEM_ACCESS_RESULT_HANDLER
|
||||
|
||||
LOG_ERROR("Unknown memory access status: %d", status);
|
||||
assert(false && "Unknown memory access status");
|
||||
return true;
|
||||
|
|
@ -3478,14 +3495,13 @@ bool is_mem_access_failed(mem_access_result_t status)
|
|||
bool is_mem_access_skipped(mem_access_result_t status)
|
||||
{
|
||||
#define MEM_ACCESS_RESULT_HANDLER(name, kind, msg) \
|
||||
case name: return kind == MEM_ACCESS_RESULT_TYPE_SKIPPED;
|
||||
case name: return MEM_ACCESS_RESULT_TYPE_##kind \
|
||||
== MEM_ACCESS_RESULT_TYPE_SKIPPED;
|
||||
|
||||
switch (status) {
|
||||
LIST_OF_MEM_ACCESS_RESULTS
|
||||
}
|
||||
|
||||
#undef MEM_ACCESS_RESULT_HANDLER
|
||||
|
||||
LOG_ERROR("Unknown memory access status: %d", status);
|
||||
assert(false && "Unknown memory access status");
|
||||
return true;
|
||||
|
|
|
|||
Loading…
Reference in New Issue