From 3a322e9f329909c3c751de6cb5da33e7280c2738 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Thu, 4 Sep 2014 22:53:54 +0200 Subject: [PATCH] 5e: fix signed long multiply --- sys/src/cmd/5e/arm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/src/cmd/5e/arm.c b/sys/src/cmd/5e/arm.c index 0f8d0d7c7..bbede825c 100644 --- a/sys/src/cmd/5e/arm.c +++ b/sys/src/cmd/5e/arm.c @@ -367,11 +367,12 @@ multiplylong(u32int instr) RdH = P->R + ((instr >> 16) & 15); if(RdL == RdH || RdH == Rm || RdL == Rm || Rm == P->R + 15 || Rs == P->R + 15 || RdL == P->R + 15 || RdH == P->R + 15) invalid(instr); - if(instr & (1<<22)) { + if(instr & (1<<22)) + res = ((vlong)*(int*)Rs) * *(int*)Rm; + else { res = *Rs; res *= *Rm; - } else - res = ((vlong)*(int*)Rs) * *(int*)Rm; + } if(instr & (1<<21)) { res += *RdL; res += ((uvlong)*RdH) << 32;