diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-06-20 16:19:18 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-06-20 16:19:18 +0100 |
| commit | 7fa124b273acd22a808e742ead78c065ccd9b4c4 (patch) | |
| tree | 60fc0c2deebaa7cef45b35f123986eed40f3ba3f /target-sparc/cc_helper.c | |
| parent | fd2590bccc0bd63833813592a3e193686cf1c623 (diff) | |
| parent | daa76aa416b1e18ab1fac650ff53d966d8f21f68 (diff) | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-06-20' into staging
Error reporting patches for 2016-06-20
# gpg: Signature made Mon 20 Jun 2016 15:56:15 BST
# gpg: using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-error-2016-06-20:
log: Fix qemu_set_log_filename() error handling
log: Fix qemu_set_dfilter_ranges() error reporting
log: Plug memory leak on multiple -dfilter
coccinelle: Remove unnecessary variables for function return value
error: Remove unnecessary local_err variables
error: Remove NULL checks on error_propagate() calls
vl: Error messages need to go to stderr, fix some
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-sparc/cc_helper.c')
| -rw-r--r-- | target-sparc/cc_helper.c | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/target-sparc/cc_helper.c b/target-sparc/cc_helper.c index 44c4409346..a410a0b98f 100644 --- a/target-sparc/cc_helper.c +++ b/target-sparc/cc_helper.c @@ -200,10 +200,7 @@ static uint32_t compute_all_addx_xcc(CPUSPARCState *env) static uint32_t compute_C_addx_xcc(CPUSPARCState *env) { - uint32_t ret; - - ret = get_C_addx_xcc(CC_DST, CC_SRC, CC_SRC2); - return ret; + return get_C_addx_xcc(CC_DST, CC_SRC, CC_SRC2); } #endif @@ -219,10 +216,7 @@ static uint32_t compute_all_addx(CPUSPARCState *env) static uint32_t compute_C_addx(CPUSPARCState *env) { - uint32_t ret; - - ret = get_C_addx_icc(CC_DST, CC_SRC, CC_SRC2); - return ret; + return get_C_addx_icc(CC_DST, CC_SRC, CC_SRC2); } static inline uint32_t get_V_tag_icc(target_ulong src1, target_ulong src2) @@ -365,10 +359,7 @@ static uint32_t compute_all_subx_xcc(CPUSPARCState *env) static uint32_t compute_C_subx_xcc(CPUSPARCState *env) { - uint32_t ret; - - ret = get_C_subx_xcc(CC_DST, CC_SRC, CC_SRC2); - return ret; + return get_C_subx_xcc(CC_DST, CC_SRC, CC_SRC2); } #endif @@ -384,10 +375,7 @@ static uint32_t compute_all_subx(CPUSPARCState *env) static uint32_t compute_C_subx(CPUSPARCState *env) { - uint32_t ret; - - ret = get_C_subx_icc(CC_DST, CC_SRC, CC_SRC2); - return ret; + return get_C_subx_icc(CC_DST, CC_SRC, CC_SRC2); } static uint32_t compute_all_tsub(CPUSPARCState *env) @@ -479,8 +467,5 @@ void helper_compute_psr(CPUSPARCState *env) uint32_t helper_compute_C_icc(CPUSPARCState *env) { - uint32_t ret; - - ret = icc_table[CC_OP].compute_c(env) >> PSR_CARRY_SHIFT; - return ret; + return icc_table[CC_OP].compute_c(env) >> PSR_CARRY_SHIFT; } |