motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 08:43:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/mips: semihosting: Remove 'uhi_done' label in helper_do_semihosting()

Browse source 
The label 'uhi_done' is a simple 'return' call and can
be removed for a bit more clarity in the code.

CC: Aurelien Jarno <aurelien@aurel32.net>
CC: Aleksandar Markovic <amarkovic@wavecomp.com>
CC: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com>
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20200106182425.20312-7-danielhb413@gmail.com>
This commit is contained in:
Daniel Henrique Barboza 2020-01-06 15:23:32 -03:00 • committed by Aleksandar Markovic
parent 3404e180f9
commit 54fc33fdc4
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
target/mips/mips-semi.c
View file

@ -218,7 +218,7 @@ static int copy_argn_to_target(CPUMIPSState *env, int arg_num,
if (!p) { \ if (!p) { \
gpr[2] = -1; \ gpr[2] = -1; \
gpr[3] = EFAULT; \ gpr[3] = EFAULT; \
goto uhi_done; \ return; \
} \ } \
} while (0) } while (0)
@ -228,14 +228,14 @@ static int copy_argn_to_target(CPUMIPSState *env, int arg_num,
if (!p) { \ if (!p) { \
gpr[2] = -1; \ gpr[2] = -1; \
gpr[3] = EFAULT; \ gpr[3] = EFAULT; \
goto uhi_done; \ return; \
} \ } \
p2 = lock_user_string(addr2); \ p2 = lock_user_string(addr2); \
if (!p2) { \ if (!p2) { \
unlock_user(p, addr, 0); \ unlock_user(p, addr, 0); \
gpr[2] = -1; \ gpr[2] = -1; \
gpr[3] = EFAULT; \ gpr[3] = EFAULT; \
goto uhi_done; \ return; \
} \ } \
} while (0) } while (0)
@ -272,7 +272,7 @@ void helper_do_semihosting(CPUMIPSState *env)
if (gpr[4] < 3) { if (gpr[4] < 3) {
/* ignore closing stdin/stdout/stderr */ /* ignore closing stdin/stdout/stderr */
gpr[2] = 0; gpr[2] = 0;
goto uhi_done; return;
} }
gpr[2] = close(gpr[4]); gpr[2] = close(gpr[4]);
gpr[3] = errno_mips(errno); gpr[3] = errno_mips(errno);
@ -302,7 +302,7 @@ void helper_do_semihosting(CPUMIPSState *env)
gpr[2] = fstat(gpr[4], &sbuf); gpr[2] = fstat(gpr[4], &sbuf);
gpr[3] = errno_mips(errno); gpr[3] = errno_mips(errno);
if (gpr[2]) { if (gpr[2]) {
goto uhi_done; return;
} }
gpr[2] = copy_stat_to_target(env, &sbuf, gpr[5]); gpr[2] = copy_stat_to_target(env, &sbuf, gpr[5]);
gpr[3] = errno_mips(errno); gpr[3] = errno_mips(errno);
@ -314,14 +314,14 @@ void helper_do_semihosting(CPUMIPSState *env)
case UHI_argnlen: case UHI_argnlen:
if (gpr[4] >= semihosting_get_argc()) { if (gpr[4] >= semihosting_get_argc()) {
gpr[2] = -1; gpr[2] = -1;
goto uhi_done; return;
} }
gpr[2] = strlen(semihosting_get_arg(gpr[4])); gpr[2] = strlen(semihosting_get_arg(gpr[4]));
break; break;
case UHI_argn: case UHI_argn:
if (gpr[4] >= semihosting_get_argc()) { if (gpr[4] >= semihosting_get_argc()) {
gpr[2] = -1; gpr[2] = -1;
goto uhi_done; return;
} }
gpr[2] = copy_argn_to_target(env, gpr[4], gpr[5]); gpr[2] = copy_argn_to_target(env, gpr[4], gpr[5]);
break; break;
@ -369,6 +369,5 @@ void helper_do_semihosting(CPUMIPSState *env)
fprintf(stderr, "Unknown UHI operation %d\n", op); fprintf(stderr, "Unknown UHI operation %d\n", op);
abort(); abort();
} }
uhi_done:
return; return;
} }