summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradeshkp <adeshkp@users.noreply.github.com>2020-06-08 09:17:35 -0400
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-06-13 11:50:21 +0200
commite9d41c99681e3a8d910e5490db61e9ff81f7a241 (patch)
tree4831814c3d4bd523825e07e23f81bc5fc4cafce4
parent0e0feed5daa8751b04bda7b4caac3854995cb0c8 (diff)
downloadUXP-e9d41c99681e3a8d910e5490db61e9ff81f7a241.tar
UXP-e9d41c99681e3a8d910e5490db61e9ff81f7a241.tar.gz
UXP-e9d41c99681e3a8d910e5490db61e9ff81f7a241.tar.lz
UXP-e9d41c99681e3a8d910e5490db61e9ff81f7a241.tar.xz
UXP-e9d41c99681e3a8d910e5490db61e9ff81f7a241.zip
Issue #1542 - Fix a typo in wasm which was causing build failure on ARM
-rw-r--r--js/src/wasm/WasmBaselineCompile.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/js/src/wasm/WasmBaselineCompile.cpp b/js/src/wasm/WasmBaselineCompile.cpp
index 8dc5c104f..7162e3338 100644
--- a/js/src/wasm/WasmBaselineCompile.cpp
+++ b/js/src/wasm/WasmBaselineCompile.cpp
@@ -3391,7 +3391,7 @@ class BaseCompiler
#ifdef JS_CODEGEN_ARM
void
loadI32(MemoryAccessDesc access, bool isSigned, RegI32 ptr, Register rt) {
- if (access.byteSize() > 1 && IsUnaligned(ins->access())) {
+ if (access.byteSize() > 1 && IsUnaligned(access)) {
masm.add32(HeapReg, ptr.reg);
SecondScratchRegisterScope scratch(*this);
masm.emitUnalignedLoad(isSigned, access.byteSize(), ptr.reg, scratch, rt, 0);
@@ -3405,7 +3405,7 @@ class BaseCompiler
void
storeI32(MemoryAccessDesc access, RegI32 ptr, Register rt) {
- if (access.byteSize() > 1 && IsUnaligned(ins->access())) {
+ if (access.byteSize() > 1 && IsUnaligned(access)) {
masm.add32(HeapReg, ptr.reg);
masm.emitUnalignedStore(access.byteSize(), ptr.reg, rt, 0);
} else {
@@ -3419,7 +3419,7 @@ class BaseCompiler
void
loadI64(MemoryAccessDesc access, RegI32 ptr, RegI64 dest) {
- if (IsUnaligned(ins->access())) {
+ if (IsUnaligned(access)) {
masm.add32(HeapReg, ptr.reg);
SecondScratchRegisterScope scratch(*this);
masm.emitUnalignedLoad(IsSigned(false), ByteSize(4), ptr.reg, scratch, dest.reg.low,
@@ -3440,7 +3440,7 @@ class BaseCompiler
void
storeI64(MemoryAccessDesc access, RegI32 ptr, RegI64 src) {
- if (IsUnaligned(ins->access())) {
+ if (IsUnaligned(access)) {
masm.add32(HeapReg, ptr.reg);
masm.emitUnalignedStore(ByteSize(4), ptr.reg, src.reg.low, 0);
masm.emitUnalignedStore(ByteSize(4), ptr.reg, src.reg.high, 4);
@@ -3459,7 +3459,7 @@ class BaseCompiler
void
loadF32(MemoryAccessDesc access, RegI32 ptr, RegF32 dest, RegI32 tmp1) {
masm.add32(HeapReg, ptr.reg);
- if (IsUnaligned(ins->access())) {
+ if (IsUnaligned(access)) {
SecondScratchRegisterScope scratch(*this);
masm.emitUnalignedLoad(IsSigned(false), ByteSize(4), ptr.reg, scratch, tmp1.reg, 0);
masm.ma_vxfer(tmp1.reg, dest.reg);
@@ -3473,7 +3473,7 @@ class BaseCompiler
void
storeF32(MemoryAccessDesc access, RegI32 ptr, RegF32 src, RegI32 tmp1) {
masm.add32(HeapReg, ptr.reg);
- if (IsUnaligned(ins->access())) {
+ if (IsUnaligned(access)) {
masm.ma_vxfer(src.reg, tmp1.reg);
masm.emitUnalignedStore(ByteSize(4), ptr.reg, tmp1.reg, 0);
} else {
@@ -3486,7 +3486,7 @@ class BaseCompiler
void
loadF64(MemoryAccessDesc access, RegI32 ptr, RegF64 dest, RegI32 tmp1, RegI32 tmp2) {
masm.add32(HeapReg, ptr.reg);
- if (IsUnaligned(ins->access())) {
+ if (IsUnaligned(access)) {
SecondScratchRegisterScope scratch(*this);
masm.emitUnalignedLoad(IsSigned(false), ByteSize(4), ptr.reg, scratch, tmp1.reg, 0);
masm.emitUnalignedLoad(IsSigned(false), ByteSize(4), ptr.reg, scratch, tmp2.reg, 4);
@@ -3501,7 +3501,7 @@ class BaseCompiler
void
storeF64(MemoryAccessDesc access, RegI32 ptr, RegF64 src, RegI32 tmp1, RegI32 tmp2) {
masm.add32(HeapReg, ptr.reg);
- if (IsUnaligned(ins->access())) {
+ if (IsUnaligned(access)) {
masm.ma_vxfer(src.reg, tmp1.reg, tmp2.reg);
masm.emitUnalignedStore(ByteSize(4), ptr.reg, tmp1.reg, 0);
masm.emitUnalignedStore(ByteSize(4), ptr.reg, tmp2.reg, 4);