Check address ranges for disassembly
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJXVFOkAAoJEK0ScMxN0CebhTMIAI4nrVasyw8+d7jKlZ1/ybO8 Kpjs9oQqgEClaN4JTjsNOgTkX0PEr8qy9aXPDmVwPLbNigaTLAOGq6w3icoE/edC RTkKVmZ9OOtaJn/sbCR6mmkKNWZlJUCZ13L4i9Cl4WTwqR5LXFTCZRrdBvp1qgDj s7+n/XXUKFNo6tZ7jqQ+qXZpxVzIobZ6sdKiZKa8sJkgQ95m+U1/WoJyy0yrx97Q IiIoWBurLz3q9Q093Po/rgN337et0qQFEhETnkSF2MITI9+7647I/OdwGio/2Ox3 n4tHH9U0bZ/HhZQXvybMdua3ixcuPumdv7Ruy22HNvvxMi9E4GIKv/9nDGlDSV4= =xp4j -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/rth/tags/pull-tgt-20160605' into staging Check address ranges for disassembly # gpg: Signature made Sun 05 Jun 2016 17:30:28 BST # 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>" * remotes/rth/tags/pull-tgt-20160605: target-*: dfilter support for in_asm Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
		
						commit
						b0491a1a17
					
				@ -2994,7 +2994,8 @@ void gen_intermediate_code(CPUAlphaState *env, struct TranslationBlock *tb)
 | 
			
		||||
    tb->icount = num_insns;
 | 
			
		||||
 | 
			
		||||
