Commit 4eb28abd authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20161101-2' into staging 



tcg queued patches

# gpg: Signature made Tue 01 Nov 2016 16:45:42 GMT
# gpg:                using RSA key 0xAD1270CC4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg:                 aka "Richard Henderson <rth@redhat.com>"
# gpg:                 aka "Richard Henderson <rth@twiddle.net>"
# Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC  16A4 AD12 70CC 4DD0 279B

* remotes/rth/tags/pull-tcg-20161101-2:
  tcg: correct 32-bit tcg_gen_ld8s_i64 sign-extension
  tcg/tcg.h: Improve documentation of TCGv_i32 etc types
  MAINTAINERS: Update PPC status and maintainer
  target-microblaze: Cleanup dec_mul
  tcg: Add tcg_gen_mulsu2_{i32,i64,tl}
  log: Add locking to large logging blocks
  target-openrisc: Do not dump cpu state with -d in_asm
  target-microblaze: Do not dump cpu state with -d in_asm
  target-cris: Do not dump cpu state with -d in_asm

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c46ef897 3ff91d7e

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1504,8 +1504,8 @@ F: tcg/mips/ 
F: disas/mips.c



PPC

M: Vassili Karpov (malc) <av1474@comtv.ru>

S: Maintained

M: Richard Henderson <rth@twiddle.net>

S: Odd Fixes

F: tcg/ppc/

F: disas/ppc.c

cpu-exec.c

+2 −0
Original line number Diff line number Diff line
@@ -150,11 +150,13 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, TranslationBlock *itb) 
#if defined(DEBUG_DISAS)

    if (qemu_loglevel_mask(CPU_LOG_TB_CPU)

        && qemu_log_in_addr_range(itb->pc)) {

        qemu_log_lock();

#if defined(TARGET_I386)

        log_cpu_state(cpu, CPU_DUMP_CCOP);

#else

        log_cpu_state(cpu, 0);

#endif

        qemu_log_unlock();

    }

#endif /* DEBUG_DISAS */

exec.c

+2 −0
Original line number Diff line number Diff line
@@ -911,11 +911,13 @@ void cpu_abort(CPUState *cpu, const char *fmt, ...) 
    fprintf(stderr, "\n");

    cpu_dump_state(cpu, stderr, fprintf, CPU_DUMP_FPU | CPU_DUMP_CCOP);

    if (qemu_log_separate()) {

        qemu_log_lock();

        qemu_log("qemu: fatal: ");

        qemu_log_vprintf(fmt, ap2);

        qemu_log("\n");

        log_cpu_state(cpu, CPU_DUMP_FPU | CPU_DUMP_CCOP);

        qemu_log_flush();

        qemu_log_unlock();

        qemu_log_close();

    }

    va_end(ap2);

include/qemu/log.h

+16 −0
Original line number Diff line number Diff line
@@ -51,6 +51,22 @@ static inline bool qemu_loglevel_mask(int mask) 
    return (qemu_loglevel & mask) != 0;

}



/* Lock output for a series of related logs.  Since this is not needed

 * for a single qemu_log / qemu_log_mask / qemu_log_mask_and_addr, we

 * assume that qemu_loglevel_mask has already been tested, and that

 * qemu_loglevel is never set when qemu_logfile is unset.

 */



static inline void qemu_log_lock(void)

{

    qemu_flockfile(qemu_logfile);

}



static inline void qemu_log_unlock(void)

{

    qemu_funlockfile(qemu_logfile);

}



/* Logging functions: */



/* main logging function

include/sysemu/os-posix.h

+12 −0
Original line number Diff line number Diff line
@@ -87,4 +87,16 @@ void *qemu_alloc_stack(size_t *sz); 
 */

void qemu_free_stack(void *stack, size_t sz);



/* POSIX and Mingw32 differ in the name of the stdio lock functions.  */



static inline void qemu_flockfile(FILE *f)

{

    flockfile(f);

}



static inline void qemu_funlockfile(FILE *f)

{

    funlockfile(f);

}



#endif