From: Aleksandar Markovic <aleksandar.markovic@rt-rk.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org,
Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com>,
Daniel Henrique Barboza <danielhb413@gmail.com>,
Aurelien Jarno <aurelien@aurel32.net>,
amarkovic@wavecomp.com
Subject: [PULL 3/6] target/mips: semihosting: Remove 'uhi_done' label in helper_do_semihosting()
Date: Wed, 29 Jan 2020 19:34:14 +0100 [thread overview]
Message-ID: <1580322857-14331-4-git-send-email-aleksandar.markovic@rt-rk.com> (raw)
In-Reply-To: <1580322857-14331-1-git-send-email-aleksandar.markovic@rt-rk.com>
From: Daniel Henrique Barboza <danielhb413@gmail.com>
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>
---
target/mips/mips-semi.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/target/mips/mips-semi.c b/target/mips/mips-semi.c
index 35bdfd7..10a710c 100644
--- a/target/mips/mips-semi.c
+++ b/target/mips/mips-semi.c
@@ -218,7 +218,7 @@ static int copy_argn_to_target(CPUMIPSState *env, int arg_num,
if (!p) { \
gpr[2] = -1; \
gpr[3] = EFAULT; \
- goto uhi_done; \
+ return; \
} \
} while (0)
@@ -228,14 +228,14 @@ static int copy_argn_to_target(CPUMIPSState *env, int arg_num,
if (!p) { \
gpr[2] = -1; \
gpr[3] = EFAULT; \
- goto uhi_done; \
+ return; \
} \
p2 = lock_user_string(addr2); \
if (!p2) { \
unlock_user(p, addr, 0); \
gpr[2] = -1; \
gpr[3] = EFAULT; \
- goto uhi_done; \
+ return; \
} \
} while (0)
@@ -272,7 +272,7 @@ void helper_do_semihosting(CPUMIPSState *env)
if (gpr[4] < 3) {
/* ignore closing stdin/stdout/stderr */
gpr[2] = 0;
- goto uhi_done;
+ return;
}
gpr[2] = close(gpr[4]);
gpr[3] = errno_mips(errno);
@@ -302,7 +302,7 @@ void helper_do_semihosting(CPUMIPSState *env)
gpr[2] = fstat(gpr[4], &sbuf);
gpr[3] = errno_mips(errno);
if (gpr[2]) {
- goto uhi_done;
+ return;
}
gpr[2] = copy_stat_to_target(env, &sbuf, gpr[5]);
gpr[3] = errno_mips(errno);
@@ -314,14 +314,14 @@ void helper_do_semihosting(CPUMIPSState *env)
case UHI_argnlen:
if (gpr[4] >= semihosting_get_argc()) {
gpr[2] = -1;
- goto uhi_done;
+ return;
}
gpr[2] = strlen(semihosting_get_arg(gpr[4]));
break;
case UHI_argn:
if (gpr[4] >= semihosting_get_argc()) {
gpr[2] = -1;
- goto uhi_done;
+ return;
}
gpr[2] = copy_argn_to_target(env, gpr[4], gpr[5]);
break;
@@ -369,6 +369,5 @@ void helper_do_semihosting(CPUMIPSState *env)
fprintf(stderr, "Unknown UHI operation %d\n", op);
abort();
}
-uhi_done:
return;
}
--
2.7.4
next prev parent reply other threads:[~2020-01-29 18:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-29 18:34 [PULL 0/6] MIPS queue for January 29th, 2020 Aleksandar Markovic
2020-01-29 18:34 ` [PULL 1/6] target/mips: Rectify documentation on deprecating MIPS r4k machine Aleksandar Markovic
2020-01-29 18:34 ` [PULL 2/6] disas: Add a field for target-dependant data to disassemble_info Aleksandar Markovic
2020-01-29 18:34 ` Aleksandar Markovic [this message]
2020-01-29 18:34 ` [PULL 4/6] hw/core/loader: Let load_elf() populate a field with CPU-specific flags Aleksandar Markovic
2020-01-29 18:34 ` [PULL 5/6] target/mips: Amend CP0 WatchHi register implementation Aleksandar Markovic
2020-01-29 18:34 ` [PULL 6/6] target/mips: Add implementation of GINVT instruction Aleksandar Markovic
2020-01-30 15:47 ` [PULL 0/6] MIPS queue for January 29th, 2020 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1580322857-14331-4-git-send-email-aleksandar.markovic@rt-rk.com \
--to=aleksandar.markovic@rt-rk.com \
--cc=aleksandar.rikalo@rt-rk.com \
--cc=amarkovic@wavecomp.com \
--cc=aurelien@aurel32.net \
--cc=danielhb413@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.