alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-21 06:56:11 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

riscv: remove outdated macros

Browse Source
This commit is contained in:
Alexey Lapshin 2023-04-20 01:37:44 +08:00 committed by wuzhenghui
parent b6b8b0bd1f
commit ff3ca9300a
No known key found for this signature in database
GPG Key ID: 3EFEDECDEBA39BB9
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/riscv/include/riscv/csr.h
View File

@ -140,10 +140,6 @@ extern "C" {
Trigger Module register fields (Debug specification) Trigger Module register fields (Debug specification)
********************************************************/ ********************************************************/
/* tcontrol CSRs not recognized by toolchain currently */
#define CSR_TCONTROL 0x7a5
#define CSR_TDATA1 0x7a1
#define TCONTROL_MTE (1<<3) /*R/W, Current M mode trigger enable bit*/ #define TCONTROL_MTE (1<<3) /*R/W, Current M mode trigger enable bit*/
#define TCONTROL_MPTE (1<<7) /*R/W, Previous M mode trigger enable bit*/ #define TCONTROL_MPTE (1<<7) /*R/W, Previous M mode trigger enable bit*/

10
components/riscv/include/riscv/rv_utils.h
View File

@ -132,8 +132,8 @@ FORCE_INLINE_ATTR void rv_utils_set_breakpoint(int bp_num, uint32_t bp_addr)
/* The code bellow sets breakpoint which will trigger `Breakpoint` exception /* The code bellow sets breakpoint which will trigger `Breakpoint` exception
* instead transfering control to debugger. */ * instead transfering control to debugger. */
RV_WRITE_CSR(tselect, bp_num); RV_WRITE_CSR(tselect, bp_num);
RV_WRITE_CSR(CSR_TCONTROL, TCONTROL_MPTE | TCONTROL_MTE); RV_WRITE_CSR(tcontrol, TCONTROL_MPTE | TCONTROL_MTE);
RV_WRITE_CSR(CSR_TDATA1, TDATA1_USER | TDATA1_MACHINE | TDATA1_EXECUTE); RV_WRITE_CSR(tdata1, TDATA1_USER | TDATA1_MACHINE | TDATA1_EXECUTE);
RV_WRITE_CSR(tdata2, bp_addr); RV_WRITE_CSR(tdata2, bp_addr);
} }
@ -144,8 +144,8 @@ FORCE_INLINE_ATTR void rv_utils_set_watchpoint(int wp_num,
bool on_write) bool on_write)
{ {
RV_WRITE_CSR(tselect, wp_num); RV_WRITE_CSR(tselect, wp_num);
RV_WRITE_CSR(CSR_TCONTROL, TCONTROL_MPTE | TCONTROL_MTE); RV_WRITE_CSR(tcontrol, TCONTROL_MPTE | TCONTROL_MTE);
RV_WRITE_CSR(CSR_TDATA1, TDATA1_USER | RV_WRITE_CSR(tdata1, TDATA1_USER |
TDATA1_MACHINE | TDATA1_MACHINE |
TDATA1_MATCH | TDATA1_MATCH |
(on_read ? TDATA1_LOAD : 0) | (on_read ? TDATA1_LOAD : 0) |
@ -179,7 +179,7 @@ FORCE_INLINE_ATTR void rv_utils_clear_breakpoint(int bp_num)
/* tdata1 is a WARL(write any read legal) register /* tdata1 is a WARL(write any read legal) register
* We can just write 0 to it * We can just write 0 to it
*/ */
RV_WRITE_CSR(CSR_TDATA1, 0); RV_WRITE_CSR(tdata1, 0);
} }
FORCE_INLINE_ATTR void rv_utils_clear_watchpoint(int wp_num) FORCE_INLINE_ATTR void rv_utils_clear_watchpoint(int wp_num)