| Message ID | 20191025142159.12459-1-richard.henderson@linaro.org |
|---|---|
| Headers | show |
| Series | tcg patch queue | expand |
On Fri, 25 Oct 2019 at 15:22, Richard Henderson <richard.henderson@linaro.org> wrote: > > The following changes since commit bad76ac319556dab2497429d473b49a237672e1c: > > Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging (2019-10-25 14:17:08 +0100) > > are available in the Git repository at: > > https://github.com/rth7680/qemu.git tags/pull-tcg-20191025 > > for you to fetch changes up to 0ed1bfb046b740b70eed2cf3581e01768703b185: > > translate-all: Remove tb_alloc (2019-10-25 10:15:25 -0400) > > ---------------------------------------------------------------- > Improvements for TARGET_PAGE_BITS_VARY > Fix for TCI ld16u_i64. > Fix for segv on icount execute from i/o memory. > Two misc cleanups. > > ---------------------------------------------------------------- Compile failure, win32: In file included from /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/lib/glib-2.0/include/glibconfig.h:9:0, from /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/glib-2.0/glib/gtypes.h:32, from /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/glib-2.0/glib/galloca.h:32, from /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/glib-2.0/glib.h:30, from /home/petmay01/qemu-for-merges/include/glib-compat.h:32, from /home/petmay01/qemu-for-merges/include/qemu/osdep.h:140, from /home/petmay01/qemu-for-merges/exec.c:20: /home/petmay01/qemu-for-merges/include/exec/cpu-all.h: In function 'tlb_hit_page': /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/glib-2.0/glib/gmacros.h:337:23: error: expected expression befor e 'do' #define G_STMT_START do ^ /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/glib-2.0/glib/gtestutils.h:115:41: note: in expansion of macro 'G_STMT_START' #define g_assert(expr) G_STMT_START { \ ^ /home/petmay01/qemu-for-merges/include/qemu/osdep.h:152:20: note: in expansion of macro 'g_assert' #define assert(x) g_assert(x) ^ /home/petmay01/qemu-for-merges/include/exec/cpu-all.h:225:29: note: in expansion of macro 'assert' # define TARGET_PAGE_MASK (assert(target_page.decided), target_page.mask) ^ /home/petmay01/qemu-for-merges/include/exec/cpu-all.h:372:33: note: in expansion of macro 'TARGET_PAGE_MASK' return addr == (tlb_addr & (TARGET_PAGE_MASK | TLB_INVALID_MASK)); ^ (repeated in all the other places TARGET_PAGE_MASK is used; similar for TARGET_PAGE_BITS.) Also /home/petmay01/qemu-for-merges/exec.c: In function 'iotlb_to_section': /home/petmay01/qemu-for-merges/exec.c:2871:1: error: control reaches end of non-void function [-Werror=return-type] } ^ /home/petmay01/qemu-for-merges/exec.c: In function 'qemu_target_page_size': /home/petmay01/qemu-for-merges/exec.c:3791:1: error: control reaches end of non-void function [-Werror=return-type] } ^ /home/petmay01/qemu-for-merges/exec.c: In function 'qemu_target_page_bits': /home/petmay01/qemu-for-merges/exec.c:3796:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors /home/petmay01/qemu-for-merges/exec.c: In function 'last_ram_page': /home/petmay01/qemu-for-merges/exec.c:1977:1: error: control reaches end of non-void function [-Werror=return-type] } ^ /home/petmay01/qemu-for-merges/exec.c: In function 'iotlb_to_section': /home/petmay01/qemu-for-merges/exec.c:2871:1: error: control reaches end of non-void function [-Werror=return-type] } ^ Not sure if that's just follow-on errors from the earlier ones, though. thanks -- PMM
On 10/25/19 12:12 PM, Peter Maydell wrote: > Compile failure, win32: ... > /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/glib-2.0/glib/gmacros.h:337:23: > error: expected expression befor > e 'do' > #define G_STMT_START do > ^ > /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/glib-2.0/glib/gtestutils.h:115:41: > note: in expansion of macro 'G_STMT_START' > #define g_assert(expr) G_STMT_START { \ > ^ > /home/petmay01/qemu-for-merges/include/qemu/osdep.h:152:20: note: in > expansion of macro 'g_assert' > #define assert(x) g_assert(x) Ho hum. This... > ^ > /home/petmay01/qemu-for-merges/include/exec/cpu-all.h:225:29: note: in > expansion of macro 'assert' > # define TARGET_PAGE_MASK (assert(target_page.decided), target_page.mask) ... must be the reason why we used to use ({ ... }) here. Why oh why does g_assert use a do/while(0) statement instead of use an expression like the C assert is required to do? > Also > /home/petmay01/qemu-for-merges/exec.c: In function 'iotlb_to_section': > /home/petmay01/qemu-for-merges/exec.c:2871:1: error: control reaches > end of non-void function [-Werror=return-type] > } ... > Not sure if that's just follow-on errors from the earlier > ones, though. These are all follow-on, as you say. r~
Patchew URL: https://patchew.org/QEMU/20191025142159.12459-1-richard.henderson@linaro.org/ Hi, This series seems to have some coding style problems. See output below for more information: Subject: [PULL 00/12] tcg patch queue Type: series Message-id: 20191025142159.12459-1-richard.henderson@linaro.org === TEST SCRIPT BEGIN === #!/bin/bash git rev-parse base > /dev/null || exit 0 git config --local diff.renamelimit 0 git config --local diff.renames True git config --local diff.algorithm histogram ./scripts/checkpatch.pl --mailback base.. === TEST SCRIPT END === Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 From https://github.com/patchew-project/qemu ee70fc2..856bd2c master -> master * [new tag] patchew/20191026101221.5506-1-vsementsov@virtuozzo.com -> patchew/20191026101221.5506-1-vsementsov@virtuozzo.com Switched to a new branch 'test' c6bcef1 translate-all: Remove tb_alloc 338d348 translate-all: fix uninitialized tb->orig_tb 0ecc6ef cputlb: Fix tlb_vaddr_to_host ac5a22e exec: Cache TARGET_PAGE_MASK for TARGET_PAGE_BITS_VARY cbe6f3c exec: Promote TARGET_PAGE_MASK to target_long 193d2f1 exec: Restrict TARGET_PAGE_BITS_VARY assert to CONFIG_DEBUG_TCG f455681 exec: Use const alias for TARGET_PAGE_BITS_VARY 72299c7 configure: Detect compiler support for __attribute__((alias)) 878dbed exec: Split out variable page size support to exec-vary.c 2a0f4d3 cpu: use ROUND_UP() to define xxx_PAGE_ALIGN 0ba8f67 cputlb: ensure _cmmu helper functions follow the naming standard db4e121 tci: Add implementation for INDEX_op_ld16u_i64 === OUTPUT BEGIN === 1/12 Checking commit db4e1218f5b1 (tci: Add implementation for INDEX_op_ld16u_i64) 2/12 Checking commit 0ba8f676473c (cputlb: ensure _cmmu helper functions follow the naming standard) 3/12 Checking commit 2a0f4d3df675 (cpu: use ROUND_UP() to define xxx_PAGE_ALIGN) 4/12 Checking commit 878dbed6b17c (exec: Split out variable page size support to exec-vary.c) WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? #34: new file mode 100644 total: 0 errors, 1 warnings, 125 lines checked Patch 4/12 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. 5/12 Checking commit 72299c761114 (configure: Detect compiler support for __attribute__((alias))) 6/12 Checking commit f455681930d9 (exec: Use const alias for TARGET_PAGE_BITS_VARY) ERROR: externs should be avoided in .c files #66: FILE: exec-vary.c:57: +extern const TargetPageBits target_page total: 1 errors, 0 warnings, 103 lines checked Patch 6/12 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. 7/12 Checking commit 193d2f196d18 (exec: Restrict TARGET_PAGE_BITS_VARY assert to CONFIG_DEBUG_TCG) 8/12 Checking commit cbe6f3c25e7c (exec: Promote TARGET_PAGE_MASK to target_long) 9/12 Checking commit ac5a22e1e5fc (exec: Cache TARGET_PAGE_MASK for TARGET_PAGE_BITS_VARY) 10/12 Checking commit 0ecc6ef8ebd8 (cputlb: Fix tlb_vaddr_to_host) 11/12 Checking commit 338d348e2de5 (translate-all: fix uninitialized tb->orig_tb) 12/12 Checking commit c6bcef1f1970 (translate-all: Remove tb_alloc) === OUTPUT END === Test command exited with code: 1 The full log is available at http://patchew.org/logs/20191025142159.12459-1-richard.henderson@linaro.org/testing.checkpatch/?type=message. --- Email generated automatically by Patchew [https://patchew.org/]. Please send your feedback to patchew-devel@redhat.com
The following changes since commit bad76ac319556dab2497429d473b49a237672e1c: Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging (2019-10-25 14:17:08 +0100) are available in the Git repository at: https://github.com/rth7680/qemu.git tags/pull-tcg-20191025 for you to fetch changes up to 0ed1bfb046b740b70eed2cf3581e01768703b185: translate-all: Remove tb_alloc (2019-10-25 10:15:25 -0400) ---------------------------------------------------------------- Improvements for TARGET_PAGE_BITS_VARY Fix for TCI ld16u_i64. Fix for segv on icount execute from i/o memory. Two misc cleanups. ---------------------------------------------------------------- Alex Bennée (1): cputlb: ensure _cmmu helper functions follow the naming standard Clement Deschamps (1): translate-all: fix uninitialized tb->orig_tb Richard Henderson (8): exec: Split out variable page size support to exec-vary.c configure: Detect compiler support for __attribute__((alias)) exec: Use const alias for TARGET_PAGE_BITS_VARY exec: Restrict TARGET_PAGE_BITS_VARY assert to CONFIG_DEBUG_TCG exec: Promote TARGET_PAGE_MASK to target_long exec: Cache TARGET_PAGE_MASK for TARGET_PAGE_BITS_VARY cputlb: Fix tlb_vaddr_to_host translate-all: Remove tb_alloc Stefan Weil (1): tci: Add implementation for INDEX_op_ld16u_i64 Wei Yang (1): cpu: use ROUND_UP() to define xxx_PAGE_ALIGN Makefile.target | 2 +- include/exec/cpu-all.h | 33 +++++++++---- include/exec/cpu_ldst_template.h | 4 +- include/qemu-common.h | 6 +++ tcg/tcg.h | 20 +++++--- accel/tcg/cputlb.c | 26 ++++++++-- accel/tcg/translate-all.c | 21 ++------ exec-vary.c | 102 +++++++++++++++++++++++++++++++++++++++ exec.c | 34 ------------- target/cris/translate_v10.inc.c | 3 +- tcg/tci.c | 15 ++++++ configure | 19 ++++++++ 12 files changed, 208 insertions(+), 77 deletions(-) create mode 100644 exec-vary.c