#ifdef DEBUG_DISAS
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
 | 
			
		||||
        && qemu_log_in_addr_range(pc_start)) {
 | 
			
		||||
        qemu_log("IN: %s\n", lookup_symbol(pc_start));
 | 
			
		||||
        log_target_disas(cs, pc_start, ctx.pc - pc_start, 1);
 | 
			
		||||
        qemu_log("\n");
 | 
			
		||||
 | 
			
		||||
@ -3311,7 +3311,8 @@ void gen_intermediate_code(CPUCRISState *env, struct TranslationBlock *tb)
 | 
			
		||||
 | 
			
		||||
#ifdef DEBUG_DISAS
 | 
			
		||||
#if !DISAS_CRIS
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
 | 
			
		||||
        && qemu_log_in_addr_range(pc_start)) {
 | 
			
		||||
        log_target_disas(cs, pc_start, dc->pc - pc_start,
 | 
			
		||||
                         env->pregs[PR_VR]);
 | 
			
		||||
        qemu_log("\nisize=%d osize=%d\n",
 | 
			
		||||
 | 
			
		||||
@ -8354,7 +8354,8 @@ done_generating:
 | 
			
		||||
    gen_tb_end(tb, num_insns);
 | 
			
		||||
 | 
			
		||||
#ifdef DEBUG_DISAS
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
 | 
			
		||||
        && qemu_log_in_addr_range(pc_start)) {
 | 
			
		||||
        int disas_flags;
 | 
			
		||||
        qemu_log("----------------\n");
 | 
			
		||||
        qemu_log("IN: %s\n", lookup_symbol(pc_start));
 | 
			
		||||
 | 
			
		||||
@ -1147,7 +1147,8 @@ void gen_intermediate_code(CPULM32State *env, struct TranslationBlock *tb)
 | 
			
		||||
    tb->icount = num_insns;
 | 
			
		||||
 | 
			
		||||
#ifdef DEBUG_DISAS
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
 | 
			
		||||
        && qemu_log_in_addr_range(pc_start)) {
 | 
			
		||||
        qemu_log("\n");
 | 
			
		||||
        log_target_disas(cs, pc_start, dc->pc - pc_start, 0);
 | 
			
		||||
        qemu_log("\nisize=%d osize=%d\n",
 | 
			
		||||
 | 
			
		||||
@ -3067,7 +3067,8 @@ void gen_intermediate_code(CPUM68KState *env, TranslationBlock *tb)
 | 
			
		||||
    gen_tb_end(tb, num_insns);
 | 
			
		||||
 | 
			
		||||
#ifdef DEBUG_DISAS
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
 | 
			
		||||
        && qemu_log_in_addr_range(pc_start)) {
 | 
			
		||||
        qemu_log("----------------\n");
 | 
			
		||||
        qemu_log("IN: %s\n", lookup_symbol(pc_start));
 | 
			
		||||
        log_target_disas(cs, pc_start, dc->pc - pc_start, 0);
 | 
			
		||||
 | 
			
		||||
@ -1818,7 +1818,8 @@ void gen_intermediate_code(CPUMBState *env, struct TranslationBlock *tb)
 | 
			
		||||
 | 
			
		||||
#ifdef DEBUG_DISAS
 | 
			
		||||
#if !SIM_COMPAT
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
 | 
			
		||||
        && qemu_log_in_addr_range(pc_start)) {
 | 
			
		||||
        qemu_log("\n");
 | 
			
		||||
#if DISAS_GNU
 | 
			
		||||
        log_target_disas(cs, pc_start, dc->pc - pc_start, 0);
 | 
			
		||||
 | 
			
		||||
@ -19913,7 +19913,8 @@ done_generating:
 | 
			
		||||
 | 
			
		||||
#ifdef DEBUG_DISAS
 | 
			
		||||
    LOG_DISAS("\n");
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
 | 
			
		||||
        && qemu_log_in_addr_range(pc_start)) {
 | 
			
		||||
        qemu_log("IN: %s\n", lookup_symbol(pc_start));
 | 
			
		||||
        log_target_disas(cs, pc_start, ctx.pc - pc_start, 0);
 | 
			
		||||
        qemu_log("\n");
 | 
			
		||||
 | 
			
		||||
@ -1751,7 +1751,8 @@ void gen_intermediate_code(CPUOpenRISCState *env, struct TranslationBlock *tb)
 | 
			
		||||
    tb->icount = num_insns;
 | 
			
		||||
 | 
			
		||||
#ifdef DEBUG_DISAS
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
 | 
			
		||||
        && qemu_log_in_addr_range(pc_start)) {
 | 
			
		||||
        qemu_log("\n");
 | 
			
		||||
        log_target_disas(cs, pc_start, dc->pc - pc_start, 0);
 | 
			
		||||
        qemu_log("\nisize=%d osize=%d\n",
 | 
			
		||||
 | 
			
		||||
@ -11642,7 +11642,8 @@ void gen_intermediate_code(CPUPPCState *env, struct TranslationBlock *tb)
 | 
			
		||||
    tb->icount = num_insns;
 | 
			
		||||
 | 
			
		||||
#if defined(DEBUG_DISAS)
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
 | 
			
		||||
        && qemu_log_in_addr_range(pc_start)) {
 | 
			
		||||
        int flags;
 | 
			
		||||
        flags = env->bfd_mach;
 | 
			
		||||
        flags |= ctx.le_mode << 16;
 | 
			
		||||
 | 
			
		||||
@ -5429,7 +5429,8 @@ void gen_intermediate_code(CPUS390XState *env, struct TranslationBlock *tb)
 | 
			
		||||
    tb->icount = num_insns;
 | 
			
		||||
 | 
			
		||||
#if defined(S390X_DEBUG_DISAS)
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
 | 
			
		||||
        && qemu_log_in_addr_range(pc_start)) {
 | 
			
		||||
        qemu_log("IN: %s\n", lookup_symbol(pc_start));
 | 
			
		||||
        log_target_disas(cs, pc_start, dc.pc - pc_start, 1);
 | 
			
		||||
        qemu_log("\n");
 | 
			
		||||
 | 
			
		||||
@ -1924,7 +1924,8 @@ void gen_intermediate_code(CPUSH4State * env, struct TranslationBlock *tb)
 | 
			
		||||
    tb->icount = num_insns;
 | 
			
		||||
 | 
			
		||||
#ifdef DEBUG_DISAS
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
 | 
			
		||||
        && qemu_log_in_addr_range(pc_start)) {
 | 
			
		||||
	qemu_log("IN:\n");	/* , lookup_symbol(pc_start)); */
 | 
			
		||||
        log_target_disas(cs, pc_start, ctx.pc - pc_start, 0);
 | 
			
		||||
	qemu_log("\n");
 | 
			
		||||
 | 
			
		||||
@ -5330,7 +5330,8 @@ void gen_intermediate_code(CPUSPARCState * env, TranslationBlock * tb)
 | 
			
		||||
    tb->icount = num_insns;
 | 
			
		||||
 | 
			
		||||
#ifdef DEBUG_DISAS
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
 | 
			
		||||
        && qemu_log_in_addr_range(pc_start)) {
 | 
			
		||||
        qemu_log("--------------\n");
 | 
			
		||||
        qemu_log("IN: %s\n", lookup_symbol(pc_start));
 | 
			
		||||
        log_target_disas(cs, pc_start, last_pc + 4 - pc_start, 0);
 | 
			
		||||
 | 
			
		||||
@ -8787,7 +8787,8 @@ void gen_intermediate_code(CPUTriCoreState *env, struct TranslationBlock *tb)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
#ifdef DEBUG_DISAS
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
 | 
			
		||||
        && qemu_log_in_addr_range(pc_start)) {
 | 
			
		||||
        qemu_log("IN: %s\n", lookup_symbol(pc_start));
 | 
			
		||||
        log_target_disas(cs, pc_start, ctx.pc - pc_start, 0);
 | 
			
		||||
        qemu_log("\n");
 | 
			
		||||
 | 
			
		||||
@ -2021,7 +2021,8 @@ done_generating:
 | 
			
		||||
    gen_tb_end(tb, num_insns);
 | 
			
		||||
 | 
			
		||||
#ifdef DEBUG_DISAS
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
 | 
			
		||||
        && qemu_log_in_addr_range(pc_start)) {
 | 
			
		||||
        qemu_log("----------------\n");
 | 
			
		||||
        qemu_log("IN: %s\n", lookup_symbol(pc_start));
 | 
			
		||||
        log_target_disas(cs, pc_start, dc->pc - pc_start, 0);
 | 
			
		||||
 | 
			
		||||
@ -3153,7 +3153,8 @@ void gen_intermediate_code(CPUXtensaState *env, TranslationBlock *tb)
 | 
			
		||||
    gen_tb_end(tb, insn_count);
 | 
			
		||||
 | 
			
		||||
#ifdef DEBUG_DISAS
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) {
 | 
			
		||||
    if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)
 | 
			
		||||
        && qemu_log_in_addr_range(pc_start)) {
 | 
			
		||||
        qemu_log("----------------\n");
 | 
			
		||||
        qemu_log("IN: %s\n", lookup_symbol(pc_start));
 | 
			
		||||
        log_target_disas(cs, pc_start, dc.pc - pc_start, 0);
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user