[Qemu-devel] [PULL 0/1] tricore-patches

[Qemu-devel] [PULL 0/1] tricore-patches

[Bastian Koppelmann]

The following changes since commit dc1e1350f8061021df765b396295329797d66933:

  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2015-06-26 15:57:43 +0100)

are available in the git repository at:

  https://github.com/bkoppelmann/qemu-tricore-upstream.git tags/pull-tricore-20150629

for you to fetch changes up to 5f37fd8e2980818ab71bc4b4e21129e29acd73f7:

  target-tricore: fix depositing bits from PCXI into ICR (2015-06-29 14:02:58 +0200)

----------------------------------------------------------------
TriCore bugfixes

----------------------------------------------------------------
Paolo Bonzini (1):
      target-tricore: fix depositing bits from PCXI into ICR

 target-tricore/op_helper.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
-- 
2.4.4

[Qemu-devel] [PULL 1/1] target-tricore: fix depositing bits from PCXI into ICR

[Bastian Koppelmann]

From: Paolo Bonzini <pbonzini@redhat.com>

Spotted by Coverity, because (env->PCXI & MASK_PCXI_PCPN) >> 24
is always zero.  The immediately preceding assignment is also
wrong though.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-Id: <1435147270-1040-1-git-send-email-pbonzini@redhat.com>
---
 target-tricore/op_helper.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target-tricore/op_helper.c b/target-tricore/op_helper.c
index 10ed541..53edbda 100644
--- a/target-tricore/op_helper.c
+++ b/target-tricore/op_helper.c
@@ -2545,10 +2545,10 @@ void helper_rfm(CPUTriCoreState *env)
     env->PC = (env->gpr_a[11] & ~0x1);
     /* ICR.IE = PCXI.PIE; */
     env->ICR = (env->ICR & ~MASK_ICR_IE) |
-               ((env->PCXI & ~MASK_PCXI_PIE) >> 15);
+               ((env->PCXI & MASK_PCXI_PIE) >> 15);
     /* ICR.CCPN = PCXI.PCPN; */
     env->ICR = (env->ICR & ~MASK_ICR_CCPN) |
-               ((env->PCXI & ~MASK_PCXI_PCPN) >> 24);
+               ((env->PCXI & MASK_PCXI_PCPN) >> 24);
     /* {PCXI, PSW, A[10], A[11]} = M(DCX, 4 * word); */
     env->PCXI = cpu_ldl_data(env, env->DCX);
     psw_write(env, cpu_ldl_data(env, env->DCX+4));
-- 
2.4.4

Re: [Qemu-devel] [PULL 0/1] tricore-patches

[Peter Maydell]

On 29 June 2015 at 13:11, Bastian Koppelmann
<kbastian@mail.uni-paderborn.de> wrote:
> The following changes since commit dc1e1350f8061021df765b396295329797d66933:
>
>   Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2015-06-26 15:57:43 +0100)
>
> are available in the git repository at:
>
>   https://github.com/bkoppelmann/qemu-tricore-upstream.git tags/pull-tricore-20150629
>
> for you to fetch changes up to 5f37fd8e2980818ab71bc4b4e21129e29acd73f7:
>
>   target-tricore: fix depositing bits from PCXI into ICR (2015-06-29 14:02:58 +0200)
>
> ----------------------------------------------------------------
> TriCore bugfixes
>
> ----------------------------------------------------------------
> Paolo Bonzini (1):
>       target-tricore: fix depositing bits from PCXI into ICR

Applied, thanks.

-- PMM