Skip to content

Commit

Permalink
minor software updates and fixes (#933)
Browse files Browse the repository at this point in the history
  • Loading branch information
@stnolting
stnolting committed Jun 29, 2024
2 parents 028be4a + 49660bc commit a0c14e9
Show file tree
Hide file tree
Showing 12 changed files with 410 additions and 184 deletions.
219 changes: 110 additions & 109 deletions sw/example/bus_explorer/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
char access_size;

// Prototypes
void read_memory(void);
void read_memory(uint32_t address);
void setup_access(void);
void write_memory(void);
void dump_memory(void);
void hexdump(void);
uint32_t hexstr_to_uint(char *buffer, uint8_t length);
void write_memory(uint32_t address, uint32_t data);
void dump_memory(uint32_t address);
void hexdump(uint32_t address);
uint32_t hexstr_to_uint32(char *buffer, uint8_t length);
void aux_print_hex_byte(uint8_t byte);


Expand All @@ -48,6 +48,7 @@ void aux_print_hex_byte(uint8_t byte);
int main() {

char buffer[8];
char strtok_delimiter[] = " ";
int length = 0;

access_size = 0;
Expand Down Expand Up @@ -77,45 +78,78 @@ int main() {
// Main menu
for (;;) {
neorv32_uart0_printf("BUS_EXPLORER:> ");
length = neorv32_uart0_scan(buffer, 8, 1);
length = neorv32_uart0_scan(buffer, 32, 1);
neorv32_uart0_printf("\n");

if (!length) // nothing to be done
continue;
if (!length) { // nothing to be done
continue;
}

char* command;
char* arg0;
char* arg1;

command = strtok(buffer, strtok_delimiter);
arg0 = strtok(NULL, strtok_delimiter);
arg1 = strtok(NULL, strtok_delimiter);

// decode input and execute command
if (!strcmp(buffer, "help")) {
if ((!strcmp(command, "help")) || (command == NULL)) {
neorv32_uart0_printf("Available commands:\n"
" help - show this text\n"
" setup - configure memory access width (byte,half,word)\n"
" read - read from address (byte,half,word)\n"
" write - write to address (byte,half,word)\n"
" dump - dump several bytes/halfs/words from base address\n"
" hex - hex dump (bytes + ASCII) from base address\n"
" fence - synchronize with main memory\n");
" help - show this text\n"
" setup - configure memory access width (byte,half,word)\n"
" read <address> - read from address (byte,half,word)\n"
" write <address> <data> - write data to address (byte,half,word)\n"
" dump <address> - dump several bytes/halfs/words from base address\n"
" hex <address> - hex dump (bytes + ASCII) from base address\n"
" fence - synchronize with main memory\n"
"\n"
"NOTE: <address> and <date> are hexadecimal numbers without prefix.\n"
"Example: write 80000020 feedcafe\n"
);
}

else if (!strcmp(buffer, "setup")) {
else if (!strcmp(command, "setup")) {
setup_access();
}

else if (!strcmp(buffer, "read")) {
read_memory();
else if (!strcmp(command, "read")) {
if (arg0 == NULL) {
neorv32_uart0_printf("Insufficient arguments.\n");
}
else {
read_memory((uint32_t)hexstr_to_uint32(arg0, 8));
}
}

else if (!strcmp(buffer, "write")) {
write_memory();
else if (!strcmp(command, "write")) {
if ((arg0 == NULL) || (arg1 == NULL)) {
neorv32_uart0_printf("Insufficient arguments.\n");
}
else {
write_memory((uint32_t)hexstr_to_uint32(arg0, 8), (uint32_t)hexstr_to_uint32(arg1, 8));
}
}

else if (!strcmp(buffer, "dump")) {
dump_memory();
else if (!strcmp(command, "dump")) {
if (arg0 == NULL) {
neorv32_uart0_printf("Insufficient arguments.\n");
}
else {
dump_memory((uint32_t)hexstr_to_uint32(arg0, 8));
}
}

else if (!strcmp(buffer, "hex")) {
hexdump();
else if (!strcmp(command, "hex")) {
if (arg0 == NULL) {
neorv32_uart0_printf("Insufficient arguments.\n");
}
else {
hexdump((uint32_t)hexstr_to_uint32(arg0, 8));
}
}

else if (!strcmp(buffer, "fence")) {
else if (!strcmp(command, "fence")) {
neorv32_uart0_printf("Synchronizing...\n");
asm volatile ("fence.i");
asm volatile ("fence");
Expand Down Expand Up @@ -163,31 +197,24 @@ void setup_access(void) {
/**********************************************************************//**
* Read from memory address
**************************************************************************/
void read_memory(void) {

char terminal_buffer[16];
void read_memory(uint32_t address) {

if (access_size == 0) {
neorv32_uart0_printf("Configure data size using 'setup' first.\n");
return;
}

// enter address
neorv32_uart0_printf("Enter address (8 hex chars): 0x");
neorv32_uart0_scan(terminal_buffer, 8+1, 1); // 8 hex chars for address plus '\0'
register uint32_t mem_address = (uint32_t)hexstr_to_uint(terminal_buffer, strlen(terminal_buffer));

// perform read access
neorv32_uart0_printf("\n[0x%x] => ", mem_address);
neorv32_uart0_printf("[0x%x] => ", address);

neorv32_cpu_csr_write(CSR_MCAUSE, 0);

uint8_t mem_data_b = 0;
uint16_t mem_data_h = 0;
uint32_t mem_data_w = 0;
if (access_size == 'b') { mem_data_b = (uint32_t)neorv32_cpu_load_unsigned_byte(mem_address); }
if (access_size == 'h') { mem_data_h = (uint32_t)neorv32_cpu_load_unsigned_half(mem_address); }
if (access_size == 'w') { mem_data_w = (uint32_t)neorv32_cpu_load_unsigned_word(mem_address); }
if (access_size == 'b') { mem_data_b = (uint32_t)neorv32_cpu_load_unsigned_byte(address); }
if (access_size == 'h') { mem_data_h = (uint32_t)neorv32_cpu_load_unsigned_half(address); }
if (access_size == 'w') { mem_data_w = (uint32_t)neorv32_cpu_load_unsigned_word(address); }

// show memory content if there was no exception
if (neorv32_cpu_csr_read(CSR_MCAUSE) == 0) {
Expand All @@ -214,54 +241,34 @@ void read_memory(void) {
/**********************************************************************//**
* Write to memory address
**************************************************************************/
void write_memory(void) {

char terminal_buffer[16];
void write_memory(uint32_t address, uint32_t data) {

if (access_size == 0) {
neorv32_uart0_printf("Configure data size using 'setup' first.\n");
return;
}

// enter address
neorv32_uart0_printf("Enter address (8 hex chars): 0x");
neorv32_uart0_scan(terminal_buffer, 8+1, 1); // 8 hex chars for address plus '\0'
uint32_t mem_address = (uint32_t)hexstr_to_uint(terminal_buffer, strlen(terminal_buffer));

// enter data
uint8_t mem_data_b = 0;
uint16_t mem_data_h = 0;
uint32_t mem_data_w = 0;
if (access_size == 'b') {
neorv32_uart0_printf("\nEnter data (2 hex chars): 0x");
neorv32_uart0_scan(terminal_buffer, 2+1, 1); // 2 hex chars for address plus '\0'
mem_data_b = (uint8_t)hexstr_to_uint(terminal_buffer, strlen(terminal_buffer));
neorv32_uart0_printf("\n[0x%x] <= 0x", mem_address);
aux_print_hex_byte(mem_data_b);
neorv32_uart0_printf("[0x%x] <= 0x", address);
aux_print_hex_byte((uint8_t)data);
}
if (access_size == 'h') {
neorv32_uart0_printf("\nEnter data (4 hex chars): 0x");
neorv32_uart0_scan(terminal_buffer, 4+1, 1); // 4 hex chars for address plus '\0'
mem_data_h = (uint16_t)hexstr_to_uint(terminal_buffer, strlen(terminal_buffer));
neorv32_uart0_printf("\n[0x%x] <= 0x", mem_address);
aux_print_hex_byte((uint8_t)(mem_data_h >> 8));
aux_print_hex_byte((uint8_t)(mem_data_h >> 0));
neorv32_uart0_printf("[0x%x] <= 0x", address);
aux_print_hex_byte((uint8_t)(data >> 8));
aux_print_hex_byte((uint8_t)(data >> 0));
}
if (access_size == 'w') {
neorv32_uart0_printf("\nEnter data (8 hex chars): 0x");
neorv32_uart0_scan(terminal_buffer, 8+1, 1); // 8 hex chars for address plus '\0'
mem_data_w = (uint32_t)hexstr_to_uint(terminal_buffer, strlen(terminal_buffer));
neorv32_uart0_printf("\n[0x%x] <= 0x", mem_address);
aux_print_hex_byte((uint8_t)(mem_data_w >> 24));
aux_print_hex_byte((uint8_t)(mem_data_w >> 16));
aux_print_hex_byte((uint8_t)(mem_data_w >> 8));
aux_print_hex_byte((uint8_t)(mem_data_w >> 0));
neorv32_uart0_printf("[0x%x] <= 0x", address);
aux_print_hex_byte((uint8_t)(data >> 24));
aux_print_hex_byte((uint8_t)(data >> 16));
aux_print_hex_byte((uint8_t)(data >> 8));
aux_print_hex_byte((uint8_t)(data >> 0));
}

// perform write access
if (access_size == 'b') { neorv32_cpu_store_unsigned_byte(mem_address, mem_data_b); }
if (access_size == 'h') { neorv32_cpu_store_unsigned_half(mem_address, mem_data_h); }
if (access_size == 'w') { neorv32_cpu_store_unsigned_word(mem_address, mem_data_w); }
if (access_size == 'b') { neorv32_cpu_store_unsigned_byte(address, (uint8_t)data); }
if (access_size == 'h') { neorv32_cpu_store_unsigned_half(address, (uint16_t)data); }
if (access_size == 'w') { neorv32_cpu_store_unsigned_word(address, (uint32_t)data); }

neorv32_uart0_printf("\n");
}
Expand All @@ -270,37 +277,29 @@ void write_memory(void) {
/**********************************************************************//**
* Read several bytes/halfs/word from memory base address
**************************************************************************/
void dump_memory(void) {

char terminal_buffer[16];
void dump_memory(uint32_t address) {

if (access_size == 0) {
neorv32_uart0_printf("Configure data size using 'setup' first.\n");
return;
}

// enter base address
neorv32_uart0_printf("Enter base address (8 hex chars): 0x");
neorv32_uart0_scan(terminal_buffer, 8+1, 1); // 8 hex chars for address plus '\0'
uint32_t mem_address = (uint32_t)hexstr_to_uint(terminal_buffer, strlen(terminal_buffer));

neorv32_uart0_printf("\nPress key to start dumping. Press any key to abort.\n");

neorv32_uart0_printf("Press key to start dumping. Press any key to abort.\n");
neorv32_uart0_getc(); // wait for key

// perform read accesses
while(neorv32_uart0_char_received() == 0) {

neorv32_uart0_printf("[0x%x] = ", mem_address);
neorv32_uart0_printf("[0x%x] = ", address);

neorv32_cpu_csr_write(CSR_MCAUSE, 0);

uint8_t mem_data_b = 0;
uint16_t mem_data_h = 0;
uint32_t mem_data_w = 0;
if (access_size == 'b') { mem_data_b = (uint32_t)neorv32_cpu_load_unsigned_byte(mem_address); }
if (access_size == 'h') { mem_data_h = (uint32_t)neorv32_cpu_load_unsigned_half(mem_address); }
if (access_size == 'w') { mem_data_w = (uint32_t)neorv32_cpu_load_unsigned_word(mem_address); }
if (access_size == 'b') { mem_data_b = (uint32_t)neorv32_cpu_load_unsigned_byte(address); }
if (access_size == 'h') { mem_data_h = (uint32_t)neorv32_cpu_load_unsigned_half(address); }
if (access_size == 'w') { mem_data_w = (uint32_t)neorv32_cpu_load_unsigned_word(address); }

// show memory content if there was no exception
if (neorv32_cpu_csr_read(CSR_MCAUSE) == 0) {
Expand All @@ -325,13 +324,13 @@ void dump_memory(void) {
}

if (access_size == 'b') {
mem_address += 1;
address += 1;
}
else if (access_size == 'h') {
mem_address += 2;
address += 2;
}
else if (access_size == 'w') {
mem_address += 4;
address += 4;
}

}
Expand All @@ -343,20 +342,13 @@ void dump_memory(void) {
/**********************************************************************//**
* Make pretty hexadecimal + ASCII dump (byte-wise)
**************************************************************************/
void hexdump(void) {

char terminal_buffer[16];

// enter base address
neorv32_uart0_printf("Enter base address (8 hex chars): 0x");
neorv32_uart0_scan(terminal_buffer, 8+1, 1); // 8 hex chars for address plus '\0'
uint32_t mem_address = (uint32_t)hexstr_to_uint(terminal_buffer, strlen(terminal_buffer));
void hexdump(uint32_t address) {

neorv32_uart0_printf("\nPress key to start dumping. Press any key to abort.\n");
neorv32_uart0_printf("Press key to start dumping. Press any key to abort.\n");
neorv32_uart0_getc(); // wait for key

// start at 16-byte boundary
mem_address &= 0xfffffff0UL;
address &= 0xfffffff0UL;

uint8_t tmp;
uint8_t line[16];
Expand All @@ -367,11 +359,11 @@ void hexdump(void) {
neorv32_uart0_printf("\n");
while(neorv32_uart0_char_received() == 0) {

neorv32_uart0_printf("0x%x |", mem_address);
neorv32_uart0_printf("0x%x |", address);

// get 16 bytes
for (i=0; i<16; i++) {
line[i] = neorv32_cpu_load_unsigned_byte(mem_address + i);
line[i] = neorv32_cpu_load_unsigned_byte(address + i);
if (neorv32_cpu_csr_read(CSR_MCAUSE) != 0) {
return;
}
Expand All @@ -395,7 +387,7 @@ void hexdump(void) {
}

neorv32_uart0_printf("\n");
mem_address += 16;
address += 16;

}
neorv32_uart0_char_received_get(); // clear UART rx buffer
Expand All @@ -404,30 +396,39 @@ void hexdump(void) {


/**********************************************************************//**
* Helper function to convert N hex chars string into uint32_T
* Helper function to convert N hex chars string into uint32_t
*
* @param[in,out] buffer Pointer to array of chars to convert into number.
* @param[in,out] length Length of the conversion string.
* @return Converted number.
**************************************************************************/
uint32_t hexstr_to_uint(char *buffer, uint8_t length) {
uint32_t hexstr_to_uint32(char *buffer, uint8_t length) {

uint32_t res = 0, d = 0;
char c = 0;

while (length--) {
c = *buffer++;

if ((c >= '0') && (c <= '9'))
if (c == '\0') {
break;
}

if ((c >= '0') && (c <= '9')) {
d = (uint32_t)(c - '0');
else if ((c >= 'a') && (c <= 'f'))
}
else if ((c >= 'a') && (c <= 'f')) {
d = (uint32_t)((c - 'a') + 10);
else if ((c >= 'A') && (c <= 'F'))
}
else if ((c >= 'A') && (c <= 'F')) {
d = (uint32_t)((c - 'A') + 10);
else
}
else {
d = 0;
}

res = res + (d << (length*4));
res <<= 4;
res |= d & 0xf;
}

return res;
Expand Down
Loading

0 comments on commit a0c14e9

Please sign in to comment.