diff options
author | Max Filippov <jcmvbkbc@gmail.com> | 2017-01-29 03:50:25 -0800 |
---|---|---|
committer | Max Filippov <jcmvbkbc@gmail.com> | 2018-01-09 09:55:39 -0800 |
commit | 13f6a7cd3a736b40e14b28d7e4df45ec9333f155 (patch) | |
tree | c6aef36b2a03812bc65d28b50cfd8944a5f0f158 | |
parent | 5b9b27639e4af3e957da1959ad51f94e53c2e6f1 (diff) |
target/xtensa: add internal/noop SRs and opcodes
Add two special registers: MMID and DDR:
- MMID is write-only and the only side effect of writing to it is output
to the trace port, which is not emulated;
- DDR is only accessible in debug mode, which is not emulated.
Add two debug-mode-only opcodes:
- rfdd and rfdo do return from the debug mode, which is not emulated.
Add three internal opcodes for full MMU:
- hwwdtlba and hwwitlba are the internal opcodes that write a value into
autoupdate DTLB or ITLB entry.
- ldpte is internal opcode that loads PTE entry that covers the most
recent page fault address.
None of these three opcodes may appear in a valid instruction.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
-rw-r--r-- | target/xtensa/cpu.h | 2 | ||||
-rw-r--r-- | target/xtensa/translate.c | 33 |
2 files changed, 35 insertions, 0 deletions
diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index e93bbb3c6d..80e9b47e84 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -127,6 +127,7 @@ enum { WINDOW_BASE = 72, WINDOW_START = 73, PTEVADDR = 83, + MMID = 89, RASID = 90, ITLBCFG = 91, DTLBCFG = 92, @@ -134,6 +135,7 @@ enum { MEMCTL = 97, CACHEATTR = 98, ATOMCTL = 99, + DDR = 104, IBREAKA = 128, DBREAKA = 144, DBREAKC = 160, diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c index 27078e9f5b..3e8a0015b3 100644 --- a/target/xtensa/translate.c +++ b/target/xtensa/translate.c @@ -135,6 +135,7 @@ static const XtensaReg sregnames[256] = { [WINDOW_START] = XTENSA_REG("WINDOW_START", XTENSA_OPTION_WINDOWED_REGISTER), [PTEVADDR] = XTENSA_REG("PTEVADDR", XTENSA_OPTION_MMU), + [MMID] = XTENSA_REG_BITS("MMID", XTENSA_OPTION_ALL), [RASID] = XTENSA_REG("RASID", XTENSA_OPTION_MMU), [ITLBCFG] = XTENSA_REG("ITLBCFG", XTENSA_OPTION_MMU), [DTLBCFG] = XTENSA_REG("DTLBCFG", XTENSA_OPTION_MMU), @@ -142,6 +143,7 @@ static const XtensaReg sregnames[256] = { [MEMCTL] = XTENSA_REG_BITS("MEMCTL", XTENSA_OPTION_ALL), [CACHEATTR] = XTENSA_REG("CACHEATTR", XTENSA_OPTION_CACHEATTR), [ATOMCTL] = XTENSA_REG("ATOMCTL", XTENSA_OPTION_ATOMCTL), + [DDR] = XTENSA_REG("DDR", XTENSA_OPTION_DEBUG), [IBREAKA] = XTENSA_REG("IBREAKA0", XTENSA_OPTION_DEBUG), [IBREAKA + 1] = XTENSA_REG("IBREAKA1", XTENSA_OPTION_DEBUG), [DBREAKA] = XTENSA_REG("DBREAKA0", XTENSA_OPTION_DEBUG), @@ -2762,6 +2764,12 @@ static const XtensaOpcodeOps core_ops[] = { .name = "extw", .translate = translate_nop, }, { + .name = "hwwdtlba", + .translate = translate_ill, + }, { + .name = "hwwitlba", + .translate = translate_ill, + }, { .name = "idtlb", .translate = translate_itlb, .par = (const uint32_t[]){true}, @@ -2847,6 +2855,9 @@ static const XtensaOpcodeOps core_ops[] = { .translate = translate_mac16, .par = (const uint32_t[]){MAC16_NONE, 0, 0, 4}, }, { + .name = "ldpte", + .translate = translate_ill, + }, { .name = "loop", .translate = translate_loop, .par = (const uint32_t[]){TCG_COND_NEVER}, @@ -3265,9 +3276,15 @@ static const XtensaOpcodeOps core_ops[] = { .name = "retw.n", .translate = translate_retw, }, { + .name = "rfdd", + .translate = translate_ill, + }, { .name = "rfde", .translate = translate_rfde, }, { + .name = "rfdo", + .translate = translate_ill, + }, { .name = "rfe", .translate = translate_rfe, }, { @@ -3368,6 +3385,10 @@ static const XtensaOpcodeOps core_ops[] = { .translate = translate_rsr, .par = (const uint32_t[]){DBREAKC + 1}, }, { + .name = "rsr.ddr", + .translate = translate_rsr, + .par = (const uint32_t[]){DDR}, + }, { .name = "rsr.debugcause", .translate = translate_rsr, .par = (const uint32_t[]){DEBUGCAUSE}, @@ -3803,6 +3824,10 @@ static const XtensaOpcodeOps core_ops[] = { .translate = translate_wsr, .par = (const uint32_t[]){DBREAKC + 1}, }, { + .name = "wsr.ddr", + .translate = translate_wsr, + .par = (const uint32_t[]){DDR}, + }, { .name = "wsr.debugcause", .translate = translate_wsr, .par = (const uint32_t[]){DEBUGCAUSE}, @@ -3995,6 +4020,10 @@ static const XtensaOpcodeOps core_ops[] = { .translate = translate_wsr, .par = (const uint32_t[]){MISC + 3}, }, { + .name = "wsr.mmid", + .translate = translate_wsr, + .par = (const uint32_t[]){MMID}, + }, { .name = "wsr.prid", .translate = translate_wsr, .par = (const uint32_t[]){PRID}, @@ -4122,6 +4151,10 @@ static const XtensaOpcodeOps core_ops[] = { .translate = translate_xsr, .par = (const uint32_t[]){DBREAKC + 1}, }, { + .name = "xsr.ddr", + .translate = translate_xsr, + .par = (const uint32_t[]){DDR}, + }, { .name = "xsr.debugcause", .translate = translate_xsr, .par = (const uint32_t[]){DEBUGCAUSE}, |