OSDN Git Service
(root)
/
qmiga
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5c5a47f
)
target/riscv: cpu_helper: Remove compile time XLEN checks
author
Alistair Francis
<alistair.francis@wdc.com>
Wed, 16 Dec 2020 18:22:59 +0000
(10:22 -0800)
committer
Alistair Francis
<alistair.francis@wdc.com>
Fri, 18 Dec 2020 05:56:44 +0000
(21:56 -0800)
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com>
Acked-by: Palmer Dabbelt <palmerdabbelt@google.com>
Reviewed-by: Bin Meng <bin.meng@windriver.com>
Tested-by: Bin Meng <bin.meng@windriver.com>
Message-id:
872d2dfcd1c7c3914655d677e911b9432eb8f340
.
1608142916
.git.alistair.francis@wdc.com
target/riscv/cpu_helper.c
patch
|
blob
|
history
diff --git
a/target/riscv/cpu_helper.c
b/target/riscv/cpu_helper.c
index
7274f97
..
a2afb95
100644
(file)
--- a/
target/riscv/cpu_helper.c
+++ b/
target/riscv/cpu_helper.c
@@
-447,11
+447,13
@@
restart:
return TRANSLATE_PMP_FAIL;
}
-#if defined(TARGET_RISCV32)
- target_ulong pte = address_space_ldl(cs->as, pte_addr, attrs, &res);
-#elif defined(TARGET_RISCV64)
- target_ulong pte = address_space_ldq(cs->as, pte_addr, attrs, &res);
-#endif
+ target_ulong pte;
+ if (riscv_cpu_is_32bit(env)) {
+ pte = address_space_ldl(cs->as, pte_addr, attrs, &res);
+ } else {
+ pte = address_space_ldq(cs->as, pte_addr, attrs, &res);
+ }
+
if (res != MEMTX_OK) {
return TRANSLATE_FAIL;
}