Commit 1cc21a18 authored by liguang's avatar liguang Committed by Andreas Färber
Browse files

target-i386: Avoid goto in hw_breakpoint_insert() 



  "Go To Statement Considered Harmful" -- E. Dijkstra

To avoid an unnecessary goto within the switch statement, move
watchpoint insertion out of the switch statement. Improves readability.

While at it, fix Coding Style issues (missing braces, indentation).

Signed-off-by: default avatarliguang <lig.fnst@cn.fujitsu.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 5902564a

target-i386/helper.c

+10 −6
Original line number Diff line number Diff line
@@ -966,7 +966,7 @@ hwaddr cpu_get_phys_page_debug(CPUX86State *env, target_ulong addr) 


void hw_breakpoint_insert(CPUX86State *env, int index)

{

    int type, err = 0;

    int type = 0, err = 0;



    switch (hw_breakpoint_type(env->dr[7], index)) {

    case DR7_TYPE_BP_INST:
@@ -977,21 +977,25 @@ void hw_breakpoint_insert(CPUX86State *env, int index) 
        break;

    case DR7_TYPE_DATA_WR:

        type = BP_CPU | BP_MEM_WRITE;

        goto insert_wp;

        break;

    case DR7_TYPE_IO_RW:

        /* No support for I/O watchpoints yet */

        break;

    case DR7_TYPE_DATA_RW:

        type = BP_CPU | BP_MEM_ACCESS;

    insert_wp:

        break;

    }



    if (type != 0) {

        err = cpu_watchpoint_insert(env, env->dr[index],

                                    hw_breakpoint_len(env->dr[7], index),

                                    type, &env->cpu_watchpoint[index]);

        break;

    }

    if (err)



    if (err) {

        env->cpu_breakpoint[index] = NULL;

    }

}



void hw_breakpoint_remove(CPUX86State *env, int index)

{