jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

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

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>

authored by

Daniel Henrique Barboza and committed by
Aleksandar Markovic 54fc33fd 3404e180

+7 -8
+7 -8
target/mips/mips-semi.c
··· 218 218 if (!p) { \ 219 219 gpr[2] = -1; \ 220 220 gpr[3] = EFAULT; \ 221 - goto uhi_done; \ 221 + return; \ 222 222 } \ 223 223 } while (0) 224 224 ··· 228 228 if (!p) { \ 229 229 gpr[2] = -1; \ 230 230 gpr[3] = EFAULT; \ 231 - goto uhi_done; \ 231 + return; \ 232 232 } \ 233 233 p2 = lock_user_string(addr2); \ 234 234 if (!p2) { \ 235 235 unlock_user(p, addr, 0); \ 236 236 gpr[2] = -1; \ 237 237 gpr[3] = EFAULT; \ 238 - goto uhi_done; \ 238 + return; \ 239 239 } \ 240 240 } while (0) 241 241 ··· 272 272 if (gpr[4] < 3) { 273 273 /* ignore closing stdin/stdout/stderr */ 274 274 gpr[2] = 0; 275 - goto uhi_done; 275 + return; 276 276 } 277 277 gpr[2] = close(gpr[4]); 278 278 gpr[3] = errno_mips(errno); ··· 302 302 gpr[2] = fstat(gpr[4], &sbuf); 303 303 gpr[3] = errno_mips(errno); 304 304 if (gpr[2]) { 305 - goto uhi_done; 305 + return; 306 306 } 307 307 gpr[2] = copy_stat_to_target(env, &sbuf, gpr[5]); 308 308 gpr[3] = errno_mips(errno); ··· 314 314 case UHI_argnlen: 315 315 if (gpr[4] >= semihosting_get_argc()) { 316 316 gpr[2] = -1; 317 - goto uhi_done; 317 + return; 318 318 } 319 319 gpr[2] = strlen(semihosting_get_arg(gpr[4])); 320 320 break; 321 321 case UHI_argn: 322 322 if (gpr[4] >= semihosting_get_argc()) { 323 323 gpr[2] = -1; 324 - goto uhi_done; 324 + return; 325 325 } 326 326 gpr[2] = copy_argn_to_target(env, gpr[4], gpr[5]); 327 327 break; ··· 369 369 fprintf(stderr, "Unknown UHI operation %d\n", op); 370 370 abort(); 371 371 } 372 - uhi_done: 373 372 return; 374 373 }