Skip to content

Commit

Permalink
target/i386: Simplify TARGET_X86_64 #ifdef'ry
Browse files Browse the repository at this point in the history
Merge two TARGET_X86_64 consecutive blocks.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210911165434.531552-4-f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
  • Loading branch information
philmd authored and rth7680 committed Sep 14, 2021
1 parent ce67d51 commit 1c46157
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions target/i386/tcg/seg_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -929,9 +929,7 @@ static void do_interrupt64(CPUX86State *env, int intno, int is_int,
e2);
env->eip = offset;
}
#endif

#ifdef TARGET_X86_64
void helper_sysret(CPUX86State *env, int dflag)
{
int cpl, selector;
Expand Down Expand Up @@ -984,7 +982,7 @@ void helper_sysret(CPUX86State *env, int dflag)
DESC_W_MASK | DESC_A_MASK);
}
}
#endif
#endif /* TARGET_X86_64 */

/* real mode interrupt */
static void do_interrupt_real(CPUX86State *env, int intno, int is_int,
Expand Down

0 comments on commit 1c46157

Please sign in to comment.