projekte
/
Neopixelar
28
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Copyjob worsened ;) Dumpregs added

Browse Source
master
kaqu 2 years ago
parent 3ec69d3495
commit df00a4c94d
4 changed files with 423 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 96
      firmware/cmd_mem.c
  2. 312
      firmware/cmd_mem.c.original
  3. BIN
      helpers/__pycache__/prepare_firmware.cpython-38.pyc
  4. 17
      helpers/prepare_firmware.py

96
firmware/cmd_mem.c
Unescape View File

@ -414,3 +414,99 @@ static void mhsig(int nb_params, char **params)
define_command(mhsig, mhsig, "RAM signature hunt", MEM_CMDS);
/*
* Command "dumpregs"
*
* Dump registers
*/
// Register x
// versus ABI
#define REG_ZERO 0 // Fixed zero
#define REG_ra 1 // Return adress
#define REG_sp 2 // Stack pointer
#define REG_gp 3 // Global pointer
#define REG_tp 4 // Thread pointer
#define REG_t0 5 // Temporary
#define REG_t1 6 // Temporary
#define REG_t2 7 // Temporary
#define REG_fp_s0 8 // Frame pointer (or saved register)
#define REG_s1 9 // Saved register
#define REG_a0 10 // Function argument / return value
#define REG_a1 11 // Function argument / return value
#define REG_a2 12 // Function argument / return value
#define REG_a3 13 // Function argument / return value
#define REG_a4 14 // Function argument / return value
#define REG_a5 15 // Function argument / return value
#define REG_a6 16 // Function argument / return value
#define REG_a7 17 // Function argument / return value
#define REG_s2 18 // Saved register
#define REG_s3 19 // Saved register
#define REG_s4 20 // Saved register
#define REG_s5 21 // Saved register
#define REG_s6 22 // Saved register
#define REG_s7 23 // Saved register
#define REG_s8 24 // Saved register
#define REG_s9 25 // Saved register
#define REG_s10 26 // Saved register
#define REG_s11 27 // Saved register
#define REG_t3 28 // Temporary
#define REG_t4 29 // Temporary
#define REG_t5 30 // Temporary
#define REG_t6 31 // Temporary
int32_t regs[32];
static void dumpregs(int nb_params, char **params)
{
__asm__ __volatile__ ("\
nop \n\
lui t0,%hi(regs) # Load t0 w/ high adress of regs[] \n\
addi t0,t0,%lo(regs) # Add immediate t0=t0+ low adress regs[] \n\
# t0 now loaded with 64-bit pointer to regs[0] \n\
lw t1,56(sp) # Load stored return address (pc!) (64 bit) \n\
sw t1,0(t0) # Store to - unusable - zero (regs[REG_ZERO]) \n\
sw ra,4(t0) # Current return adress -> regs[REG_ra] \n\
sw sp,8(t0) # Stack pointer \n\
sw gp,12(t0) # Global pointer \n\
sw tp,16(t0) # Thread pointer \n\
sw t0,20(t0) # Temporary \n\
sw t1,24(t0) # Temporary \n\
sw t2,28(t0) # Temporary \n\
sw fp,32(t0) # Frame pointer / saved register 0 \n\
sw s1,36(t0) # Saved register \n\
sw a0,40(t0) # Function argument / return value \n\
sw a1,44(t0) # Function argument / return value \n\
sw a2,48(t0) # Function argument / return value \n\
sw a3,52(t0) # Function argument / return value \n\
sw a4,56(t0) # Function argument / return value \n\
sw a5,60(t0) # Function argument / return value \n\
sw a6,64(t0) # Function argument / return value \n\
sw a7,68(t0) # Function argument / return value \n\
sw s2,72(t0) # Saved register \n\
sw s3,76(t0) # Saved register \n\
sw s4,80(t0) # Saved register \n\
sw s5,84(t0) # Saved register \n\
sw s6,88(t0) # Saved register \n\
sw s7,92(t0) # Saved register \n\
sw s8,96(t0) # Saved register \n\
sw s9,100(t0) # Saved register \n\
sw s10,104(t0) # Saved register \n\
sw s11,108(t0) # Saved register \n\
sw t3,112(t0) # Temporary \n\
sw t4,116(t0) # Temporary \n\
sw t5,120(t0) # Temporary \n\
sw t6,124(t0) # Temporary \n\
nop \n\
");
printf("---- RISC-V (ABI: RV32I) ---- \n");
printf("Specials: zero=00000000h (ra(frame):%08Xh)\n", regs[REG_ZERO]);
printf("Pointers: ra=%08Xh sp=%08Xh gp=%08Xh tp=%08Xh fp=%08Xh\n", regs[REG_ra], regs[REG_sp], regs[REG_gp], regs[REG_tp], regs[REG_fp_s0]);
printf("Temporaries: t0=%08Xh t1=%08Xh t2=%08Xh t3=%08Xh t4=%08Xh t5=%08Xh t6=%08Xh\n",
regs[REG_t0], regs[REG_t1], regs[REG_t2], regs[REG_t3], regs[REG_t4], regs[REG_t5], regs[REG_t6]);
printf("Saved: s1=%08Xh s2=%08Xh s3=%08Xh s4=%08Xh s5=%08Xh s6=%08Xh s7=%08Xh s8=%08Xh s9=%08Xh s10=%08Xh s11=%08Xh\n",
regs[REG_s1], regs[REG_s2], regs[REG_s3], regs[REG_s4], regs[REG_s5], regs[REG_s6],
regs[REG_s7], regs[REG_s8], regs[REG_s9], regs[REG_s10], regs[REG_s11]);
printf("Arg./Ret.: a0=%08Xh a1=%08Xh a2=%08Xh a3=%08Xh a4=%08Xh a5=%08Xh a6=%08Xh a7=%08Xh\n",
regs[REG_a0], regs[REG_a1], regs[REG_a2], regs[REG_a3], regs[REG_a4], regs[REG_a5], regs[REG_a6], regs[REG_a7]);
}
define_command(dumpregs, dumpregs, "Dump processor registers", MEM_CMDS);

