ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-01 08:48:09 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

more ARM64 bugfixes

Browse Source
This commit is contained in:
Joel Dice 2014-12-24 08:12:36 -07:00
parent 78735b35a8
commit 85fcbb82b3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/codegen/target/arm/operations64.cpp
View File

@ -122,7 +122,7 @@ uint32_t fmovFdRn(Register Fd, Register Rn, unsigned size)
uint32_t orr(Register Rd, Register Rn, Register Rm, unsigned size) uint32_t orr(Register Rd, Register Rn, Register Rm, unsigned size)
{ {
return (size == 8 ? 0xaa0003e0 : 0x2a0003e0) | (Rm.index() << 16) | (Rn.index() << 5) | Rd.index(); return (size == 8 ? 0xaa000000 : 0x2a000000) | (Rm.index() << 16) | (Rn.index() << 5) | Rd.index();
} }
uint32_t addi(Register Rd, Register Rn, int value, int shift, unsigned size) uint32_t addi(Register Rd, Register Rn, int value, int shift, unsigned size)
@ -368,12 +368,12 @@ uint32_t ldrsbi(Register Rd, Register Rn, int offset)
uint32_t ldrhi(Register Rd, Register Rn, int offset) uint32_t ldrhi(Register Rd, Register Rn, int offset)
{ {
return 0x79400000 | (offset << 10) | (Rn.index() << 5) | Rd.index(); return 0x79400000 | ((offset >> 1) << 10) | (Rn.index() << 5) | Rd.index();
} }
uint32_t ldrshi(Register Rd, Register Rn, int offset) uint32_t ldrshi(Register Rd, Register Rn, int offset)
{ {
return 0x79c00000 | (offset << 10) | (Rn.index() << 5) | Rd.index(); return 0x79c00000 | ((offset >> 1) << 10) | (Rn.index() << 5) | Rd.index();
} }
uint32_t ldrswi(Register Rd, Register Rn, int offset) uint32_t ldrswi(Register Rd, Register Rn, int offset)
@ -653,7 +653,7 @@ void moveCR2(Context* c,
} }
} }
} }
} else if (value < 0) { } else {
append(c, movn(dst->low, (~value) & 0xFFFF, 0, size)); append(c, movn(dst->low, (~value) & 0xFFFF, 0, size));
if (~(value >> 16)) { if (~(value >> 16)) {
append(c, movk(dst->low, (value >> 16) & 0xFFFF, 16, size)); append(c, movk(dst->low, (value >> 16) & 0xFFFF, 16, size));
@ -986,6 +986,7 @@ void store(Context* c,
break; break;
case 2: case 2:
assertT(c, offset == (offset & (~1)));
append(c, strhi(src->low, base, offset)); append(c, strhi(src->low, base, offset));
break; break;
@ -1127,6 +1128,7 @@ void load(Context* c,
break; break;
case 2: case 2:
assertT(c, offset == (offset & (~1)));
if (signExtend) { if (signExtend) {
append(c, ldrshi(dst->low, base, offset)); append(c, ldrshi(dst->low, base, offset));
} else { } else {