mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/cacheflush: Fix error generated by clang

Browse Source 
When compiling qemu-fuzz-i386 on aarch64 host, clang reported the following
error:

../util/cacheflush.c:38:44: error: value size does not match register size
specified by the constraint and modifier [-Werror,-Wasm-operand-widths]
    asm volatile("mrs\t%0, ctr_el0" : "=r"(save_ctr_el0));
                                           ^
../util/cacheflush.c:38:24: note: use constraint modifier "w"
    asm volatile("mrs\t%0, ctr_el0" : "=r"(save_ctr_el0));
                       ^~
                       %w0

Modify the type of save_ctr_el0 to uint64_t to fix it.

Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Gan Qixin <ganqixin@huawei.com>
Message-Id: <20210115075656.717957-1-ganqixin@huawei.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Gan Qixin 2021-01-15 15:56:56 +08:00 committed by Paolo Bonzini
parent 23a77b2d18
commit acd15fc2e8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util/cacheflush.c
View File

@ -32,7 +32,7 @@ void flush_idcache_range(uintptr_t rx, uintptr_t rw, size_t len)
* We want to save the whole contents of CTR_EL0, so that we * We want to save the whole contents of CTR_EL0, so that we
* have more than the linesize, but also IDC and DIC. * have more than the linesize, but also IDC and DIC.
*/ */
static unsigned int save_ctr_el0; static uint64_t save_ctr_el0;
static void __attribute__((constructor)) init_ctr_el0(void) static void __attribute__((constructor)) init_ctr_el0(void)
{ {
asm volatile("mrs\t%0, ctr_el0" : "=r"(save_ctr_el0)); asm volatile("mrs\t%0, ctr_el0" : "=r"(save_ctr_el0));
@ -46,9 +46,9 @@ void flush_idcache_range(uintptr_t rx, uintptr_t rw, size_t len)
{ {
const unsigned CTR_IDC = 1u << 28; const unsigned CTR_IDC = 1u << 28;
const unsigned CTR_DIC = 1u << 29; const unsigned CTR_DIC = 1u << 29;
const unsigned int ctr_el0 = save_ctr_el0; const uint64_t ctr_el0 = save_ctr_el0;
const uintptr_t icache_lsize = 4 << extract32(ctr_el0, 0, 4); const uintptr_t icache_lsize = 4 << extract64(ctr_el0, 0, 4);
const uintptr_t dcache_lsize = 4 << extract32(ctr_el0, 16, 4); const uintptr_t dcache_lsize = 4 << extract64(ctr_el0, 16, 4);
uintptr_t p; uintptr_t p;
/* /*