312
firmware/cmd_mem.c.original
Unescape View File

@ -0,0 +1,312 @@
// SPDX-License-Identifier: BSD-Source-Code
#include <stdio.h>
#include <stdlib.h>
#include <memtest.h>
#include <generated/csr.h>
#include "../command.h"
#include "../helpers.h"
/**
* Command "mr"
*
* Memory read
*
*/
static void mr(int nb_params, char **params)
{
char *c;
unsigned int *addr;
unsigned int length;
if (nb_params < 1) {
printf("mr <address> [length]");
return;
}
addr = (unsigned int *)strtoul(params[0], &c, 0);
if (*c != 0) {
printf("Incorrect address");
return;
}
if (nb_params == 1) {
length = 4;
} else {
length = strtoul(params[1], &c, 0);
if(*c != 0) {
printf("\nIncorrect length");
return;
}
}
dump_bytes(addr, length, (unsigned long)addr);
}
define_command(mr, mr, "Read address space", MEM_CMDS);
/**
* Command "mw"
*
* Memory write
*
*/
static void mw(int nb_params, char **params)
{
char *c;
unsigned int *addr;
unsigned int value;
unsigned int count;
unsigned int i;
if (nb_params < 2) {
printf("mw <address> <value> [count]");
return;
}
addr = (unsigned int *)strtoul(params[0], &c, 0);
if (*c != 0) {
printf("Incorrect address");
return;
}
value = strtoul(params[1], &c, 0);
if(*c != 0) {
printf("Incorrect value");
return;
}
if (nb_params == 2) {
count = 1;
} else {
count = strtoul(params[2], &c, 0);
if(*c != 0) {
printf("Incorrect count");
return;
}
}
for (i = 0; i < count; i++)
*addr++ = value;
}
define_command(mw, mw, "Write address space", MEM_CMDS);
/**
* Command "mc"
*
* Memory copy
*
*/
static void mc(int nb_params, char **params)
{
char *c;
unsigned int *dstaddr;
unsigned int *srcaddr;
unsigned int count;
unsigned int i;
if (nb_params < 2) {
printf("mc <dst> <src> [count]");
return;
}
dstaddr = (unsigned int *)strtoul(params[0], &c, 0);
if (*c != 0) {
printf("Incorrect destination address");
return;
}
srcaddr = (unsigned int *)strtoul(params[1], &c, 0);
if (*c != 0) {
printf("Incorrect source address");
return;
}
if (nb_params == 2) {
count = 1;
} else {
count = strtoul(params[2], &c, 0);
if (*c != 0) {
printf("Incorrect count");
return;
}
}
for (i = 0; i < count; i++)
*dstaddr++ = *srcaddr++;
}
define_command(mc, mc, "Copy address space", MEM_CMDS);
/**
* Command "memtest"
*
* Run a memory test
*
*/
static void memtest_handler(int nb_params, char **params)
{
char *c;
unsigned int *addr;
unsigned long maxsize = ~0uL;
if (nb_params < 1) {
printf("memtest <addr> [<maxsize>]");
return;
}
addr = (unsigned int *)strtoul(params[0], &c, 0);
if (*c != 0) {
printf("Incorrect address");
return;
}
if (nb_params >= 2) {
maxsize = strtoul(params[1], &c, 0);
if (*c != 0) {
printf("Incorrect max size");
return;
}
}
memtest(addr, maxsize);
}
define_command(memtest, memtest_handler, "Run a memory test", MEM_CMDS);
/**
* Command "memspeed"
*
* Run a memory speed test
*
*/
static void memspeed_handler(int nb_params, char **params)
{
char *c;
unsigned int *addr;
unsigned long size;
bool read_only = false;
if (nb_params < 1) {
printf("memspeed <addr> <size> [<readonly>]");
return;
}
addr = (unsigned int *)strtoul(params[0], &c, 0);
if (*c != 0) {
printf("Incorrect address");
return;
}
size = strtoul(params[1], &c, 0);
if (*c != 0) {
printf("Incorrect size");
return;
}
if (nb_params >= 3) {
read_only = (bool) strtoul(params[2], &c, 0);
if (*c != 0) {
printf("Incorrect readonly value");
return;
}
}
memspeed(addr, size, read_only);
}
define_command(memspeed, memspeed_handler, "Run a memory speed test", MEM_CMDS);
#ifdef CSR_DEBUG_PRINTER
/**
* Command "csrprint"
*
* Print CSR values
*
*/
static void csrprint(int nb_params, char **params)
{
print_csrs();
}
define_command(csrprint, csrprint, "Print CSR values", MEM_CMDS);
#endif
#ifdef CSR_WB_SOFTCONTROL_BASE
static void wbr(int nb_params, char **params)
{
char *c;
unsigned int *addr;
unsigned int length;
unsigned int i;
if (nb_params < 1) {
printf("mr <address> [length]");
return;
}
addr = (unsigned int *)strtoul(params[0], &c, 0);
if (*c != 0) {
printf("Incorrect address");
return;
}
if (nb_params == 1) {
length = 4;
} else {
length = strtoul(params[1], &c, 0);
if(*c != 0) {
printf("\nIncorrect length");
return;
}
}
for (i = 0; i < length; ++i) {
wb_softcontrol_adr_write((unsigned long)(addr + i));
wb_softcontrol_read_write(1);
printf("0x%08x: 0x%08x\n", (unsigned long)(addr + i), wb_softcontrol_data_read());
}
}
define_command(wbr, wbr, "Read using softcontrol wishbone controller", MEM_CMDS);
static void wbw(int nb_params, char **params)
{
char *c;
unsigned int *addr;
unsigned int value;
unsigned int count;
unsigned int i;
if (nb_params < 2) {
printf("mw <address> <value> [count]");
return;
}
addr = (unsigned int *)strtoul(params[0], &c, 0);
if (*c != 0) {
printf("Incorrect address");
return;
}
value = strtoul(params[1], &c, 0);
if(*c != 0) {
printf("Incorrect value");
return;
}
if (nb_params == 2) {
count = 1;
} else {
count = strtoul(params[2], &c, 0);
if(*c != 0) {
printf("Incorrect count");
return;
}
}
wb_softcontrol_data_write(value);
for (i = 0; i < count; i++) {
wb_softcontrol_adr_write((unsigned long)(addr + i));
wb_softcontrol_write_write(1);
}
}
define_command(wbw, wbw, "Write using softcontrol wishbone controller", MEM_CMDS);
#endif

