Improve block read and checksum speed (#381)
* Cache program buffer writes. Speeds up flash program by 3%, flash verify by 2%. Change-Id: I19f8f44f560a1111fa8f4e4fc04ce6de3c94999a * Remove nop from batch reads. program @ 22.123 KiB/s, verify @ 47.654 KiB/s (up from program @ 20.287 KiB/s, verify @ 23.148 KiB/s originally). Change-Id: I7ee19d967b1080336b0088d20e1fc30828afd935 * Use "algorithm" to compute CRC on RISC-V targets. Use the C compiler to generate the algorithm code. It's better at assembly than I am. We need separate RV32 and RV64 binaries to handle shift instructions. I used the code from gdb (libiberty really) because it returns the correct result. I'm not sure if the table is worth it since we do have to save/download/restore more bytes now. riscv_run_algorithm() now properly saves and reads back all registers used for parameters. It also doesn't check final_pc if exit_point is 0. Using gdb means I don't know the exact address where the code will end. Small target.[ch] change to be able to run algorithms at 64-bit addresses. Flashing an arty board now: ``` wrote 2228224 bytes from file /media/sf_tnewsome/SiFive/arty_images/arty.E21TraceFPGAEvaluationConfig.mcs in 105.589180s (20.608 KiB/s) verified 2192012 bytes in 7.037476s (304.177 KiB/s) 9.87user 16.16system 1:53.16elapsed 23%CPU (0avgtext+0avgdata 24768maxresident)k ``` Change-Id: I6696bd4cda7c89ac5ccd21b2ff3aa1663d7d7190 * Clean up formatting. Change-Id: I7f2d792a2b9432a04209272abb00d8136ee01025debug-log-reg-failure
Tim Newsome
GitHub
parent
c05ad1a92a
commit
bb03f79bde
|
|
@ -6,25 +6,41 @@ ARM_OBJCOPY ?= $(ARM_CROSS_COMPILE)objcopy
|
||||||
|
|
||||||
ARM_AFLAGS = -EL
|
ARM_AFLAGS = -EL
|
||||||
|
|
||||||
|
RISCV_CROSS_COMPILE ?= riscv64-unknown-elf-
|
||||||
|
RISCV_CC ?= $(RISCV_CROSS_COMPILE)gcc
|
||||||
|
RISCV_OBJCOPY ?= $(RISCV_CROSS_COMPILE)objcopy
|
||||||
|
RISCV32_CFLAGS = -march=rv32i -mabi=ilp32 -nostdlib -nostartfiles -Os -fPIC
|
||||||
|
RISCV64_CFLAGS = -march=rv64i -mabi=lp64 -nostdlib -nostartfiles -Os -fPIC
|
||||||
|
|
||||||
|
all: arm riscv
|
||||||
|
|
||||||
arm: armv4_5_crc.inc armv7m_crc.inc
|
arm: armv4_5_crc.inc armv7m_crc.inc
|
||||||
|
|
||||||
|
riscv: riscv32_crc.inc riscv64_crc.inc
|
||||||
|
|
||||||
armv4_5_%.elf: armv4_5_%.s
|
armv4_5_%.elf: armv4_5_%.s
|
||||||
$(ARM_AS) $(ARM_AFLAGS) $< -o $@
|
$(ARM_AS) $(ARM_AFLAGS) $< -o $@
|
||||||
|
|
||||||
armv4_5_%.bin: armv4_5_%.elf
|
armv4_5_%.bin: armv4_5_%.elf
|
||||||
$(ARM_OBJCOPY) -Obinary $< $@
|
$(ARM_OBJCOPY) -Obinary $< $@
|
||||||
|
|
||||||
armv4_5_%.inc: armv4_5_%.bin
|
|
||||||
$(BIN2C) < $< > $@
|
|
||||||
|
|
||||||
armv7m_%.elf: armv7m_%.s
|
armv7m_%.elf: armv7m_%.s
|
||||||
$(ARM_AS) $(ARM_AFLAGS) $< -o $@
|
$(ARM_AS) $(ARM_AFLAGS) $< -o $@
|
||||||
|
|
||||||
armv7m_%.bin: armv7m_%.elf
|
armv7m_%.bin: armv7m_%.elf
|
||||||
$(ARM_OBJCOPY) -Obinary $< $@
|
$(ARM_OBJCOPY) -Obinary $< $@
|
||||||
|
|
||||||
armv7m_%.inc: armv7m_%.bin
|
%.inc: %.bin
|
||||||
$(BIN2C) < $< > $@
|
$(BIN2C) < $< > $@
|
||||||
|
|
||||||
|
riscv32_%.elf: riscv_%.c
|
||||||
|
$(RISCV_CC) $(RISCV32_CFLAGS) $< -o $@
|
||||||
|
|
||||||
|
riscv64_%.elf: riscv_%.c
|
||||||
|
$(RISCV_CC) $(RISCV64_CFLAGS) $< -o $@
|
||||||
|
|
||||||
|
riscv%.bin: riscv%.elf
|
||||||
|
$(RISCV_OBJCOPY) -Obinary $< $@
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
-rm -f *.elf *.bin *.inc
|
-rm -f *.elf *.bin *.inc
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,70 @@
|
||||||
|
/* Autogenerated with ../../../src/helper/bin2char.sh */
|
||||||
|
0xb3,0x05,0xb5,0x00,0x93,0x07,0xf0,0xff,0x17,0x07,0x00,0x00,0x13,0x07,0x47,0x04,
|
||||||
|
0x63,0x1a,0xb5,0x00,0x13,0x85,0x07,0x00,0x73,0x00,0x10,0x00,0x13,0x85,0x07,0x00,
|
||||||
|
0x67,0x80,0x00,0x00,0x03,0x46,0x05,0x00,0x93,0x96,0x87,0x00,0x93,0xd7,0x87,0x01,
|
||||||
|
0xb3,0xc7,0xc7,0x00,0x93,0x97,0x27,0x00,0xb3,0x07,0xf7,0x00,0x83,0xa7,0x07,0x00,
|
||||||
|
0x13,0x05,0x15,0x00,0xb3,0xc7,0xf6,0x00,0x6f,0xf0,0x9f,0xfc,0x00,0x00,0x00,0x00,
|
||||||
|
0xb7,0x1d,0xc1,0x04,0x6e,0x3b,0x82,0x09,0xd9,0x26,0x43,0x0d,0xdc,0x76,0x04,0x13,
|
||||||
|
0x6b,0x6b,0xc5,0x17,0xb2,0x4d,0x86,0x1a,0x05,0x50,0x47,0x1e,0xb8,0xed,0x08,0x26,
|
||||||
|
0x0f,0xf0,0xc9,0x22,0xd6,0xd6,0x8a,0x2f,0x61,0xcb,0x4b,0x2b,0x64,0x9b,0x0c,0x35,
|
||||||
|
0xd3,0x86,0xcd,0x31,0x0a,0xa0,0x8e,0x3c,0xbd,0xbd,0x4f,0x38,0x70,0xdb,0x11,0x4c,
|
||||||
|
0xc7,0xc6,0xd0,0x48,0x1e,0xe0,0x93,0x45,0xa9,0xfd,0x52,0x41,0xac,0xad,0x15,0x5f,
|
||||||
|
0x1b,0xb0,0xd4,0x5b,0xc2,0x96,0x97,0x56,0x75,0x8b,0x56,0x52,0xc8,0x36,0x19,0x6a,
|
||||||
|
0x7f,0x2b,0xd8,0x6e,0xa6,0x0d,0x9b,0x63,0x11,0x10,0x5a,0x67,0x14,0x40,0x1d,0x79,
|
||||||
|
0xa3,0x5d,0xdc,0x7d,0x7a,0x7b,0x9f,0x70,0xcd,0x66,0x5e,0x74,0xe0,0xb6,0x23,0x98,
|
||||||
|
0x57,0xab,0xe2,0x9c,0x8e,0x8d,0xa1,0x91,0x39,0x90,0x60,0x95,0x3c,0xc0,0x27,0x8b,
|
||||||
|
0x8b,0xdd,0xe6,0x8f,0x52,0xfb,0xa5,0x82,0xe5,0xe6,0x64,0x86,0x58,0x5b,0x2b,0xbe,
|
||||||
|
0xef,0x46,0xea,0xba,0x36,0x60,0xa9,0xb7,0x81,0x7d,0x68,0xb3,0x84,0x2d,0x2f,0xad,
|
||||||
|
0x33,0x30,0xee,0xa9,0xea,0x16,0xad,0xa4,0x5d,0x0b,0x6c,0xa0,0x90,0x6d,0x32,0xd4,
|
||||||
|
0x27,0x70,0xf3,0xd0,0xfe,0x56,0xb0,0xdd,0x49,0x4b,0x71,0xd9,0x4c,0x1b,0x36,0xc7,
|
||||||
|
0xfb,0x06,0xf7,0xc3,0x22,0x20,0xb4,0xce,0x95,0x3d,0x75,0xca,0x28,0x80,0x3a,0xf2,
|
||||||
|
0x9f,0x9d,0xfb,0xf6,0x46,0xbb,0xb8,0xfb,0xf1,0xa6,0x79,0xff,0xf4,0xf6,0x3e,0xe1,
|
||||||
|
0x43,0xeb,0xff,0xe5,0x9a,0xcd,0xbc,0xe8,0x2d,0xd0,0x7d,0xec,0x77,0x70,0x86,0x34,
|
||||||
|
0xc0,0x6d,0x47,0x30,0x19,0x4b,0x04,0x3d,0xae,0x56,0xc5,0x39,0xab,0x06,0x82,0x27,
|
||||||
|
0x1c,0x1b,0x43,0x23,0xc5,0x3d,0x00,0x2e,0x72,0x20,0xc1,0x2a,0xcf,0x9d,0x8e,0x12,
|
||||||
|
0x78,0x80,0x4f,0x16,0xa1,0xa6,0x0c,0x1b,0x16,0xbb,0xcd,0x1f,0x13,0xeb,0x8a,0x01,
|
||||||
|
0xa4,0xf6,0x4b,0x05,0x7d,0xd0,0x08,0x08,0xca,0xcd,0xc9,0x0c,0x07,0xab,0x97,0x78,
|
||||||
|
0xb0,0xb6,0x56,0x7c,0x69,0x90,0x15,0x71,0xde,0x8d,0xd4,0x75,0xdb,0xdd,0x93,0x6b,
|
||||||
|
0x6c,0xc0,0x52,0x6f,0xb5,0xe6,0x11,0x62,0x02,0xfb,0xd0,0x66,0xbf,0x46,0x9f,0x5e,
|
||||||
|
0x08,0x5b,0x5e,0x5a,0xd1,0x7d,0x1d,0x57,0x66,0x60,0xdc,0x53,0x63,0x30,0x9b,0x4d,
|
||||||
|
0xd4,0x2d,0x5a,0x49,0x0d,0x0b,0x19,0x44,0xba,0x16,0xd8,0x40,0x97,0xc6,0xa5,0xac,
|
||||||
|
0x20,0xdb,0x64,0xa8,0xf9,0xfd,0x27,0xa5,0x4e,0xe0,0xe6,0xa1,0x4b,0xb0,0xa1,0xbf,
|
||||||
|
0xfc,0xad,0x60,0xbb,0x25,0x8b,0x23,0xb6,0x92,0x96,0xe2,0xb2,0x2f,0x2b,0xad,0x8a,
|
||||||
|
0x98,0x36,0x6c,0x8e,0x41,0x10,0x2f,0x83,0xf6,0x0d,0xee,0x87,0xf3,0x5d,0xa9,0x99,
|
||||||
|
0x44,0x40,0x68,0x9d,0x9d,0x66,0x2b,0x90,0x2a,0x7b,0xea,0x94,0xe7,0x1d,0xb4,0xe0,
|
||||||
|
0x50,0x00,0x75,0xe4,0x89,0x26,0x36,0xe9,0x3e,0x3b,0xf7,0xed,0x3b,0x6b,0xb0,0xf3,
|
||||||
|
0x8c,0x76,0x71,0xf7,0x55,0x50,0x32,0xfa,0xe2,0x4d,0xf3,0xfe,0x5f,0xf0,0xbc,0xc6,
|
||||||
|
0xe8,0xed,0x7d,0xc2,0x31,0xcb,0x3e,0xcf,0x86,0xd6,0xff,0xcb,0x83,0x86,0xb8,0xd5,
|
||||||
|
0x34,0x9b,0x79,0xd1,0xed,0xbd,0x3a,0xdc,0x5a,0xa0,0xfb,0xd8,0xee,0xe0,0x0c,0x69,
|
||||||
|
0x59,0xfd,0xcd,0x6d,0x80,0xdb,0x8e,0x60,0x37,0xc6,0x4f,0x64,0x32,0x96,0x08,0x7a,
|
||||||
|
0x85,0x8b,0xc9,0x7e,0x5c,0xad,0x8a,0x73,0xeb,0xb0,0x4b,0x77,0x56,0x0d,0x04,0x4f,
|
||||||
|
0xe1,0x10,0xc5,0x4b,0x38,0x36,0x86,0x46,0x8f,0x2b,0x47,0x42,0x8a,0x7b,0x00,0x5c,
|
||||||
|
0x3d,0x66,0xc1,0x58,0xe4,0x40,0x82,0x55,0x53,0x5d,0x43,0x51,0x9e,0x3b,0x1d,0x25,
|
||||||
|
0x29,0x26,0xdc,0x21,0xf0,0x00,0x9f,0x2c,0x47,0x1d,0x5e,0x28,0x42,0x4d,0x19,0x36,
|
||||||
|
0xf5,0x50,0xd8,0x32,0x2c,0x76,0x9b,0x3f,0x9b,0x6b,0x5a,0x3b,0x26,0xd6,0x15,0x03,
|
||||||
|
0x91,0xcb,0xd4,0x07,0x48,0xed,0x97,0x0a,0xff,0xf0,0x56,0x0e,0xfa,0xa0,0x11,0x10,
|
||||||
|
0x4d,0xbd,0xd0,0x14,0x94,0x9b,0x93,0x19,0x23,0x86,0x52,0x1d,0x0e,0x56,0x2f,0xf1,
|
||||||
|
0xb9,0x4b,0xee,0xf5,0x60,0x6d,0xad,0xf8,0xd7,0x70,0x6c,0xfc,0xd2,0x20,0x2b,0xe2,
|
||||||
|
0x65,0x3d,0xea,0xe6,0xbc,0x1b,0xa9,0xeb,0x0b,0x06,0x68,0xef,0xb6,0xbb,0x27,0xd7,
|
||||||
|
0x01,0xa6,0xe6,0xd3,0xd8,0x80,0xa5,0xde,0x6f,0x9d,0x64,0xda,0x6a,0xcd,0x23,0xc4,
|
||||||
|
0xdd,0xd0,0xe2,0xc0,0x04,0xf6,0xa1,0xcd,0xb3,0xeb,0x60,0xc9,0x7e,0x8d,0x3e,0xbd,
|
||||||
|
0xc9,0x90,0xff,0xb9,0x10,0xb6,0xbc,0xb4,0xa7,0xab,0x7d,0xb0,0xa2,0xfb,0x3a,0xae,
|
||||||
|
0x15,0xe6,0xfb,0xaa,0xcc,0xc0,0xb8,0xa7,0x7b,0xdd,0x79,0xa3,0xc6,0x60,0x36,0x9b,
|
||||||
|
0x71,0x7d,0xf7,0x9f,0xa8,0x5b,0xb4,0x92,0x1f,0x46,0x75,0x96,0x1a,0x16,0x32,0x88,
|
||||||
|
0xad,0x0b,0xf3,0x8c,0x74,0x2d,0xb0,0x81,0xc3,0x30,0x71,0x85,0x99,0x90,0x8a,0x5d,
|
||||||
|
0x2e,0x8d,0x4b,0x59,0xf7,0xab,0x08,0x54,0x40,0xb6,0xc9,0x50,0x45,0xe6,0x8e,0x4e,
|
||||||
|
0xf2,0xfb,0x4f,0x4a,0x2b,0xdd,0x0c,0x47,0x9c,0xc0,0xcd,0x43,0x21,0x7d,0x82,0x7b,
|
||||||
|
0x96,0x60,0x43,0x7f,0x4f,0x46,0x00,0x72,0xf8,0x5b,0xc1,0x76,0xfd,0x0b,0x86,0x68,
|
||||||
|
0x4a,0x16,0x47,0x6c,0x93,0x30,0x04,0x61,0x24,0x2d,0xc5,0x65,0xe9,0x4b,0x9b,0x11,
|
||||||
|
0x5e,0x56,0x5a,0x15,0x87,0x70,0x19,0x18,0x30,0x6d,0xd8,0x1c,0x35,0x3d,0x9f,0x02,
|
||||||
|
0x82,0x20,0x5e,0x06,0x5b,0x06,0x1d,0x0b,0xec,0x1b,0xdc,0x0f,0x51,0xa6,0x93,0x37,
|
||||||
|
0xe6,0xbb,0x52,0x33,0x3f,0x9d,0x11,0x3e,0x88,0x80,0xd0,0x3a,0x8d,0xd0,0x97,0x24,
|
||||||
|
0x3a,0xcd,0x56,0x20,0xe3,0xeb,0x15,0x2d,0x54,0xf6,0xd4,0x29,0x79,0x26,0xa9,0xc5,
|
||||||
|
0xce,0x3b,0x68,0xc1,0x17,0x1d,0x2b,0xcc,0xa0,0x00,0xea,0xc8,0xa5,0x50,0xad,0xd6,
|
||||||
|
0x12,0x4d,0x6c,0xd2,0xcb,0x6b,0x2f,0xdf,0x7c,0x76,0xee,0xdb,0xc1,0xcb,0xa1,0xe3,
|
||||||
|
0x76,0xd6,0x60,0xe7,0xaf,0xf0,0x23,0xea,0x18,0xed,0xe2,0xee,0x1d,0xbd,0xa5,0xf0,
|
||||||
|
0xaa,0xa0,0x64,0xf4,0x73,0x86,0x27,0xf9,0xc4,0x9b,0xe6,0xfd,0x09,0xfd,0xb8,0x89,
|
||||||
|
0xbe,0xe0,0x79,0x8d,0x67,0xc6,0x3a,0x80,0xd0,0xdb,0xfb,0x84,0xd5,0x8b,0xbc,0x9a,
|
||||||
|
0x62,0x96,0x7d,0x9e,0xbb,0xb0,0x3e,0x93,0x0c,0xad,0xff,0x97,0xb1,0x10,0xb0,0xaf,
|
||||||
|
0x06,0x0d,0x71,0xab,0xdf,0x2b,0x32,0xa6,0x68,0x36,0xf3,0xa2,0x6d,0x66,0xb4,0xbc,
|
||||||
|
0xda,0x7b,0x75,0xb8,0x03,0x5d,0x36,0xb5,0xb4,0x40,0xf7,0xb1,
|
||||||
|
|
@ -0,0 +1,71 @@
|
||||||
|
/* Autogenerated with ../../../src/helper/bin2char.sh */
|
||||||
|
0x93,0x07,0xf0,0xff,0x93,0x06,0xf0,0xff,0x17,0x06,0x00,0x00,0x13,0x06,0x06,0x05,
|
||||||
|
0x9b,0x85,0xf5,0xff,0x63,0x9a,0xd5,0x00,0x13,0x85,0x07,0x00,0x73,0x00,0x10,0x00,
|
||||||
|
0x13,0x85,0x07,0x00,0x67,0x80,0x00,0x00,0x1b,0x98,0x87,0x00,0x1b,0xd7,0x87,0x01,
|
||||||
|
0x83,0x47,0x05,0x00,0x13,0x05,0x15,0x00,0x33,0x47,0xf7,0x00,0x13,0x17,0x07,0x02,
|
||||||
|
0x13,0x57,0xe7,0x01,0x33,0x07,0xe6,0x00,0x83,0x27,0x07,0x00,0xb3,0xc7,0x07,0x01,
|
||||||
|
0x9b,0x87,0x07,0x00,0x6f,0xf0,0xdf,0xfb,0x00,0x00,0x00,0x00,0xb7,0x1d,0xc1,0x04,
|
||||||
|
0x6e,0x3b,0x82,0x09,0xd9,0x26,0x43,0x0d,0xdc,0x76,0x04,0x13,0x6b,0x6b,0xc5,0x17,
|
||||||
|
0xb2,0x4d,0x86,0x1a,0x05,0x50,0x47,0x1e,0xb8,0xed,0x08,0x26,0x0f,0xf0,0xc9,0x22,
|
||||||
|
0xd6,0xd6,0x8a,0x2f,0x61,0xcb,0x4b,0x2b,0x64,0x9b,0x0c,0x35,0xd3,0x86,0xcd,0x31,
|
||||||
|
0x0a,0xa0,0x8e,0x3c,0xbd,0xbd,0x4f,0x38,0x70,0xdb,0x11,0x4c,0xc7,0xc6,0xd0,0x48,
|
||||||
|
0x1e,0xe0,0x93,0x45,0xa9,0xfd,0x52,0x41,0xac,0xad,0x15,0x5f,0x1b,0xb0,0xd4,0x5b,
|
||||||
|
0xc2,0x96,0x97,0x56,0x75,0x8b,0x56,0x52,0xc8,0x36,0x19,0x6a,0x7f,0x2b,0xd8,0x6e,
|
||||||
|
0xa6,0x0d,0x9b,0x63,0x11,0x10,0x5a,0x67,0x14,0x40,0x1d,0x79,0xa3,0x5d,0xdc,0x7d,
|
||||||
|
0x7a,0x7b,0x9f,0x70,0xcd,0x66,0x5e,0x74,0xe0,0xb6,0x23,0x98,0x57,0xab,0xe2,0x9c,
|
||||||
|
0x8e,0x8d,0xa1,0x91,0x39,0x90,0x60,0x95,0x3c,0xc0,0x27,0x8b,0x8b,0xdd,0xe6,0x8f,
|
||||||
|
0x52,0xfb,0xa5,0x82,0xe5,0xe6,0x64,0x86,0x58,0x5b,0x2b,0xbe,0xef,0x46,0xea,0xba,
|
||||||
|
0x36,0x60,0xa9,0xb7,0x81,0x7d,0x68,0xb3,0x84,0x2d,0x2f,0xad,0x33,0x30,0xee,0xa9,
|
||||||
|
0xea,0x16,0xad,0xa4,0x5d,0x0b,0x6c,0xa0,0x90,0x6d,0x32,0xd4,0x27,0x70,0xf3,0xd0,
|
||||||
|
0xfe,0x56,0xb0,0xdd,0x49,0x4b,0x71,0xd9,0x4c,0x1b,0x36,0xc7,0xfb,0x06,0xf7,0xc3,
|
||||||
|
0x22,0x20,0xb4,0xce,0x95,0x3d,0x75,0xca,0x28,0x80,0x3a,0xf2,0x9f,0x9d,0xfb,0xf6,
|
||||||
|
0x46,0xbb,0xb8,0xfb,0xf1,0xa6,0x79,0xff,0xf4,0xf6,0x3e,0xe1,0x43,0xeb,0xff,0xe5,
|
||||||
|
0x9a,0xcd,0xbc,0xe8,0x2d,0xd0,0x7d,0xec,0x77,0x70,0x86,0x34,0xc0,0x6d,0x47,0x30,
|
||||||
|
0x19,0x4b,0x04,0x3d,0xae,0x56,0xc5,0x39,0xab,0x06,0x82,0x27,0x1c,0x1b,0x43,0x23,
|
||||||
|
0xc5,0x3d,0x00,0x2e,0x72,0x20,0xc1,0x2a,0xcf,0x9d,0x8e,0x12,0x78,0x80,0x4f,0x16,
|
||||||
|
0xa1,0xa6,0x0c,0x1b,0x16,0xbb,0xcd,0x1f,0x13,0xeb,0x8a,0x01,0xa4,0xf6,0x4b,0x05,
|
||||||
|
0x7d,0xd0,0x08,0x08,0xca,0xcd,0xc9,0x0c,0x07,0xab,0x97,0x78,0xb0,0xb6,0x56,0x7c,
|
||||||
|
0x69,0x90,0x15,0x71,0xde,0x8d,0xd4,0x75,0xdb,0xdd,0x93,0x6b,0x6c,0xc0,0x52,0x6f,
|
||||||
|
0xb5,0xe6,0x11,0x62,0x02,0xfb,0xd0,0x66,0xbf,0x46,0x9f,0x5e,0x08,0x5b,0x5e,0x5a,
|
||||||
|
0xd1,0x7d,0x1d,0x57,0x66,0x60,0xdc,0x53,0x63,0x30,0x9b,0x4d,0xd4,0x2d,0x5a,0x49,
|
||||||
|
0x0d,0x0b,0x19,0x44,0xba,0x16,0xd8,0x40,0x97,0xc6,0xa5,0xac,0x20,0xdb,0x64,0xa8,
|
||||||
|
0xf9,0xfd,0x27,0xa5,0x4e,0xe0,0xe6,0xa1,0x4b,0xb0,0xa1,0xbf,0xfc,0xad,0x60,0xbb,
|
||||||
|
0x25,0x8b,0x23,0xb6,0x92,0x96,0xe2,0xb2,0x2f,0x2b,0xad,0x8a,0x98,0x36,0x6c,0x8e,
|
||||||
|
0x41,0x10,0x2f,0x83,0xf6,0x0d,0xee,0x87,0xf3,0x5d,0xa9,0x99,0x44,0x40,0x68,0x9d,
|
||||||
|
0x9d,0x66,0x2b,0x90,0x2a,0x7b,0xea,0x94,0xe7,0x1d,0xb4,0xe0,0x50,0x00,0x75,0xe4,
|
||||||
|
0x89,0x26,0x36,0xe9,0x3e,0x3b,0xf7,0xed,0x3b,0x6b,0xb0,0xf3,0x8c,0x76,0x71,0xf7,
|
||||||
|
0x55,0x50,0x32,0xfa,0xe2,0x4d,0xf3,0xfe,0x5f,0xf0,0xbc,0xc6,0xe8,0xed,0x7d,0xc2,
|
||||||
|
0x31,0xcb,0x3e,0xcf,0x86,0xd6,0xff,0xcb,0x83,0x86,0xb8,0xd5,0x34,0x9b,0x79,0xd1,
|
||||||
|
0xed,0xbd,0x3a,0xdc,0x5a,0xa0,0xfb,0xd8,0xee,0xe0,0x0c,0x69,0x59,0xfd,0xcd,0x6d,
|
||||||
|
0x80,0xdb,0x8e,0x60,0x37,0xc6,0x4f,0x64,0x32,0x96,0x08,0x7a,0x85,0x8b,0xc9,0x7e,
|
||||||
|
0x5c,0xad,0x8a,0x73,0xeb,0xb0,0x4b,0x77,0x56,0x0d,0x04,0x4f,0xe1,0x10,0xc5,0x4b,
|
||||||
|
0x38,0x36,0x86,0x46,0x8f,0x2b,0x47,0x42,0x8a,0x7b,0x00,0x5c,0x3d,0x66,0xc1,0x58,
|
||||||
|
0xe4,0x40,0x82,0x55,0x53,0x5d,0x43,0x51,0x9e,0x3b,0x1d,0x25,0x29,0x26,0xdc,0x21,
|
||||||
|
0xf0,0x00,0x9f,0x2c,0x47,0x1d,0x5e,0x28,0x42,0x4d,0x19,0x36,0xf5,0x50,0xd8,0x32,
|
||||||
|
0x2c,0x76,0x9b,0x3f,0x9b,0x6b,0x5a,0x3b,0x26,0xd6,0x15,0x03,0x91,0xcb,0xd4,0x07,
|
||||||
|
0x48,0xed,0x97,0x0a,0xff,0xf0,0x56,0x0e,0xfa,0xa0,0x11,0x10,0x4d,0xbd,0xd0,0x14,
|
||||||
|
0x94,0x9b,0x93,0x19,0x23,0x86,0x52,0x1d,0x0e,0x56,0x2f,0xf1,0xb9,0x4b,0xee,0xf5,
|
||||||
|
0x60,0x6d,0xad,0xf8,0xd7,0x70,0x6c,0xfc,0xd2,0x20,0x2b,0xe2,0x65,0x3d,0xea,0xe6,
|
||||||
|
0xbc,0x1b,0xa9,0xeb,0x0b,0x06,0x68,0xef,0xb6,0xbb,0x27,0xd7,0x01,0xa6,0xe6,0xd3,
|
||||||
|
0xd8,0x80,0xa5,0xde,0x6f,0x9d,0x64,0xda,0x6a,0xcd,0x23,0xc4,0xdd,0xd0,0xe2,0xc0,
|
||||||
|
0x04,0xf6,0xa1,0xcd,0xb3,0xeb,0x60,0xc9,0x7e,0x8d,0x3e,0xbd,0xc9,0x90,0xff,0xb9,
|
||||||
|
0x10,0xb6,0xbc,0xb4,0xa7,0xab,0x7d,0xb0,0xa2,0xfb,0x3a,0xae,0x15,0xe6,0xfb,0xaa,
|
||||||
|
0xcc,0xc0,0xb8,0xa7,0x7b,0xdd,0x79,0xa3,0xc6,0x60,0x36,0x9b,0x71,0x7d,0xf7,0x9f,
|
||||||
|
0xa8,0x5b,0xb4,0x92,0x1f,0x46,0x75,0x96,0x1a,0x16,0x32,0x88,0xad,0x0b,0xf3,0x8c,
|
||||||
|
0x74,0x2d,0xb0,0x81,0xc3,0x30,0x71,0x85,0x99,0x90,0x8a,0x5d,0x2e,0x8d,0x4b,0x59,
|
||||||
|
0xf7,0xab,0x08,0x54,0x40,0xb6,0xc9,0x50,0x45,0xe6,0x8e,0x4e,0xf2,0xfb,0x4f,0x4a,
|
||||||
|
0x2b,0xdd,0x0c,0x47,0x9c,0xc0,0xcd,0x43,0x21,0x7d,0x82,0x7b,0x96,0x60,0x43,0x7f,
|
||||||
|
0x4f,0x46,0x00,0x72,0xf8,0x5b,0xc1,0x76,0xfd,0x0b,0x86,0x68,0x4a,0x16,0x47,0x6c,
|
||||||
|
0x93,0x30,0x04,0x61,0x24,0x2d,0xc5,0x65,0xe9,0x4b,0x9b,0x11,0x5e,0x56,0x5a,0x15,
|
||||||
|
0x87,0x70,0x19,0x18,0x30,0x6d,0xd8,0x1c,0x35,0x3d,0x9f,0x02,0x82,0x20,0x5e,0x06,
|
||||||
|
0x5b,0x06,0x1d,0x0b,0xec,0x1b,0xdc,0x0f,0x51,0xa6,0x93,0x37,0xe6,0xbb,0x52,0x33,
|
||||||
|
0x3f,0x9d,0x11,0x3e,0x88,0x80,0xd0,0x3a,0x8d,0xd0,0x97,0x24,0x3a,0xcd,0x56,0x20,
|
||||||
|
0xe3,0xeb,0x15,0x2d,0x54,0xf6,0xd4,0x29,0x79,0x26,0xa9,0xc5,0xce,0x3b,0x68,0xc1,
|
||||||
|
0x17,0x1d,0x2b,0xcc,0xa0,0x00,0xea,0xc8,0xa5,0x50,0xad,0xd6,0x12,0x4d,0x6c,0xd2,
|
||||||
|
0xcb,0x6b,0x2f,0xdf,0x7c,0x76,0xee,0xdb,0xc1,0xcb,0xa1,0xe3,0x76,0xd6,0x60,0xe7,
|
||||||
|
0xaf,0xf0,0x23,0xea,0x18,0xed,0xe2,0xee,0x1d,0xbd,0xa5,0xf0,0xaa,0xa0,0x64,0xf4,
|
||||||
|
0x73,0x86,0x27,0xf9,0xc4,0x9b,0xe6,0xfd,0x09,0xfd,0xb8,0x89,0xbe,0xe0,0x79,0x8d,
|
||||||
|
0x67,0xc6,0x3a,0x80,0xd0,0xdb,0xfb,0x84,0xd5,0x8b,0xbc,0x9a,0x62,0x96,0x7d,0x9e,
|
||||||
|
0xbb,0xb0,0x3e,0x93,0x0c,0xad,0xff,0x97,0xb1,0x10,0xb0,0xaf,0x06,0x0d,0x71,0xab,
|
||||||
|
0xdf,0x2b,0x32,0xa6,0x68,0x36,0xf3,0xa2,0x6d,0x66,0xb4,0xbc,0xda,0x7b,0x75,0xb8,
|
||||||
|
0x03,0x5d,0x36,0xb5,0xb4,0x40,0xf7,0xb1,
|
||||||
|
|
@ -0,0 +1,135 @@
|
||||||
|
/* Copied from https://github.com/gcc-mirror/gcc/blob/master/libiberty/crc32.c
|
||||||
|
* and then tweaked a little. */
|
||||||
|
|
||||||
|
/* This table was generated by the following program.
|
||||||
|
#include <stdio.h>
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
unsigned int i, j;
|
||||||
|
unsigned int c;
|
||||||
|
int table[256];
|
||||||
|
for (i = 0; i < 256; i++)
|
||||||
|
{
|
||||||
|
for (c = i << 24, j = 8; j > 0; --j)
|
||||||
|
c = c & 0x80000000 ? (c << 1) ^ 0x04c11db7 : (c << 1);
|
||||||
|
table[i] = c;
|
||||||
|
}
|
||||||
|
printf ("static const unsigned int crc32_table[] =\n{\n");
|
||||||
|
for (i = 0; i < 256; i += 4)
|
||||||
|
{
|
||||||
|
printf (" 0x%08x, 0x%08x, 0x%08x, 0x%08x",
|
||||||
|
table[i + 0], table[i + 1], table[i + 2], table[i + 3]);
|
||||||
|
if (i + 4 < 256)
|
||||||
|
putchar (',');
|
||||||
|
putchar ('\n');
|
||||||
|
}
|
||||||
|
printf ("};\n");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
For more information on CRC, see, e.g.,
|
||||||
|
http://www.ross.net/crc/download/crc_v3.txt. */
|
||||||
|
|
||||||
|
static const unsigned int crc32_table[] = {
|
||||||
|
0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9,
|
||||||
|
0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005,
|
||||||
|
0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
|
||||||
|
0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd,
|
||||||
|
0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9,
|
||||||
|
0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
|
||||||
|
0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011,
|
||||||
|
0x791d4014, 0x7ddc5da3, 0x709f7b7a, 0x745e66cd,
|
||||||
|
0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
|
||||||
|
0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5,
|
||||||
|
0xbe2b5b58, 0xbaea46ef, 0xb7a96036, 0xb3687d81,
|
||||||
|
0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
|
||||||
|
0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49,
|
||||||
|
0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95,
|
||||||
|
0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1,
|
||||||
|
0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d,
|
||||||
|
0x34867077, 0x30476dc0, 0x3d044b19, 0x39c556ae,
|
||||||
|
0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
|
||||||
|
0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16,
|
||||||
|
0x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca,
|
||||||
|
0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde,
|
||||||
|
0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02,
|
||||||
|
0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1, 0x53dc6066,
|
||||||
|
0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
|
||||||
|
0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e,
|
||||||
|
0xbfa1b04b, 0xbb60adfc, 0xb6238b25, 0xb2e29692,
|
||||||
|
0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6,
|
||||||
|
0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a,
|
||||||
|
0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e,
|
||||||
|
0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
|
||||||
|
0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686,
|
||||||
|
0xd5b88683, 0xd1799b34, 0xdc3abded, 0xd8fba05a,
|
||||||
|
0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637,
|
||||||
|
0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb,
|
||||||
|
0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f,
|
||||||
|
0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
|
||||||
|
0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47,
|
||||||
|
0x36194d42, 0x32d850f5, 0x3f9b762c, 0x3b5a6b9b,
|
||||||
|
0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
|
||||||
|
0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623,
|
||||||
|
0xf12f560e, 0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7,
|
||||||
|
0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
|
||||||
|
0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f,
|
||||||
|
0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3,
|
||||||
|
0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7,
|
||||||
|
0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b,
|
||||||
|
0x9b3660c6, 0x9ff77d71, 0x92b45ba8, 0x9675461f,
|
||||||
|
0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
|
||||||
|
0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640,
|
||||||
|
0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c,
|
||||||
|
0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8,
|
||||||
|
0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24,
|
||||||
|
0x119b4be9, 0x155a565e, 0x18197087, 0x1cd86d30,
|
||||||
|
0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
|
||||||
|
0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088,
|
||||||
|
0x2497d08d, 0x2056cd3a, 0x2d15ebe3, 0x29d4f654,
|
||||||
|
0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0,
|
||||||
|
0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c,
|
||||||
|
0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18,
|
||||||
|
0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
|
||||||
|
0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0,
|
||||||
|
0x9abc8bd5, 0x9e7d9662, 0x933eb0bb, 0x97ffad0c,
|
||||||
|
0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
|
||||||
|
0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
@deftypefn Extension {unsigned int} crc32 (const unsigned char *@var{buf}, @
|
||||||
|
int @var{len}, unsigned int @var{init})
|
||||||
|
Compute the 32-bit CRC of @var{buf} which has length @var{len}. The
|
||||||
|
starting value is 0xffffffff.
|
||||||
|
This is used by the @command{gdb} remote protocol for the @samp{qCRC}
|
||||||
|
command.
|
||||||
|
This CRC can be specified as:
|
||||||
|
Width : 32
|
||||||
|
Poly : 0x04c11db7
|
||||||
|
Init : 0xffffffff
|
||||||
|
RefIn : false
|
||||||
|
RefOut : false
|
||||||
|
XorOut : 0
|
||||||
|
This differs from the "standard" CRC-32 algorithm in that the values
|
||||||
|
are not reflected, and there is no final XOR value. These differences
|
||||||
|
make it easy to compose the values of multiple blocks.
|
||||||
|
@end deftypefn
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
unsigned int
|
||||||
|
xcrc32(const unsigned char *buf, int len)
|
||||||
|
{
|
||||||
|
uint32_t crc = 0xffffffff;
|
||||||
|
while (len--) {
|
||||||
|
crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ *buf) & 255];
|
||||||
|
buf++;
|
||||||
|
}
|
||||||
|
asm("mv a0, %0;"
|
||||||
|
"ebreak;"
|
||||||
|
:
|
||||||
|
: "r"(crc));
|
||||||
|
return crc;
|
||||||
|
}
|
||||||
|
|
@ -1071,7 +1071,7 @@ int image_calculate_checksum(uint8_t *buffer, uint32_t nbytes, uint32_t *checksu
|
||||||
keep_alive();
|
keep_alive();
|
||||||
}
|
}
|
||||||
|
|
||||||
LOG_DEBUG("Calculating checksum done");
|
LOG_DEBUG("Calculating checksum done; checksum=0x%x", crc);
|
||||||
|
|
||||||
*checksum = crc;
|
*checksum = crc;
|
||||||
return ERROR_OK;
|
return ERROR_OK;
|
||||||
|
|
|
||||||
|
|
@ -92,11 +92,7 @@ size_t riscv_batch_add_dmi_read(struct riscv_batch *batch, unsigned address)
|
||||||
batch->last_scan = RISCV_SCAN_TYPE_READ;
|
batch->last_scan = RISCV_SCAN_TYPE_READ;
|
||||||
batch->used_scans++;
|
batch->used_scans++;
|
||||||
|
|
||||||
/* FIXME We get the read response back on the next scan. For now I'm
|
batch->read_keys[batch->read_keys_used] = batch->used_scans;
|
||||||
* just sticking a NOP in there, but this should be coalesced away. */
|
|
||||||
riscv_batch_add_nop(batch);
|
|
||||||
|
|
||||||
batch->read_keys[batch->read_keys_used] = batch->used_scans - 1;
|
|
||||||
return batch->read_keys_used++;
|
return batch->read_keys_used++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -159,6 +159,10 @@ typedef struct {
|
||||||
/* The currently selected hartid on this DM. */
|
/* The currently selected hartid on this DM. */
|
||||||
int current_hartid;
|
int current_hartid;
|
||||||
bool hasel_supported;
|
bool hasel_supported;
|
||||||
|
|
||||||
|
/* The program buffer stores executable code. 0 is an illegal instruction,
|
||||||
|
* so we use 0 to mean the cached value is invalid. */
|
||||||
|
uint32_t progbuf_cache[16];
|
||||||
} dm013_info_t;
|
} dm013_info_t;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
|
@ -1814,6 +1818,13 @@ static int assert_reset(struct target *target)
|
||||||
|
|
||||||
target->state = TARGET_RESET;
|
target->state = TARGET_RESET;
|
||||||
|
|
||||||
|
dm013_info_t *dm = get_dm(target);
|
||||||
|
|
||||||
|
/* The DM might have gotten reset if OpenOCD called us in some reset that
|
||||||
|
* involves SRST being toggled. So clear our cache which may be out of
|
||||||
|
* date. */
|
||||||
|
memset(dm->progbuf_cache, 0, sizeof(dm->progbuf_cache));
|
||||||
|
|
||||||
return ERROR_OK;
|
return ERROR_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -3223,7 +3234,15 @@ static enum riscv_halt_reason riscv013_halt_reason(struct target *target)
|
||||||
|
|
||||||
int riscv013_write_debug_buffer(struct target *target, unsigned index, riscv_insn_t data)
|
int riscv013_write_debug_buffer(struct target *target, unsigned index, riscv_insn_t data)
|
||||||
{
|
{
|
||||||
return dmi_write(target, DMI_PROGBUF0 + index, data);
|
dm013_info_t *dm = get_dm(target);
|
||||||
|
if (dm->progbuf_cache[index] != data) {
|
||||||
|
if (dmi_write(target, DMI_PROGBUF0 + index, data) != ERROR_OK)
|
||||||
|
return ERROR_FAIL;
|
||||||
|
dm->progbuf_cache[index] = data;
|
||||||
|
} else {
|
||||||
|
LOG_DEBUG("cache hit for 0x%x @%d", data, index);
|
||||||
|
}
|
||||||
|
return ERROR_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
riscv_insn_t riscv013_read_debug_buffer(struct target *target, unsigned index)
|
riscv_insn_t riscv013_read_debug_buffer(struct target *target, unsigned index)
|
||||||
|
|
|
||||||
|
|
@ -1414,9 +1414,6 @@ static int riscv_run_algorithm(struct target *target, int num_mem_params,
|
||||||
|
|
||||||
uint64_t saved_regs[32];
|
uint64_t saved_regs[32];
|
||||||
for (int i = 0; i < num_reg_params; i++) {
|
for (int i = 0; i < num_reg_params; i++) {
|
||||||
if (reg_params[i].direction == PARAM_IN)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
LOG_DEBUG("save %s", reg_params[i].reg_name);
|
LOG_DEBUG("save %s", reg_params[i].reg_name);
|
||||||
struct reg *r = register_get_by_name(target->reg_cache, reg_params[i].reg_name, 0);
|
struct reg *r = register_get_by_name(target->reg_cache, reg_params[i].reg_name, 0);
|
||||||
if (!r) {
|
if (!r) {
|
||||||
|
|
@ -1438,8 +1435,11 @@ static int riscv_run_algorithm(struct target *target, int num_mem_params,
|
||||||
if (r->type->get(r) != ERROR_OK)
|
if (r->type->get(r) != ERROR_OK)
|
||||||
return ERROR_FAIL;
|
return ERROR_FAIL;
|
||||||
saved_regs[r->number] = buf_get_u64(r->value, 0, r->size);
|
saved_regs[r->number] = buf_get_u64(r->value, 0, r->size);
|
||||||
if (r->type->set(r, reg_params[i].value) != ERROR_OK)
|
|
||||||
return ERROR_FAIL;
|
if (reg_params[i].direction == PARAM_OUT || reg_params[i].direction == PARAM_IN_OUT) {
|
||||||
|
if (r->type->set(r, reg_params[i].value) != ERROR_OK)
|
||||||
|
return ERROR_FAIL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1489,7 +1489,7 @@ static int riscv_run_algorithm(struct target *target, int num_mem_params,
|
||||||
if (reg_pc->type->get(reg_pc) != ERROR_OK)
|
if (reg_pc->type->get(reg_pc) != ERROR_OK)
|
||||||
return ERROR_FAIL;
|
return ERROR_FAIL;
|
||||||
uint64_t final_pc = buf_get_u64(reg_pc->value, 0, reg_pc->size);
|
uint64_t final_pc = buf_get_u64(reg_pc->value, 0, reg_pc->size);
|
||||||
if (final_pc != exit_point) {
|
if (exit_point && final_pc != exit_point) {
|
||||||
LOG_ERROR("PC ended up at 0x%" PRIx64 " instead of 0x%"
|
LOG_ERROR("PC ended up at 0x%" PRIx64 " instead of 0x%"
|
||||||
TARGET_PRIxADDR, final_pc, exit_point);
|
TARGET_PRIxADDR, final_pc, exit_point);
|
||||||
return ERROR_FAIL;
|
return ERROR_FAIL;
|
||||||
|
|
@ -1507,6 +1507,13 @@ static int riscv_run_algorithm(struct target *target, int num_mem_params,
|
||||||
return ERROR_FAIL;
|
return ERROR_FAIL;
|
||||||
|
|
||||||
for (int i = 0; i < num_reg_params; i++) {
|
for (int i = 0; i < num_reg_params; i++) {
|
||||||
|
if (reg_params[i].direction == PARAM_IN ||
|
||||||
|
reg_params[i].direction == PARAM_IN_OUT) {
|
||||||
|
struct reg *r = register_get_by_name(target->reg_cache, reg_params[i].reg_name, 0);
|
||||||
|
if (r->type->get(r) != ERROR_OK)
|
||||||
|
return ERROR_FAIL;
|
||||||
|
buf_cpy(r->value, reg_params[i].value, reg_params[i].size);
|
||||||
|
}
|
||||||
LOG_DEBUG("restore %s", reg_params[i].reg_name);
|
LOG_DEBUG("restore %s", reg_params[i].reg_name);
|
||||||
struct reg *r = register_get_by_name(target->reg_cache, reg_params[i].reg_name, 0);
|
struct reg *r = register_get_by_name(target->reg_cache, reg_params[i].reg_name, 0);
|
||||||
buf_set_u64(buf, 0, info->xlen[0], saved_regs[r->number]);
|
buf_set_u64(buf, 0, info->xlen[0], saved_regs[r->number]);
|
||||||
|
|
@ -1525,8 +1532,86 @@ static int riscv_checksum_memory(struct target *target,
|
||||||
target_addr_t address, uint32_t count,
|
target_addr_t address, uint32_t count,
|
||||||
uint32_t *checksum)
|
uint32_t *checksum)
|
||||||
{
|
{
|
||||||
*checksum = 0xFFFFFFFF;
|
struct working_area *crc_algorithm;
|
||||||
return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
|
struct reg_param reg_params[2];
|
||||||
|
int retval;
|
||||||
|
|
||||||
|
LOG_DEBUG("address=0x%" TARGET_PRIxADDR "; count=0x%x", address, count);
|
||||||
|
|
||||||
|
static const uint8_t riscv32_crc_code[] = {
|
||||||
|
#include "../../contrib/loaders/checksum/riscv32_crc.inc"
|
||||||
|
};
|
||||||
|
static const uint8_t riscv64_crc_code[] = {
|
||||||
|
#include "../../contrib/loaders/checksum/riscv64_crc.inc"
|
||||||
|
};
|
||||||
|
|
||||||
|
static const uint8_t *crc_code;
|
||||||
|
|
||||||
|
int xlen = riscv_xlen(target);
|
||||||
|
unsigned crc_code_size;
|
||||||
|
if (xlen == 32) {
|
||||||
|
crc_code = riscv32_crc_code;
|
||||||
|
crc_code_size = sizeof(riscv32_crc_code);
|
||||||
|
} else {
|
||||||
|
crc_code = riscv64_crc_code;
|
||||||
|
crc_code_size = sizeof(riscv64_crc_code);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (count < crc_code_size * 4) {
|
||||||
|
/* Don't use the algorithm for relatively small buffers. It's faster
|
||||||
|
* just to read the memory. target_checksum_memory() will take care of
|
||||||
|
* that if we fail. */
|
||||||
|
return ERROR_FAIL;
|
||||||
|
}
|
||||||
|
|
||||||
|
retval = target_alloc_working_area(target, crc_code_size, &crc_algorithm);
|
||||||
|
if (retval != ERROR_OK)
|
||||||
|
return retval;
|
||||||
|
|
||||||
|
if (crc_algorithm->address + crc_algorithm->size > address &&
|
||||||
|
crc_algorithm->address < address + count) {
|
||||||
|
/* Region to checksum overlaps with the work area we've been assigned.
|
||||||
|
* Bail. (Would be better to manually checksum what we read there, and
|
||||||
|
* use the algorithm for the rest.) */
|
||||||
|
target_free_working_area(target, crc_algorithm);
|
||||||
|
return ERROR_FAIL;
|
||||||
|
}
|
||||||
|
|
||||||
|
retval = target_write_buffer(target, crc_algorithm->address, crc_code_size,
|
||||||
|
crc_code);
|
||||||
|
if (retval != ERROR_OK) {
|
||||||
|
LOG_ERROR("Failed to write code to " TARGET_ADDR_FMT ": %d",
|
||||||
|
crc_algorithm->address, retval);
|
||||||
|
target_free_working_area(target, crc_algorithm);
|
||||||
|
return retval;
|
||||||
|
}
|
||||||
|
|
||||||
|
init_reg_param(®_params[0], "a0", xlen, PARAM_IN_OUT);
|
||||||
|
init_reg_param(®_params[1], "a1", xlen, PARAM_OUT);
|
||||||
|
buf_set_u64(reg_params[0].value, 0, xlen, address);
|
||||||
|
buf_set_u64(reg_params[1].value, 0, xlen, count);
|
||||||
|
|
||||||
|
/* 20 second timeout/megabyte */
|
||||||
|
int timeout = 20000 * (1 + (count / (1024 * 1024)));
|
||||||
|
|
||||||
|
retval = target_run_algorithm(target, 0, NULL, 2, reg_params,
|
||||||
|
crc_algorithm->address,
|
||||||
|
0, /* Leave exit point unspecified because we don't know. */
|
||||||
|
timeout, NULL);
|
||||||
|
|
||||||
|
if (retval == ERROR_OK)
|
||||||
|
*checksum = buf_get_u32(reg_params[0].value, 0, 32);
|
||||||
|
else
|
||||||
|
LOG_ERROR("error executing RISC-V CRC algorithm");
|
||||||
|
|
||||||
|
destroy_reg_param(®_params[0]);
|
||||||
|
destroy_reg_param(®_params[1]);
|
||||||
|
|
||||||
|
target_free_working_area(target, crc_algorithm);
|
||||||
|
|
||||||
|
LOG_DEBUG("checksum=0x%x, result=%d", *checksum, retval);
|
||||||
|
|
||||||
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*** OpenOCD Helper Functions ***/
|
/*** OpenOCD Helper Functions ***/
|
||||||
|
|
|
||||||
|
|
@ -796,7 +796,7 @@ static int target_soft_reset_halt(struct target *target)
|
||||||
int target_run_algorithm(struct target *target,
|
int target_run_algorithm(struct target *target,
|
||||||
int num_mem_params, struct mem_param *mem_params,
|
int num_mem_params, struct mem_param *mem_params,
|
||||||
int num_reg_params, struct reg_param *reg_param,
|
int num_reg_params, struct reg_param *reg_param,
|
||||||
uint32_t entry_point, uint32_t exit_point,
|
target_addr_t entry_point, target_addr_t exit_point,
|
||||||
int timeout_ms, void *arch_info)
|
int timeout_ms, void *arch_info)
|
||||||
{
|
{
|
||||||
int retval = ERROR_FAIL;
|
int retval = ERROR_FAIL;
|
||||||
|
|
|
||||||
|
|
@ -533,7 +533,7 @@ int target_step(struct target *target,
|
||||||
int target_run_algorithm(struct target *target,
|
int target_run_algorithm(struct target *target,
|
||||||
int num_mem_params, struct mem_param *mem_params,
|
int num_mem_params, struct mem_param *mem_params,
|
||||||
int num_reg_params, struct reg_param *reg_param,
|
int num_reg_params, struct reg_param *reg_param,
|
||||||
uint32_t entry_point, uint32_t exit_point,
|
target_addr_t entry_point, target_addr_t exit_point,
|
||||||
int timeout_ms, void *arch_info);
|
int timeout_ms, void *arch_info);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue