ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux-user/aarch64: Tidy target_restore_sigframe error return 

Fold the return value setting into the goto, so each
point of failure need not do both.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220708151540.18136-37-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2022-07-08 20:45:31 +05:30 committed by Peter Maydell
parent 4a29c36316
commit 5726597c3b
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
linux-user/aarch64/signal.c
View File

@ -287,7 +287,6 @@ static int target_restore_sigframe(CPUARMState *env,
struct target_sve_context *sve = NULL; struct target_sve_context *sve = NULL;
uint64_t extra_datap = 0; uint64_t extra_datap = 0;
bool used_extra = false; bool used_extra = false;
bool err = false;
int vq = 0, sve_size = 0; int vq = 0, sve_size = 0;
target_restore_general_frame(env, sf); target_restore_general_frame(env, sf);
@ -301,8 +300,7 @@ static int target_restore_sigframe(CPUARMState *env,
switch (magic) { switch (magic) {
case 0: case 0:
if (size != 0) { if (size != 0) {
err = true; goto err;
goto exit;
} }
if (used_extra) { if (used_extra) {
ctx = NULL; ctx = NULL;
@ -314,8 +312,7 @@ static int target_restore_sigframe(CPUARMState *env,
case TARGET_FPSIMD_MAGIC: case TARGET_FPSIMD_MAGIC:
if (fpsimd || size != sizeof(struct target_fpsimd_context)) { if (fpsimd || size != sizeof(struct target_fpsimd_context)) {
err = true; goto err;
goto exit;
} }
fpsimd = (struct target_fpsimd_context *)ctx; fpsimd = (struct target_fpsimd_context *)ctx;
break; break;
@ -329,13 +326,11 @@ static int target_restore_sigframe(CPUARMState *env,
break; break;
} }
} }
err = true; goto err;
goto exit;
case TARGET_EXTRA_MAGIC: case TARGET_EXTRA_MAGIC:
if (extra || size != sizeof(struct target_extra_context)) { if (extra || size != sizeof(struct target_extra_context)) {
err = true; goto err;
goto exit;
} }
__get_user(extra_datap, __get_user(extra_datap,
&((struct target_extra_context *)ctx)->datap); &((struct target_extra_context *)ctx)->datap);
@ -348,8 +343,7 @@ static int target_restore_sigframe(CPUARMState *env,
/* Unknown record -- we certainly didn't generate it. /* Unknown record -- we certainly didn't generate it.
* Did we in fact get out of sync? * Did we in fact get out of sync?
*/ */
err = true; goto err;
goto exit;
} }
ctx = (void *)ctx + size; ctx = (void *)ctx + size;
} }
@ -358,17 +352,19 @@ static int target_restore_sigframe(CPUARMState *env,
if (fpsimd) { if (fpsimd) {
target_restore_fpsimd_record(env, fpsimd); target_restore_fpsimd_record(env, fpsimd);
} else { } else {
err = true; goto err;
} }
/* SVE data, if present, overwrites FPSIMD data. */ /* SVE data, if present, overwrites FPSIMD data. */
if (sve) { if (sve) {
target_restore_sve_record(env, sve, vq); target_restore_sve_record(env, sve, vq);
} }
exit:
unlock_user(extra, extra_datap, 0); unlock_user(extra, extra_datap, 0);
return err; return 0;
err:
unlock_user(extra, extra_datap, 0);
return 1;
} }
static abi_ulong get_sigframe(struct target_sigaction *ka, static abi_ulong get_sigframe(struct target_sigaction *ka,