BIN
helpers/__pycache__/prepare_firmware.cpython-38.pyc
View File

Binary file not shown.

17
helpers/prepare_firmware.py
Unescape View File

@ -28,8 +28,21 @@ def copyjob():
localpath = os.environ["PWD"] + relpath + "/firmware/"
originalfilename = "main.c"
backupfilename = "main.c.bak"
backupfilename2 = "main.c.original"
backupfilename2 = "main.c.original"
if os.path.isfile(path2firmware + backupfilename): # Check for existing backup
print("Backup already exists")
else: # Ok, no backup. Let's create one in-place & one to our local project directory ...
print("Preparing backup first ...")
shutil.copy2(path2firmware + originalfilename, path2firmware + backupfilename)
shutil.copy2(path2firmware + originalfilename, localpath + backupfilename2)
print("Backups in-place & to local project path finished.")
print("Copying project firmware to target path ...")
shutil.copy2(localpath + originalfilename, path2firmware + originalfilename)
path2firmware = os.path.dirname(litex.soc.__file__) + "/software/bios/cmds/"
originalfilename = "cmd_mem.c"
backupfilename = "cmd_mem.c.bak"
backupfilename2 = "cmd_mem.c.original"
if os.path.isfile(path2firmware + backupfilename): # Check for existing backup
print("Backup already exists")
else: # Ok, no backup. Let's create one in-place & one to our local project directory ...

Write Preview
Loading…
Cancel
Save