Commit fe18911a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch... 


Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-gdbstub-cputlb-120619-3' into staging

Various fixes and updates:

  - editor config tweak for shell scripts
  - iotest updates (still not default for make check)
  - various docker updates
  - gcc/ubsan updates for travis
  - some clean-ups for tests/vm (no serial autoinstall)
  - semihosting fix for Coverity
  - fixes for cputlb in 64-on-32 cases
  - gdbstub re-factor + maintainership update

# gpg: Signature made Wed 12 Jun 2019 17:55:04 BST
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-testing-gdbstub-cputlb-120619-3: (40 commits)
  gdbstub: Implement qemu physical memory mode
  gdbstub: Clear unused variables in gdb_handle_packet
  gdbstub: Implement target halted (? pkt) with new infra
  gdbstub: Implement generic set/query (Q/q pkt) with new infra
  gdbstub: Implement v commands with new infra
  gdbstub: Implement step (s pkt) with new infra
  gdbstub: Implement file io (F pkt) with new infra
  gdbstub: Implement read all registers (g pkt) with new infra
  gdbstub: Implement write all registers (G pkt) with new infra
  gdbstub: Implement read memory (m pkt) with new infra
  gdbstub: Implement write memory (M pkt) with new infra
  gdbstub: Implement get register (p pkt) with new infra
  gdbstub: Implement set register (P pkt) with new infra
  gdbstub: Implement breakpoint commands (Z/z pkt) with new infra
  gdbstub: Implement set_thread (H pkt) with new infra
  gdbstub: Implement continue with signal (C pkt) with new infra
  gdbstub: Implement continue (c pkt) with new infra
  gdbstub: Implement thread_alive (T pkt) with new infra
  gdbstub: Implement deatch (D pkt) with new infra
  gdbstub: Add infrastructure to parse cmd packets
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a050901d ab4752ec

.editorconfig

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ file_type_emacs = makefile 
indent_style = space

indent_size = 4



[*.sh]

indent_style = space

indent_size = 4



[*.{s,S}]

indent_style = tab

indent_size = 8

.travis.yml

+12 −5
Original line number Diff line number Diff line
@@ -152,6 +152,13 @@ matrix: 
      compiler: clang





    - env:

        - CONFIG="--target-list=${MAIN_SOFTMMU_TARGETS} "

      compiler: clang

      before_script:

        - ./configure ${CONFIG} --extra-cflags="-fsanitize=undefined -Werror" || { cat config.log && exit 1; }





    - env:

        - CONFIG="--disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}"

      compiler: clang
@@ -240,8 +247,8 @@ matrix: 
            - ubuntu-toolchain-r-test

          packages:

            # Extra toolchains

            - gcc-7

            - g++-7

            - gcc-9

            - g++-9

            # Build dependencies

            - libaio-dev

            - libattr1-dev
@@ -270,11 +277,11 @@ matrix: 
      language: generic

      compiler: none

      env:

        - COMPILER_NAME=gcc CXX=g++-7 CC=gcc-7

        - CONFIG="--cc=gcc-7 --cxx=g++-7 --disable-pie --disable-linux-user"

        - COMPILER_NAME=gcc CXX=g++-9 CC=gcc-9

        - CONFIG="--cc=gcc-9 --cxx=g++-9 --disable-pie --disable-linux-user"

        - TEST_CMD=""

      before_script:

        - ./configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread -fuse-ld=gold" || { cat config.log && exit 1; }

        - ./configure ${CONFIG} --extra-cflags="-g3 -O0 -Wno-error=stringop-truncation -fsanitize=thread -fuse-ld=gold" || { cat config.log && exit 1; }





    # Run check-tcg against linux-user

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -1865,7 +1865,9 @@ F: util/error.c 
F: util/qemu-error.c



GDB stub

S: Orphan

M: Alex Bennée <alex.bennee@linaro.org>

R: Philippe Mathieu-Daudé <philmd@redhat.com>

S: Maintained

F: gdbstub*

F: gdb-xml/

accel/tcg/cputlb.c

+2 −2
Original line number Diff line number Diff line
@@ -1315,10 +1315,10 @@ load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi, 
        && unlikely((addr & ~TARGET_PAGE_MASK) + size - 1

                    >= TARGET_PAGE_SIZE)) {

        target_ulong addr1, addr2;

        tcg_target_ulong r1, r2;

        uint64_t r1, r2;

        unsigned shift;

    do_unaligned_access:

        addr1 = addr & ~(size - 1);

        addr1 = addr & ~((target_ulong)size - 1);

        addr2 = addr1 + size;

        r1 = full_load(env, addr1, oi, retaddr);

        r2 = full_load(env, addr2, oi, retaddr);

gdbstub.c

+1270 −491

File changed.

Preview size limit exceeded, changes collapsed.