Commit 74841f04 authored by Richard Henderson's avatar Richard Henderson
Browse files

exec: Move user-only watchpoint stubs inline 



Let the user-only watchpoint stubs resolve to empty inline functions.

Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent ccdb4c55

exec.c

+2 −24
Original line number Diff line number Diff line
@@ -1062,28 +1062,7 @@ static void breakpoint_invalidate(CPUState *cpu, target_ulong pc) 
}

#endif



#if defined(CONFIG_USER_ONLY)

void cpu_watchpoint_remove_all(CPUState *cpu, int mask)



{

}



int cpu_watchpoint_remove(CPUState *cpu, vaddr addr, vaddr len,

                          int flags)

{

    return -ENOSYS;

}



void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *watchpoint)

{

}



int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len,

                          int flags, CPUWatchpoint **watchpoint)

{

    return -ENOSYS;

}

#else

#ifndef CONFIG_USER_ONLY

/* Add a watchpoint.  */

int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len,

                          int flags, CPUWatchpoint **watchpoint)
@@ -1173,8 +1152,7 @@ static inline bool cpu_watchpoint_address_matches(CPUWatchpoint *wp, 


    return !(addr > wpend || wp->vaddr > addrend);

}



#endif

#endif /* !CONFIG_USER_ONLY */



/* Add a breakpoint.  */

int cpu_breakpoint_insert(CPUState *cpu, vaddr pc, int flags,

include/hw/core/cpu.h

+23 −0
Original line number Diff line number Diff line
@@ -1070,12 +1070,35 @@ static inline bool cpu_breakpoint_test(CPUState *cpu, vaddr pc, int mask) 
    return false;

}



#ifdef CONFIG_USER_ONLY

static inline int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len,

                                        int flags, CPUWatchpoint **watchpoint)

{

    return -ENOSYS;

}



static inline int cpu_watchpoint_remove(CPUState *cpu, vaddr addr,

                                        vaddr len, int flags)

{

    return -ENOSYS;

}



static inline void cpu_watchpoint_remove_by_ref(CPUState *cpu,

                                                CPUWatchpoint *wp)

{

}



static inline void cpu_watchpoint_remove_all(CPUState *cpu, int mask)

{

}

#else

int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len,

                          int flags, CPUWatchpoint **watchpoint);

int cpu_watchpoint_remove(CPUState *cpu, vaddr addr,

                          vaddr len, int flags);

void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *watchpoint);

void cpu_watchpoint_remove_all(CPUState *cpu, int mask);

#endif



/**

 * cpu_get_address_space: